提交记录修改Core/Servicers/Instances/AppData.cs+3 −52看文件
修改Core/Servicers/Instances/Categorys.cs+4 −39看文件
修改Core/Servicers/Interfaces/ICategorys.cs+0 −1看文件
修改UI/ViewModels/CategoryPageVM.cs+0 −2看文件
| @@ -16,25 +16,7 @@ namespace Core.Servicers.Instances | ||
| 16 | 16 | |
| 17 | 17 | private List<AppModel> _apps; |
| 18 | 18 | |
| 19 | 删除: /// <summary> | |
| 20 | 删除: /// 有数据更新的app | |
| 21 | 删除: /// </summary> | |
| 22 | 删除: private List<AppModel> _updateTempApps; | |
| 23 | 删除: public AppData() | |
| 24 | 删除: { | |
| 25 | 删除: DispatcherTimer dispatcherTimer = new DispatcherTimer(); | |
| 26 | 删除: dispatcherTimer.Interval = new TimeSpan(0, 30, 0); | |
| 27 | 删除: dispatcherTimer.Tick += DispatcherTimer_Tick; | |
| 28 | 删除: dispatcherTimer.Start(); | |
| 29 | 删除: | |
| 30 | 删除: _apps = new List<AppModel>(); | |
| 31 | 删除: } | |
| 32 | 19 | |
| 33 | 删除: | |
| 34 | 删除: private void DispatcherTimer_Tick(object sender, EventArgs e) | |
| 35 | 删除: { | |
| 36 | 删除: SaveAppChanges(); | |
| 37 | 删除: } | |
| 38 | 20 | public List<AppModel> GetAllApps() |
| 39 | 21 | { |
| 40 | 22 | return _apps; |
| @@ -65,8 +47,6 @@ namespace Core.Servicers.Instances | ||
| 65 | 47 | }) |
| 66 | 48 | .ToList(); |
| 67 | 49 | } |
| 68 | 删除: | |
| 69 | 删除: _updateTempApps = new List<AppModel>(); | |
| 70 | 50 | } |
| 71 | 51 | |
| 72 | 52 | /// <summary> |
| @@ -75,11 +55,11 @@ namespace Core.Servicers.Instances | ||
| 75 | 55 | /// <param name="app"></param> |
| 76 | 56 | public void UpdateApp(AppModel app) |
| 77 | 57 | { |
| 78 | 删除: if (!_updateTempApps.Where(m => m.ID == app.ID).Any()) | |
| 58 | 新增: using (var db = new TaiDbContext()) | |
| 79 | 59 | { |
| 80 | 删除: _updateTempApps.Add(app); | |
| 60 | 新增: db.Entry(app).State = System.Data.Entity.EntityState.Modified; | |
| 61 | 新增: db.SaveChanges(); | |
| 81 | 62 | } |
| 82 | 删除: SaveAppChanges(); | |
| 83 | 63 | } |
| 84 | 64 | public AppModel GetApp(string name) |
| 85 | 65 | { |
| @@ -107,35 +87,6 @@ namespace Core.Servicers.Instances | ||
| 107 | 87 | } |
| 108 | 88 | } |
| 109 | 89 | |
| 110 | 删除: private void SaveAppChanges() | |
| 111 | 删除: { | |
| 112 | 删除: Task.Run(() => | |
| 113 | 删除: { | |
| 114 | 删除: if (_updateTempApps.Count > 0) | |
| 115 | 删除: { | |
| 116 | 删除: using (var db = new TaiDbContext()) | |
| 117 | 删除: { | |
| 118 | 删除: foreach (var item in _updateTempApps) | |
| 119 | 删除: { | |
| 120 | 删除: var app = db.App.Find(item.ID); | |
| 121 | 删除: if (app != null) | |
| 122 | 删除: { | |
| 123 | 删除: app.TotalTime = item.TotalTime; | |
| 124 | 删除: app.File = item.File; | |
| 125 | 删除: app.IconFile = item.IconFile; | |
| 126 | 删除: app.Name = item.Name; | |
| 127 | 删除: app.CategoryID = item.CategoryID; | |
| 128 | 删除: app.Description = item.Description; | |
| 129 | 删除: //app.Category = item.Category; | |
| 130 | 删除: } | |
| 131 | 删除: } | |
| 132 | 删除: db.SaveChanges(); | |
| 133 | 删除: } | |
| 134 | 删除: } | |
| 135 | 删除: }); | |
| 136 | 删除: | |
| 137 | 删除: | |
| 138 | 删除: } | |
| 139 | 90 | |
| 140 | 91 | public List<AppModel> GetAppsByCategoryID(int categoryID) |
| 141 | 92 | { |
| @@ -14,24 +14,11 @@ namespace Core.Servicers.Instances | ||
| 14 | 14 | public class Categorys : ICategorys |
| 15 | 15 | { |
| 16 | 16 | private List<CategoryModel> _categories; |
| 17 | 删除: private List<CategoryModel> _updateTempList; | |
| 18 | 删除: | |
| 19 | 17 | public Categorys() |
| 20 | 18 | { |
| 21 | 删除: DispatcherTimer dispatcherTimer = new DispatcherTimer(); | |
| 22 | 删除: dispatcherTimer.Interval = new TimeSpan(0, 30, 0); | |
| 23 | 删除: dispatcherTimer.Tick += DispatcherTimer_Tick; | |
| 24 | 删除: dispatcherTimer.Start(); | |
| 25 | 删除: | |
| 26 | 删除: | |
| 27 | 19 | this._categories = new List<CategoryModel>(); |
| 28 | 删除: _updateTempList = new List<CategoryModel>(); | |
| 29 | 删除: | |
| 30 | 删除: } | |
| 31 | 删除: private void DispatcherTimer_Tick(object sender, EventArgs e) | |
| 32 | 删除: { | |
| 33 | 删除: SaveChanged(); | |
| 34 | 20 | } |
| 21 | 新增: | |
| 35 | 22 | public CategoryModel Create(CategoryModel category) |
| 36 | 23 | { |
| 37 | 24 | using (var db = new TaiDbContext()) |
| @@ -79,35 +66,13 @@ namespace Core.Servicers.Instances | ||
| 79 | 66 | } |
| 80 | 67 | } |
| 81 | 68 | |
| 82 | 删除: public void SaveChanged() | |
| 83 | 删除: { | |
| 84 | 删除: using (var db = new TaiDbContext()) | |
| 85 | 删除: { | |
| 86 | 删除: foreach (var item in _updateTempList) | |
| 87 | 删除: { | |
| 88 | 删除: var model = db.Categorys.Find(item.ID); | |
| 89 | 删除: if (model != null) | |
| 90 | 删除: { | |
| 91 | 删除: model.IconFile = item.IconFile; | |
| 92 | 删除: model.Name = item.Name; | |
| 93 | 删除: model.Color = item.Color; | |
| 94 | 删除: } | |
| 95 | 删除: } | |
| 96 | 删除: db.SaveChanges(); | |
| 97 | 删除: | |
| 98 | 删除: //_updateTempList.Clear(); | |
| 99 | 删除: } | |
| 100 | 删除: } | |
| 101 | 69 | |
| 102 | 70 | public void Update(CategoryModel category) |
| 103 | 71 | { |
| 104 | 删除: if (!_updateTempList.Where(m => m.ID == category.ID).Any()) | |
| 72 | 新增: using (var db = new TaiDbContext()) | |
| 105 | 73 | { |
| 106 | 删除: _updateTempList.Add(category); | |
| 107 | 删除: Task.Run(() => | |
| 108 | 删除: { | |
| 109 | 删除: SaveChanged(); | |
| 110 | 删除: }); | |
| 74 | 新增: db.Entry(category).State = System.Data.Entity.EntityState.Modified; | |
| 75 | 新增: db.SaveChanges(); | |
| 111 | 76 | } |
| 112 | 77 | } |
| 113 | 78 | } |
| @@ -22,6 +22,5 @@ namespace Core.Servicers.Interfaces | ||
| 22 | 22 | CategoryModel Create(CategoryModel category); |
| 23 | 23 | void Update(CategoryModel category); |
| 24 | 24 | void Delete(CategoryModel category); |
| 25 | 删除: void SaveChanged(); | |
| 26 | 25 | } |
| 27 | 26 | } |
| @@ -76,7 +76,6 @@ namespace UI.ViewModels | ||
| 76 | 76 | app.Category = null; |
| 77 | 77 | appData.UpdateApp(app); |
| 78 | 78 | } |
| 79 | 删除: categorys.SaveChanged(); | |
| 80 | 79 | |
| 81 | 80 | // 从界面移除 |
| 82 | 81 | |
| @@ -193,7 +192,6 @@ namespace UI.ViewModels | ||
| 193 | 192 | category.Color = EditColor; |
| 194 | 193 | |
| 195 | 194 | categorys.Update(category); |
| 196 | 删除: categorys.SaveChanged(); | |
| 197 | 195 | } |
| 198 | 196 | |
| 199 | 197 | var item = Data.Where(m => m.Data.ID == SelectedItem.Data.ID).FirstOrDefault(); |

