提交记录修改UI/Models/ChartPageModel.cs+3 −0看文件
修改UI/Models/DetailPageModel.cs+2 −0看文件
修改UI/ViewModels/ChartPageVM.cs+6 −0看文件
修改UI/ViewModels/DetailPageVM.cs+4 −0看文件
修改UI/Views/ChartPage.xaml+1 −1看文件
修改UI/Views/DetailPage.xaml+1 −1看文件
| @@ -77,5 +77,8 @@ namespace UI.Models | ||
| 77 | 77 | get { return TopData_; } |
| 78 | 78 | set { TopData_ = value; OnPropertyChanged(); } |
| 79 | 79 | } |
| 80 | 新增: | |
| 81 | 新增: private double DataMaximum_ = 0; | |
| 82 | 新增: public double DataMaximum { get { return DataMaximum_; } set { DataMaximum_ = value; OnPropertyChanged(); } } | |
| 80 | 83 | } |
| 81 | 84 | } |
| @@ -153,5 +153,7 @@ namespace UI.Models | ||
| 153 | 153 | |
| 154 | 154 | private int NameIndexStart_ = 0; |
| 155 | 155 | public int NameIndexStart { get { return NameIndexStart_; } set { NameIndexStart_ = value; OnPropertyChanged(); } } |
| 156 | 新增: private double DataMaximum_ = 0; | |
| 157 | 新增: public double DataMaximum { get { return DataMaximum_; } set { DataMaximum_ = value; OnPropertyChanged(); } } | |
| 156 | 158 | } |
| 157 | 159 | } |
| @@ -133,8 +133,11 @@ namespace UI.ViewModels | ||
| 133 | 133 | /// </summary> |
| 134 | 134 | private void LoadDayData() |
| 135 | 135 | { |
| 136 | 新增: DataMaximum = 3600; | |
| 136 | 137 | Task.Run(() => |
| 137 | 138 | { |
| 139 | 新增: | |
| 140 | 新增: | |
| 138 | 141 | var list = data.GetCategoryHoursData(Date); |
| 139 | 142 | |
| 140 | 143 | var chartData = new List<ChartsDataModel>(); |
| @@ -180,6 +183,7 @@ namespace UI.ViewModels | ||
| 180 | 183 | /// </summary> |
| 181 | 184 | private void LoadWeekData() |
| 182 | 185 | { |
| 186 | 新增: DataMaximum = 0; | |
| 183 | 187 | Task.Run(() => |
| 184 | 188 | { |
| 185 | 189 | var weekDateArr = SelectedWeek.Name == "本周" ? Time.GetThisWeekDate() : Time.GetLastWeekDate(); |
| @@ -237,6 +241,7 @@ namespace UI.ViewModels | ||
| 237 | 241 | /// </summary> |
| 238 | 242 | private void LoadMonthlyData() |
| 239 | 243 | { |
| 244 | 新增: DataMaximum = 0; | |
| 240 | 245 | Task.Run(() => |
| 241 | 246 | { |
| 242 | 247 | var dateArr = Time.GetMonthDate(MonthDate); |
| @@ -288,6 +293,7 @@ namespace UI.ViewModels | ||
| 288 | 293 | /// </summary> |
| 289 | 294 | private void LoadYearData() |
| 290 | 295 | { |
| 296 | 新增: DataMaximum = 0; | |
| 291 | 297 | Task.Run(() => |
| 292 | 298 | { |
| 293 | 299 | var list = data.GetCategoryYearData(YearDate); |
| @@ -398,6 +398,7 @@ namespace UI.ViewModels | ||
| 398 | 398 | /// </summary> |
| 399 | 399 | private void LoadDayData() |
| 400 | 400 | { |
| 401 | 新增: DataMaximum = 3600; | |
| 401 | 402 | Task.Run(() => |
| 402 | 403 | { |
| 403 | 404 | var list = data.GetAppDayData(App.ID, ChartDate); |
| @@ -424,6 +425,7 @@ namespace UI.ViewModels | ||
| 424 | 425 | /// </summary> |
| 425 | 426 | private void LoadWeekData() |
| 426 | 427 | { |
| 428 | 新增: DataMaximum = 0; | |
| 427 | 429 | Task.Run(() => |
| 428 | 430 | { |
| 429 | 431 | var weekDateArr = SelectedWeek.Name == "本周" ? Time.GetThisWeekDate() : Time.GetLastWeekDate(); |
| @@ -457,6 +459,7 @@ namespace UI.ViewModels | ||
| 457 | 459 | /// </summary> |
| 458 | 460 | private void LoadMonthlyData() |
| 459 | 461 | { |
| 462 | 新增: DataMaximum = 0; | |
| 460 | 463 | Task.Run(() => |
| 461 | 464 | { |
| 462 | 465 | var dateArr = Time.GetMonthDate(MonthDate); |
| @@ -488,6 +491,7 @@ namespace UI.ViewModels | ||
| 488 | 491 | /// </summary> |
| 489 | 492 | private void LoadYearData() |
| 490 | 493 | { |
| 494 | 新增: DataMaximum = 0; | |
| 491 | 495 | Task.Run(() => |
| 492 | 496 | { |
| 493 | 497 | var list = data.GetAppYearData(App.ID, YearDate); |
| @@ -40,7 +40,7 @@ | ||
| 40 | 40 | <TextBlock Text="分类" Foreground="#5c5c5c" FontSize="15" Margin="0,20,0,5"/> |
| 41 | 41 | |
| 42 | 42 | <Border Margin="0,15,0,0" Height="360" Width="680" HorizontalAlignment="Left" Background="White" Padding="20" CornerRadius="10"> |
| 43 | 删除: <charts:Charts NameIndexStart="{Binding NameIndexStart}" ChartsType="Column" Data="{Binding Data}"/> | |
| 43 | 新增: <charts:Charts DataMaximum="{Binding DataMaximum}" NameIndexStart="{Binding NameIndexStart}" ChartsType="Column" Data="{Binding Data}"/> | |
| 44 | 44 | |
| 45 | 45 | </Border> |
| 46 | 46 | <TextBlock Text="最为频繁的应用" Foreground="#5c5c5c" FontSize="15" Margin="0,20,0,5"/> |
| @@ -138,7 +138,7 @@ | ||
| 138 | 138 | |
| 139 | 139 | </base:View> |
| 140 | 140 | </Grid> |
| 141 | 删除: <Charts:Charts Height="300" NameIndexStart="{Binding NameIndexStart}" ChartsType="Column" Data="{Binding ChartData}" Margin="0,20,0,0"/> | |
| 141 | 新增: <Charts:Charts DataMaximum="{Binding DataMaximum}" Height="300" NameIndexStart="{Binding NameIndexStart}" ChartsType="Column" Data="{Binding ChartData}" Margin="0,20,0,0"/> | |
| 142 | 142 | |
| 143 | 143 | </StackPanel> |
| 144 | 144 | |

