提交记录修改UI/Models/DetailPageModel.cs+6 −0看文件
修改UI/Servicers/AppContextMenuServicer.cs+2 −1看文件
修改UI/ViewModels/DetailPageVM.cs+23 −16看文件
修改UI/Views/DetailPage.xaml+20 −5看文件
| @@ -155,5 +155,11 @@ namespace UI.Models | ||
| 155 | 155 | public int NameIndexStart { get { return NameIndexStart_; } set { NameIndexStart_ = value; OnPropertyChanged(); } } |
| 156 | 156 | private double DataMaximum_ = 0; |
| 157 | 157 | public double DataMaximum { get { return DataMaximum_; } set { DataMaximum_ = value; OnPropertyChanged(); } } |
| 158 | 新增: | |
| 159 | 新增: private List<AppModel> LinkApps_; | |
| 160 | 新增: /// <summary> | |
| 161 | 新增: /// 关联的应用 | |
| 162 | 新增: /// </summary> | |
| 163 | 新增: public List<AppModel> LinkApps { get { return LinkApps_; } set { LinkApps_ = value; OnPropertyChanged(); } } | |
| 158 | 164 | } |
| 159 | 165 | } |
| @@ -171,12 +171,13 @@ namespace UI.Servicers | ||
| 171 | 171 | if (link != null) |
| 172 | 172 | { |
| 173 | 173 | link.ProcessList.Add(app.Name); |
| 174 | 新增: appConfig.Save(); | |
| 175 | 新增: | |
| 174 | 176 | main.Toast("关联成功", Controls.Window.ToastType.Success); |
| 175 | 177 | } |
| 176 | 178 | else |
| 177 | 179 | { |
| 178 | 180 | main.Toast("关联配置不存在", Controls.Window.ToastType.Error, Controls.Base.IconTypes.Blocked); |
| 179 | 删除: | |
| 180 | 181 | } |
| 181 | 182 | } |
| 182 | 183 | private void SetAppCategory(int appId, CategoryModel category) |
| @@ -121,22 +121,22 @@ namespace UI.ViewModels | ||
| 121 | 121 | main.Toast("应用似乎不存在", Controls.Window.ToastType.Error, Controls.Base.IconTypes.Blocked); |
| 122 | 122 | } |
| 123 | 123 | break; |
| 124 | 删除: //case "geticon": | |
| 125 | 删除: // string iconFile = Iconer.ExtractFromFile(App.File, App.Name, App.Description, false); | |
| 126 | 删除: // if (string.IsNullOrEmpty(iconFile)) | |
| 127 | 删除: // { | |
| 128 | 删除: // main.Toast("图标获取失败", Controls.Window.ToastType.Error, Controls.Base.IconTypes.Blocked); | |
| 129 | 删除: // return; | |
| 130 | 删除: // } | |
| 131 | 删除: // var app = appData.GetApp(App.ID); | |
| 132 | 删除: // if (app != null) | |
| 133 | 删除: // { | |
| 134 | 删除: // app.IconFile = iconFile; | |
| 135 | 删除: // appData.UpdateApp(app); | |
| 136 | 删除: // main.Toast("图标已更新", Controls.Window.ToastType.Success, Controls.Base.IconTypes.Accept); | |
| 137 | 删除: // } | |
| 138 | 删除: | |
| 139 | 删除: // break; | |
| 124 | 新增: //case "geticon": | |
| 125 | 新增: // string iconFile = Iconer.ExtractFromFile(App.File, App.Name, App.Description, false); | |
| 126 | 新增: // if (string.IsNullOrEmpty(iconFile)) | |
| 127 | 新增: // { | |
| 128 | 新增: // main.Toast("图标获取失败", Controls.Window.ToastType.Error, Controls.Base.IconTypes.Blocked); | |
| 129 | 新增: // return; | |
| 130 | 新增: // } | |
| 131 | 新增: // var app = appData.GetApp(App.ID); | |
| 132 | 新增: // if (app != null) | |
| 133 | 新增: // { | |
| 134 | 新增: // app.IconFile = iconFile; | |
| 135 | 新增: // appData.UpdateApp(app); | |
| 136 | 新增: // main.Toast("图标已更新", Controls.Window.ToastType.Success, Controls.Base.IconTypes.Accept); | |
| 137 | 新增: // } | |
| 138 | 新增: | |
| 139 | 新增: // break; | |
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | |
| @@ -263,6 +263,13 @@ namespace UI.ViewModels | ||
| 263 | 263 | |
| 264 | 264 | LoadCategorys(App.Category?.Name); |
| 265 | 265 | |
| 266 | 新增: // 读取关联应用数据 | |
| 267 | 新增: var link = config.Links.Where(m => m.ProcessList.Contains(App.Name)).FirstOrDefault(); | |
| 268 | 新增: if (link != null) | |
| 269 | 新增: { | |
| 270 | 新增: LinkApps = appData.GetAllApps().Where(m => link.ProcessList.Contains(m.Name) && m.Name!=App.Name).ToList(); | |
| 271 | 新增: } | |
| 272 | 新增: | |
| 266 | 273 | //var today = data.GetProcess(App.ID, DateTime.Now); |
| 267 | 274 | //var yesterday = data.GetProcess(App.ID, DateTime.Now.AddDays(-1)); |
| 268 | 275 | |
| @@ -73,18 +73,33 @@ | ||
| 73 | 73 | </StackPanel> |
| 74 | 74 | </Border>--> |
| 75 | 75 | |
| 76 | 删除: <base:View Condition="not null" Value="{Binding Category}"> | |
| 76 | 新增: <base:View Condition="not null" Value="{Binding Category}" HorizontalAlignment="Left"> | |
| 77 | 77 | <Select:Select Margin="0,10,0,0" ToolTip="分类" SelectedItem="{Binding Category,Mode=TwoWay}" Options="{Binding Categorys}"/> |
| 78 | 78 | |
| 79 | 79 | </base:View> |
| 80 | 80 | |
| 81 | 新增: | |
| 81 | 82 | </StackPanel> |
| 83 | 新增: <Grid Grid.Column="2"> | |
| 84 | 新增: <StackPanel Grid.Column="2" HorizontalAlignment="Right" Margin="0,0,20,0"> | |
| 85 | 新增: <btn:Button Command="{Binding BlockActionCommand}" CommandParameter="block" Width="120" Visibility="{Binding BlockBtnVisibility}" Icon="Blocked">忽略此应用</btn:Button> | |
| 86 | 新增: <btn:Button Command="{Binding BlockActionCommand}" CommandParameter="unblock" Width="120" Visibility="{Binding CancelBlockBtnVisibility}" Icon="Remove">取消忽略</btn:Button> | |
| 82 | 87 | |
| 83 | 删除: <StackPanel Grid.Column="2" HorizontalAlignment="Right" Margin="0,0,20,0"> | |
| 84 | 删除: <btn:Button Command="{Binding BlockActionCommand}" CommandParameter="block" Width="120" Visibility="{Binding BlockBtnVisibility}" Icon="Blocked">忽略此应用</btn:Button> | |
| 85 | 删除: <btn:Button Command="{Binding BlockActionCommand}" CommandParameter="unblock" Width="120" Visibility="{Binding CancelBlockBtnVisibility}" Icon="Remove">取消忽略</btn:Button> | |
| 88 | 新增: </StackPanel> | |
| 86 | 89 | |
| 87 | 删除: </StackPanel> | |
| 90 | 新增: <ItemsControl Margin="0,20,10,0" VerticalAlignment="Bottom" ItemsSource="{Binding LinkApps}" HorizontalAlignment="Right"> | |
| 91 | 新增: <ItemsControl.ItemsPanel> | |
| 92 | 新增: <ItemsPanelTemplate> | |
| 93 | 新增: <StackPanel ToolTip="关联" ScrollViewer.HorizontalScrollBarVisibility="Visible" Orientation="Horizontal" VerticalAlignment="Center"/> | |
| 94 | 新增: </ItemsPanelTemplate> | |
| 95 | 新增: </ItemsControl.ItemsPanel> | |
| 96 | 新增: <ItemsControl.ItemTemplate> | |
| 97 | 新增: <DataTemplate> | |
| 98 | 新增: <base:Img Margin="2,0" URL="{Binding IconFile}" Width="20" Height="20" ToolTip="{Binding Description}"/> | |
| 99 | 新增: </DataTemplate> | |
| 100 | 新增: </ItemsControl.ItemTemplate> | |
| 101 | 新增: </ItemsControl> | |
| 102 | 新增: </Grid> | |
| 88 | 103 | </Grid> |
| 89 | 104 | </Border> |
| 90 | 105 | <!--<TextBlock Text="今日数据" FontSize="14" Margin="0,20,0,0"/> |

