提交记录修改UI/ViewModels/DetailPageVM.cs+57 −41看文件
修改UI/Views/DetailPage.xaml+5 −1看文件
| @@ -121,6 +121,22 @@ namespace UI.ViewModels | ||
| 121 | 121 | { |
| 122 | 122 | main.Toast("应用似乎不存在", Controls.Window.ToastType.Error, Controls.Base.IconTypes.Blocked); |
| 123 | 123 | } |
| 124 | 新增: break; | |
| 125 | 新增: case "geticon": | |
| 126 | 新增: string iconFile = Iconer.ExtractFromFile(App.File, App.Name, App.Description, false); | |
| 127 | 新增: if (string.IsNullOrEmpty(iconFile)) | |
| 128 | 新增: { | |
| 129 | 新增: main.Toast("图标获取失败", Controls.Window.ToastType.Error, Controls.Base.IconTypes.Blocked); | |
| 130 | 新增: return; | |
| 131 | 新增: } | |
| 132 | 新增: var app = appData.GetApp(App.ID); | |
| 133 | 新增: if (app != null) | |
| 134 | 新增: { | |
| 135 | 新增: app.IconFile = iconFile; | |
| 136 | 新增: appData.UpdateApp(app); | |
| 137 | 新增: main.Toast("图标已更新", Controls.Window.ToastType.Success, Controls.Base.IconTypes.Accept); | |
| 138 | 新增: } | |
| 139 | 新增: | |
| 124 | 140 | break; |
| 125 | 141 | } |
| 126 | 142 | } |
| @@ -248,47 +264,47 @@ namespace UI.ViewModels | ||
| 248 | 264 | |
| 249 | 265 | LoadCategorys(App.Category?.Name); |
| 250 | 266 | |
| 251 | 删除: var today = data.GetProcess(App.ID, DateTime.Now); | |
| 252 | 删除: var yesterday = data.GetProcess(App.ID, DateTime.Now.AddDays(-1)); | |
| 253 | 删除: | |
| 254 | 删除: if (today != null) | |
| 255 | 删除: { | |
| 256 | 删除: TodayTime = Timer.Fromat(today.Time); | |
| 257 | 删除: } | |
| 258 | 删除: else | |
| 259 | 删除: { | |
| 260 | 删除: TodayTime = "暂无数据"; | |
| 261 | 删除: } | |
| 262 | 删除: | |
| 263 | 删除: if (yesterday != null) | |
| 264 | 删除: { | |
| 265 | 删除: int diffseconds = today != null ? today.Time - yesterday.Time : yesterday.Time; | |
| 266 | 删除: | |
| 267 | 删除: string diffText = string.Empty; | |
| 268 | 删除: if (diffseconds != yesterday.Time) | |
| 269 | 删除: { | |
| 270 | 删除: if (diffseconds == 0) | |
| 271 | 删除: { | |
| 272 | 删除: // 无变化 | |
| 273 | 删除: diffText = "持平"; | |
| 274 | 删除: } | |
| 275 | 删除: else if (diffseconds > 0) | |
| 276 | 删除: { | |
| 277 | 删除: // 增加 | |
| 278 | 删除: diffText = "增加了" + Timer.Fromat(diffseconds); | |
| 279 | 删除: } | |
| 280 | 删除: else | |
| 281 | 删除: { | |
| 282 | 删除: // 减少 | |
| 283 | 删除: diffText = "减少了" + Timer.Fromat(Math.Abs(diffseconds)); | |
| 284 | 删除: } | |
| 285 | 删除: } | |
| 286 | 删除: Yesterday = diffseconds == yesterday.Time ? "减少100%" : diffText; | |
| 287 | 删除: } | |
| 288 | 删除: else | |
| 289 | 删除: { | |
| 290 | 删除: Yesterday = "昨日未使用"; | |
| 291 | 删除: } | |
| 267 | 新增: //var today = data.GetProcess(App.ID, DateTime.Now); | |
| 268 | 新增: //var yesterday = data.GetProcess(App.ID, DateTime.Now.AddDays(-1)); | |
| 269 | 新增: | |
| 270 | 新增: //if (today != null) | |
| 271 | 新增: //{ | |
| 272 | 新增: // TodayTime = Timer.Fromat(today.Time); | |
| 273 | 新增: //} | |
| 274 | 新增: //else | |
| 275 | 新增: //{ | |
| 276 | 新增: // TodayTime = "暂无数据"; | |
| 277 | 新增: //} | |
| 278 | 新增: | |
| 279 | 新增: //if (yesterday != null) | |
| 280 | 新增: //{ | |
| 281 | 新增: // int diffseconds = today != null ? today.Time - yesterday.Time : yesterday.Time; | |
| 282 | 新增: | |
| 283 | 新增: // string diffText = string.Empty; | |
| 284 | 新增: // if (diffseconds != yesterday.Time) | |
| 285 | 新增: // { | |
| 286 | 新增: // if (diffseconds == 0) | |
| 287 | 新增: // { | |
| 288 | 新增: // // 无变化 | |
| 289 | 新增: // diffText = "持平"; | |
| 290 | 新增: // } | |
| 291 | 新增: // else if (diffseconds > 0) | |
| 292 | 新增: // { | |
| 293 | 新增: // // 增加 | |
| 294 | 新增: // diffText = "增加了" + Timer.Fromat(diffseconds); | |
| 295 | 新增: // } | |
| 296 | 新增: // else | |
| 297 | 新增: // { | |
| 298 | 新增: // // 减少 | |
| 299 | 新增: // diffText = "减少了" + Timer.Fromat(Math.Abs(diffseconds)); | |
| 300 | 新增: // } | |
| 301 | 新增: // } | |
| 302 | 新增: // Yesterday = diffseconds == yesterday.Time ? "减少100%" : diffText; | |
| 303 | 新增: //} | |
| 304 | 新增: //else | |
| 305 | 新增: //{ | |
| 306 | 新增: // Yesterday = "昨日未使用"; | |
| 307 | 新增: //} | |
| 292 | 308 | } |
| 293 | 309 | } |
| 294 | 310 | ); |
| @@ -22,9 +22,13 @@ | ||
| 22 | 22 | <Border.ContextMenu> |
| 23 | 23 | <ContextMenu> |
| 24 | 24 | <MenuItem Command="{Binding InfoMenuActionCommand}" CommandParameter="open exe" Header="启动应用"/> |
| 25 | 新增: <Separator/> | |
| 25 | 26 | <MenuItem Command="{Binding InfoMenuActionCommand}" CommandParameter="copy processname" Header="复制应用进程名称"/> |
| 26 | 27 | <MenuItem Command="{Binding InfoMenuActionCommand}" CommandParameter="copy process file" Header="复制应用文件路径"/> |
| 27 | 28 | <MenuItem Command="{Binding InfoMenuActionCommand}" CommandParameter="open dir" Header="打开应用所在目录"/> |
| 29 | 新增: <Separator/> | |
| 30 | 新增: <MenuItem Command="{Binding InfoMenuActionCommand}" CommandParameter="geticon" Header="重新获取图标"/> | |
| 31 | 新增: | |
| 28 | 32 | </ContextMenu> |
| 29 | 33 | </Border.ContextMenu> |
| 30 | 34 | <Grid> |
| @@ -34,7 +38,7 @@ | ||
| 34 | 38 | <ColumnDefinition Width="3*"/> |
| 35 | 39 | |
| 36 | 40 | </Grid.ColumnDefinitions> |
| 37 | 删除: <base:Img URL="{Binding App.IconFile}" Width="25" Height="25" HorizontalAlignment="Center" VerticalAlignment="Center"/> | |
| 41 | 新增: <base:Img IsAutoDispose="True" URL="{Binding App.IconFile}" Width="25" Height="25" HorizontalAlignment="Center" VerticalAlignment="Center"/> | |
| 38 | 42 | <!--<Image Source="{Binding Process.Icon}" Width="25" HorizontalAlignment="Center" VerticalAlignment="Center"/>--> |
| 39 | 43 | |
| 40 | 44 | <StackPanel Grid.Column="1" VerticalAlignment="Center"> |

