跳到主要内容
登录

github/tai

公开

Tai · Windows 软件与网站使用时长统计。上游 Planshit/Tai 的源码镜像，非灵栈原创；MIT 许可。来源：https://github.com/Planshit/Tai 。本次为手动同步，暂不提供安装包。

提交记录
修改Core/Core.csproj+4 −0看文件
@@ -115,6 +115,7 @@
115115 <Compile Include="Librarys\SQLite\SQLiteBuilder.cs" />
116116 <Compile Include="Librarys\SQLite\SQLiteConfiguration.cs" />
117117 <Compile Include="Librarys\SQLite\TaiDbContext.cs" />
118新增： <Compile Include="Librarys\Time.cs" />
118119 <Compile Include="Librarys\Win32API.cs" />
119120 <Compile Include="Models\AppModel.cs" />
120121 <Compile Include="Models\CategoryModel.cs" />
@@ -123,11 +124,13 @@
123124 <Compile Include="Models\Config\BehaviorModel.cs" />
124125 <Compile Include="Models\Config\GeneralModel.cs" />
125126 <Compile Include="Models\Config\Link\LinkModel.cs" />
127新增： <Compile Include="Models\Data\HoursDataModel.cs" />
126128 <Compile Include="Models\HoursLogModel.cs" />
127129 <Compile Include="Models\DailyLogModel.cs" />
128130 <Compile Include="Properties\AssemblyInfo.cs" />
129131 <Compile Include="Servicers\Instances\AppConfig.cs" />
130132 <Compile Include="Servicers\Instances\AppData.cs" />
133新增： <Compile Include="Servicers\Instances\Categorys.cs" />
131134 <Compile Include="Servicers\Instances\Data.cs" />
132135 <Compile Include="Librarys\Logger.cs" />
133136 <Compile Include="Servicers\Instances\DateObserver.cs" />
@@ -135,6 +138,7 @@
135138 <Compile Include="Servicers\Instances\Observer.cs" />
136139 <Compile Include="Servicers\Instances\Sleepdiscover.cs" />
137140 <Compile Include="Servicers\Interfaces\IAppConfig.cs" />
141新增： <Compile Include="Servicers\Interfaces\ICategorys.cs" />
138142 <Compile Include="Servicers\Interfaces\IAppData.cs" />
139143 <Compile Include="Servicers\Interfaces\IData.cs" />
140144 <Compile Include="Servicers\Interfaces\IDateObserver.cs" />
修改Core/Models/Data/HoursDataModel.cs+2 −1看文件
@@ -6,8 +6,9 @@ using System.Threading.Tasks;
66
77namespace Core.Models.Data
88{
9删除： public class CategoryChartDataModel
9新增： public class ColumnDataModel
1010 {
11新增： public int AppId { get; set; }
1112 public int CategoryID { get; set; }
1213 public double[] Values { get; set; }
1314 }
修改Core/Properties/AssemblyInfo.cs+1 −1看文件
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
3232//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
3333//通过使用 "*"，如下所示:
3434// [assembly: AssemblyVersion("1.0.*")]
35删除：[assembly: AssemblyVersion("1.0.0.1")]
35新增：[assembly: AssemblyVersion("1.0.0.2")]
3636[assembly: AssemblyFileVersion("1.0.0.1")]
修改Core/Servicers/Instances/AppData.cs+23 −16看文件
@@ -78,6 +78,12 @@ namespace Core.Servicers.Instances
7878 if (!_updateTempApps.Where(m => m.ID == app.ID).Any())
7979 {
8080 _updateTempApps.Add(app);
81新增：
82新增： Task.Run(() =>
83新增： {
84新增： SaveAppChanges();
85新增： });
86新增：
8187 }
8288 }
8389 public AppModel GetApp(string name)
@@ -106,29 +112,30 @@ namespace Core.Servicers.Instances
106112 }
107113 }
108114
109删除： public void SaveAppChanges()
115新增： private void SaveAppChanges()
110116 {
111删除：
112删除： using (var db = new TaiDbContext())
117新增： if (_updateTempApps.Count > 0)
113118 {
114删除： foreach (var item in _updateTempApps)
119新增： using (var db = new TaiDbContext())
115120 {
116删除： var app = db.App.Find(item.ID);
117删除： if (app != null)
121新增： foreach (var item in _updateTempApps)
118122 {
119删除： app.TotalTime = item.TotalTime;
120删除： app.File = item.File;
121删除： app.IconFile = item.IconFile;
122删除： app.Name = item.Name;
123删除： app.CategoryID = item.CategoryID;
124删除： app.Description = item.Description;
125删除： //app.Category = item.Category;
123新增： var app = db.App.Find(item.ID);
124新增： if (app != null)
125新增： {
126新增： app.TotalTime = item.TotalTime;
127新增： app.File = item.File;
128新增： app.IconFile = item.IconFile;
129新增： app.Name = item.Name;
130新增： app.CategoryID = item.CategoryID;
131新增： app.Description = item.Description;
132新增： //app.Category = item.Category;
133新增： }
126134 }
135新增： db.SaveChanges();
136新增： _updateTempApps.Clear();
127137 }
128删除： db.SaveChanges();
129删除： _updateTempApps.Clear();
130138 }
131删除：
132139 }
133140
134141 public List<AppModel> GetAppsByCategoryID(int categoryID)
修改Core/Servicers/Instances/Categorys.cs+4 −0看文件
@@ -104,6 +104,10 @@ namespace Core.Servicers.Instances
104104 if (!_updateTempList.Where(m => m.ID == category.ID).Any())
105105 {
106106 _updateTempList.Add(category);
107新增： Task.Run(() =>
108新增： {
109新增： SaveChanged();
110新增： });
107111 }
108112 }
109113 }
修改Core/Servicers/Instances/Data.cs+17 −8看文件
@@ -124,6 +124,7 @@ namespace Core.Servicers.Instances
124124 Date = m.FirstOrDefault().Date,
125125 AppID = m.FirstOrDefault().AppModelID
126126 })
127新增： .OrderByDescending(m => m.Time)
127128 .Take(take);
128129
129130 var res = data
@@ -306,15 +307,17 @@ namespace Core.Servicers.Instances
306307 using (var db = new TaiDbContext())
307308 {
308309 // 查出有数据的分类
309删除： //var res = db.Database.SqlQuery<CategoryHoursDataModel>("select AppModels.CategoryID,HoursLogModels.DataTime as Time from HoursLogModels join AppModels on AppModels.ID=HoursLogModels.AppModelID where HoursLogModels.AppModelID<>0 and AppModels.CategoryID<>0 and HoursLogModels.DataTime>='" + start.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and HoursLogModels.DataTime<= '"+ end.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID").ToArray();
310删除： var categorys = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,HoursLogModels.DataTime as Time from HoursLogModels join AppModels on AppModels.ID=HoursLogModels.AppModelID where AppModels.CategoryID<>0 and HoursLogModels.DataTime>='" + date.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and HoursLogModels.DataTime<= '" + date.Date.ToString("yyyy-MM-dd 23:59:59") + "' GROUP BY AppModels.CategoryID ").ToArray();
311310
311新增： //var categorys = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,HoursLogModels.DataTime as Time from HoursLogModels join AppModels on AppModels.ID=HoursLogModels.AppModelID where AppModels.CategoryID<>0 and HoursLogModels.DataTime>='" + date.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and HoursLogModels.DataTime<= '" + date.Date.ToString("yyyy-MM-dd 23:59:59") + "' GROUP BY AppModels.CategoryID ").ToArray();
312312
313删除： var data = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,HoursLogModels.DataTime as Time from HoursLogModels join AppModels on AppModels.ID=HoursLogModels.AppModelID where AppModels.CategoryID<>0 and HoursLogModels.DataTime>='" + date.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and HoursLogModels.DataTime<= '" + date.Date.ToString("yyyy-MM-dd 23:59:59") + "' GROUP BY AppModels.CategoryID,HoursLogModels.DataTime ").ToArray();
314313
314新增： //var data = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,HoursLogModels.DataTime as Time from HoursLogModels join AppModels on AppModels.ID=HoursLogModels.AppModelID where AppModels.CategoryID<>0 and HoursLogModels.DataTime>='" + date.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and HoursLogModels.DataTime<= '" + date.Date.ToString("yyyy-MM-dd 23:59:59") + "' GROUP BY AppModels.CategoryID,HoursLogModels.DataTime ").ToArray();
315新增： var categorys = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,HoursLogModels.DataTime as Time from HoursLogModels join AppModels on AppModels.ID=HoursLogModels.AppModelID where HoursLogModels.DataTime>='" + date.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and HoursLogModels.DataTime<= '" + date.Date.ToString("yyyy-MM-dd 23:59:59") + "' GROUP BY AppModels.CategoryID ").OrderByDescending(m => m.CategoryID).ToArray();
315316
316删除： List<ColumnDataModel> list = new List<ColumnDataModel>();
317317
318新增： var data = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,HoursLogModels.DataTime as Time from HoursLogModels join AppModels on AppModels.ID=HoursLogModels.AppModelID where HoursLogModels.DataTime>='" + date.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and HoursLogModels.DataTime<= '" + date.Date.ToString("yyyy-MM-dd 23:59:59") + "' GROUP BY AppModels.CategoryID,HoursLogModels.DataTime ").ToArray();
319新增：
320新增： List<ColumnDataModel> list = new List<ColumnDataModel>();
318321 foreach (var category in categorys)
319322 {
320323 list.Add(new ColumnDataModel()
@@ -347,12 +350,15 @@ namespace Core.Servicers.Instances
347350 {
348351 // 查出有数据的分类
349352
350删除： var categorys = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where AppModels.CategoryID<>0 and DailyLogModels.Date>='" + start.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + end.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID").ToArray();
353新增： //var categorys = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where AppModels.CategoryID<>0 and DailyLogModels.Date>='" + start.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + end.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID").ToArray();
351354
352355
353删除： var data = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where AppModels.CategoryID<>0 and DailyLogModels.Date>='" + start.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + end.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID,DailyLogModels.Date ").ToArray();
356新增： //var data = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where AppModels.CategoryID<>0 and DailyLogModels.Date>='" + start.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + end.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID,DailyLogModels.Date ").ToArray();
357新增： var categorys = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where DailyLogModels.Date>='" + start.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + end.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID").OrderByDescending(m => m.CategoryID).ToArray();
354358
355359
360新增： var data = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where DailyLogModels.Date>='" + start.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + end.Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID,DailyLogModels.Date ").ToArray();
361新增：
356362 var ts = end - start;
357363 var days = ts.TotalDays + 1;
358364
@@ -397,12 +403,15 @@ namespace Core.Servicers.Instances
397403
398404 var dateArr = Time.GetYearDate(date);
399405
400删除： var categorys = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where AppModels.CategoryID<>0 and DailyLogModels.Date>='" + dateArr[0].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + dateArr[1].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID").ToArray();
406新增： //var categorys = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where AppModels.CategoryID<>0 and DailyLogModels.Date>='" + dateArr[0].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + dateArr[1].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID").ToArray();
407新增：
401408
409新增： //var data = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where AppModels.CategoryID<>0 and DailyLogModels.Date>='" + dateArr[0].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + dateArr[1].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID,DailyLogModels.Date ").ToArray();
402410
403删除： var data = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where AppModels.CategoryID<>0 and DailyLogModels.Date>='" + dateArr[0].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + dateArr[1].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID,DailyLogModels.Date ").ToArray();
411新增： var categorys = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where DailyLogModels.Date>='" + dateArr[0].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + dateArr[1].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID").OrderByDescending(m => m.CategoryID).ToArray();
404412
405413
414新增： var data = db.Database.SqlQuery<CategoryHoursDataModel>("select sum(Time) as Total,AppModels.CategoryID,DailyLogModels.Date as Time from DailyLogModels join AppModels on AppModels.ID=DailyLogModels.AppModelID where DailyLogModels.Date>='" + dateArr[0].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' and DailyLogModels.Date<= '" + dateArr[1].Date.ToString("yyyy-MM-dd HH:mm:ss") + "' GROUP BY AppModels.CategoryID,DailyLogModels.Date ").ToArray();
406415 //var ts = end - start;
407416 //var days = ts.TotalDays + 1;
408417
修改Core/Servicers/Instances/Main.cs+2 −2看文件
@@ -163,7 +163,7 @@ namespace Core.Servicers.Instances
163163 {
164164 observer?.Stop();
165165
166删除： appData.SaveAppChanges();
166新增： //appData.SaveAppChanges();
167167 }
168168
169169
@@ -183,7 +183,7 @@ namespace Core.Servicers.Instances
183183 //activeTimer.Stop();
184184
185185 // 更新app数据
186删除： appData.SaveAppChanges();
186新增： //appData.SaveAppChanges();
187187 }
188188 else if (sleepStatus == SleepStatus.Wake)
189189 {
修改Core/Servicers/Interfaces/IAppData.cs+1 −1看文件
@@ -16,7 +16,7 @@ namespace Core.Servicers.Interfaces
1616 /// <summary>
1717 /// 保存app数据更改
1818 /// </summary>
19删除： void SaveAppChanges();
19新增： //void SaveAppChanges();
2020 /// <summary>
2121 /// 通过进程名称获取app
2222 /// </summary>
修改UI/Controls/Base/Img.cs+1 −1看文件
@@ -74,7 +74,7 @@ namespace UI.Controls.Base
7474
7575 private void Handle()
7676 {
77删除： if (!File.Exists(URL))
77新增： if (URL == null || (URL.IndexOf("pack://") == -1 && !File.Exists(URL)))
7878 {
7979 URL = "pack://application:,,,/Tai;component/Resources/Icons/defaultIcon.png";
8080 }
修改UI/Controls/Base/View.cs+1 −1看文件
@@ -95,7 +95,7 @@ namespace UI.Controls.Base
9595 }
9696 else
9797 {
98删除： isShow = Condition == Value.ToString();
98新增： isShow = Condition == (Value != null ? Value.ToString() : "");
9999 }
100100 }
101101
修改UI/Controls/Charts/Charts.cs+2 −0看文件
@@ -859,6 +859,8 @@ namespace UI.Controls.Charts
859859
860860 var infoList = new List<ChartColumnInfoModel>();
861861
862新增： list = list.OrderByDescending(m => m.Values.Sum()).ToList();
863新增：
862864 foreach (var item in list)
863865 {
864866 infoList.Add(new ChartColumnInfoModel()
修改UI/ViewModels/ChartPageVM.cs+75 −11看文件
@@ -134,18 +134,33 @@ namespace UI.ViewModels
134134
135135 var chartData = new List<ChartsDataModel>();
136136
137新增： var nullCategory = new CategoryModel()
138新增： {
139新增： ID = 0,
140新增： Name = "未分类",
141新增： IconFile = "pack://application:,,,/Tai;component/Resources/Icons/tai32.ico"
142新增： };
137143 foreach (var item in list)
138144 {
139145 var category = categorys.GetCategory(item.CategoryID);
146新增： if (item.CategoryID == 0)
147新增： {
148新增： category = nullCategory;
149新增： }
140150 if (category != null)
141151 {
142删除： chartData.Add(new ChartsDataModel()
152新增： var dataItem = new ChartsDataModel()
143153 {
144154
145155 Name = category.Name,
146156 Icon = category.IconFile,
147157 Values = item.Values,
148删除： });
158新增： };
159新增： if (category.ID == 0)
160新增： {
161新增： dataItem.Color = "#f7f6f2";
162新增： }
163新增： chartData.Add(dataItem);
149164 }
150165 }
151166
@@ -170,20 +185,37 @@ namespace UI.ViewModels
170185
171186 var chartData = new List<ChartsDataModel>();
172187
188新增： var nullCategory = new CategoryModel()
189新增： {
190新增： ID = 0,
191新增： Name = "未分类",
192新增： IconFile = "pack://application:,,,/Tai;component/Resources/Icons/tai32.ico"
193新增：
194新增： };
195新增：
173196 string[] weekNames = { "周一", "周二", "周三", "周四", "周五", "周六", "周日", };
174197 foreach (var item in list)
175198 {
176199 var category = categorys.GetCategory(item.CategoryID);
200新增： if (item.CategoryID == 0)
201新增： {
202新增： category = nullCategory;
203新增： }
177204 if (category != null)
178205 {
179删除： chartData.Add(new ChartsDataModel()
206新增： var dataItem = new ChartsDataModel()
180207 {
181208
182209 Name = category.Name,
183210 Icon = category.IconFile,
184211 Values = item.Values,
185删除： ColumnNames = weekNames
186删除： });
212新增： ColumnNames = weekNames,
213新增： };
214新增： if (category.ID == 0)
215新增： {
216新增： dataItem.Color = "#f7f6f2";
217新增： }
218新增： chartData.Add(dataItem);
187219 }
188220 }
189221
@@ -208,18 +240,34 @@ namespace UI.ViewModels
208240
209241 var chartData = new List<ChartsDataModel>();
210242
243新增： var nullCategory = new CategoryModel()
244新增： {
245新增： ID = 0,
246新增： Name = "未分类",
247新增： IconFile = "pack://application:,,,/Tai;component/Resources/Icons/tai32.ico"
248新增： };
249新增：
211250 foreach (var item in list)
212251 {
213252 var category = categorys.GetCategory(item.CategoryID);
253新增： if (item.CategoryID == 0)
254新增： {
255新增： category = nullCategory;
256新增： }
214257 if (category != null)
215258 {
216删除： chartData.Add(new ChartsDataModel()
259新增： var dataItem = new ChartsDataModel()
217260 {
218261
219262 Name = category.Name,
220263 Icon = category.IconFile,
221264 Values = item.Values,
222删除： });
265新增： };
266新增： if (category.ID == 0)
267新增： {
268新增： dataItem.Color = "#f7f6f2";
269新增： }
270新增： chartData.Add(dataItem);
223271 }
224272 }
225273
@@ -247,19 +295,35 @@ namespace UI.ViewModels
247295 names[i] = (i + 1) + "月";
248296 }
249297
298新增： var nullCategory = new CategoryModel()
299新增： {
300新增： ID = 0,
301新增： Name = "未分类",
302新增： IconFile = "pack://application:,,,/Tai;component/Resources/Icons/tai32.ico"
303新增： };
304新增：
250305 foreach (var item in list)
251306 {
252307 var category = categorys.GetCategory(item.CategoryID);
308新增： if (item.CategoryID == 0)
309新增： {
310新增： category = nullCategory;
311新增： }
253312 if (category != null)
254313 {
255删除： chartData.Add(new ChartsDataModel()
314新增： var dataItem = new ChartsDataModel()
256315 {
257316
258317 Name = category.Name,
259318 Icon = category.IconFile,
260319 Values = item.Values,
261删除： ColumnNames = names
262删除： });
320新增： ColumnNames = names,
321新增： };
322新增： if (category.ID == 0)
323新增： {
324新增： dataItem.Color = "#f7f6f2";
325新增： }
326新增： chartData.Add(dataItem);
263327 }
264328 }
265329
@@ -298,7 +362,7 @@ namespace UI.ViewModels
298362 dateStart = dateArr[0];
299363 dateEnd = dateArr[1];
300364 }
301删除： var list = data.GetDateRangelogList(dateStart, dateEnd, 3);
365新增： var list = data.GetDateRangelogList(dateStart, dateEnd, 10);
302366
303367 TopData = MapToChartsData(list);
304368 });
修改UI/Views/ChartPage.xaml+5 −3看文件
@@ -38,13 +38,15 @@
3838 </base:View>
3939 </Grid>
4040 </Border>
41删除： <Border Margin="0,20,0,0" Height="330" Width="680" HorizontalAlignment="Left" Background="White" Padding="20" CornerRadius="10">
41新增： <TextBlock Text="分类" Foreground="#5c5c5c" FontSize="15" Margin="0,20,0,5"/>
42新增：
43新增： <Border Margin="0,15,0,0" Height="360" Width="680" HorizontalAlignment="Left" Background="White" Padding="20" CornerRadius="10">
4244 <charts:Charts NameIndexStart="{Binding NameIndexStart}" ChartsType="Column" Data="{Binding Data}"/>
4345
4446 </Border>
45删除： <TextBlock Text="最为频繁" FontSize="15" Margin="0,20,0,5"/>
47新增： <TextBlock Text="最为频繁的应用" Foreground="#5c5c5c" FontSize="15" Margin="0,20,0,5"/>
4648 <Border Margin="0,10,0,0" Width="680" HorizontalAlignment="Left" Background="White" Padding="20" CornerRadius="10">
47删除： <charts:Charts IsCanScroll="False" Height="180" Data="{Binding TopData}" ChartsType="HorizontalA" ShowLimit="3" ClickCommand="{Binding ToDetailCommand}"/>
49新增： <charts:Charts Height="300" Data="{Binding TopData}" ChartsType="HorizontalA" ClickCommand="{Binding ToDetailCommand}"/>
4850 </Border>
4951 </StackPanel>
5052 </Grid>