提交记录修改UI/Views/CategoryPage.xaml+10 −4看文件
修改UI/Views/ChartPage.xaml+14 −13看文件
修改UI/Views/DetailPage.xaml+45 −11看文件
| @@ -11,7 +11,7 @@ | ||
| 11 | 11 | |
| 12 | 12 | |
| 13 | 13 | <Grid> |
| 14 | 删除: | |
| 14 | 新增: | |
| 15 | 15 | <!--编辑--> |
| 16 | 16 | <Grid Visibility="{Binding EditVisibility}" Panel.ZIndex="2" Margin="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> |
| 17 | 17 | <Border Background="Black" Opacity=".7"/> |
| @@ -58,10 +58,16 @@ | ||
| 58 | 58 | |
| 59 | 59 | |
| 60 | 60 | <!--主内容--> |
| 61 | 删除: <StackPanel Margin="20"> | |
| 61 | 新增: <StackPanel Margin="20" Background="Transparent"> | |
| 62 | 新增: <StackPanel.ContextMenu> | |
| 63 | 新增: <ContextMenu> | |
| 64 | 新增: | |
| 65 | 新增: <MenuItem Header="新建分类" Command="{Binding EditCommand}" /> | |
| 66 | 新增: </ContextMenu> | |
| 67 | 新增: </StackPanel.ContextMenu> | |
| 62 | 68 | <TextBlock Text="分类" FontSize="18" Margin="0,0,0,20"/> |
| 63 | 删除: <TextBlock Text="管理所有应用分类"/> | |
| 64 | 删除: <Button:Button Content="创建分类" HorizontalAlignment="Right" Width="150" Command="{Binding EditCommand}"/> | |
| 69 | 新增: <!--<TextBlock Text="管理所有应用分类"/>--> | |
| 70 | 新增: <Button:Button Content="新建分类" HorizontalAlignment="Right" Margin="0,0,20,0" Width="150" Command="{Binding EditCommand}"/> | |
| 65 | 71 | |
| 66 | 72 | <base:View Condition="empty" Value="{Binding Data}"> |
| 67 | 73 | <base:EmptyData/> |
| @@ -49,7 +49,7 @@ | ||
| 49 | 49 | <ColumnDefinition Width="auto"/> |
| 50 | 50 | <ColumnDefinition Width="*"/> |
| 51 | 51 | </Grid.ColumnDefinitions> |
| 52 | 删除: <Border Background="#2b20d9" Width="40" Height="40" CornerRadius="6"> | |
| 52 | 新增: <Border Background="#6c47ff" Width="40" Height="40" CornerRadius="6"> | |
| 53 | 53 | |
| 54 | 54 | <base:Icon IconType="SkypeCircleClock" Foreground="White"/> |
| 55 | 55 | </Border> |
| @@ -73,9 +73,9 @@ | ||
| 73 | 73 | <ColumnDefinition Width="auto"/> |
| 74 | 74 | <ColumnDefinition Width="*"/> |
| 75 | 75 | </Grid.ColumnDefinitions> |
| 76 | 删除: <Border Background="#ff305b" Width="40" Height="40" CornerRadius="6"> | |
| 76 | 新增: <Border Background="#00ffab" Width="40" Height="40" CornerRadius="6"> | |
| 77 | 77 | |
| 78 | 删除: <base:Icon IconType="FlameSolid" Foreground="White"/> | |
| 78 | 新增: <base:Icon IconType="MSNVideosSolid" Foreground="White"/> | |
| 79 | 79 | </Border> |
| 80 | 80 | <Grid Grid.Column="1" Margin="10,0,0,0" VerticalAlignment="Center"> |
| 81 | 81 | <Grid.RowDefinitions> |
| @@ -83,10 +83,11 @@ | ||
| 83 | 83 | <RowDefinition Height="auto"/> |
| 84 | 84 | </Grid.RowDefinitions> |
| 85 | 85 | <TextBlock > |
| 86 | 删除: <Run Text="{Binding TopHours}" FontSize="20"/> | |
| 87 | 删除: <Run Text="小时" FontSize="12" Foreground="#5c5c5c"/> | |
| 86 | 新增: <Run Text="{Binding AppCount}" FontSize="20"/> | |
| 87 | 新增: <Run Text="个" FontSize="12" Foreground="#5c5c5c"/> | |
| 88 | 88 | </TextBlock> |
| 89 | 删除: <TextBlock Grid.Row="1" Margin="0,3,0,0" Text="最长使用" Foreground="#5c5c5c"/> | |
| 89 | 新增: <TextBlock Grid.Row="1" Margin="0,3,0,0" Text="应用量" Foreground="#5c5c5c"/> | |
| 90 | 新增: | |
| 90 | 91 | |
| 91 | 92 | </Grid> |
| 92 | 93 | </Grid> |
| @@ -97,26 +98,26 @@ | ||
| 97 | 98 | <ColumnDefinition Width="auto"/> |
| 98 | 99 | <ColumnDefinition Width="*"/> |
| 99 | 100 | </Grid.ColumnDefinitions> |
| 100 | 删除: <Border Background="#cccccc" Width="40" Height="40" CornerRadius="6"> | |
| 101 | 新增: <Border Background="#ff305b" Width="40" Height="40" CornerRadius="6"> | |
| 101 | 102 | |
| 102 | 删除: <base:Icon IconType="MSNVideosSolid" Foreground="White"/> | |
| 103 | 新增: <base:Icon IconType="FlameSolid" Foreground="White"/> | |
| 103 | 104 | </Border> |
| 104 | 105 | <Grid Grid.Column="1" Margin="10,0,0,0" VerticalAlignment="Center"> |
| 105 | 106 | <Grid.RowDefinitions> |
| 106 | 107 | <RowDefinition Height="auto"/> |
| 107 | 108 | <RowDefinition Height="auto"/> |
| 108 | 109 | </Grid.RowDefinitions> |
| 110 | 新增: | |
| 109 | 111 | <TextBlock > |
| 110 | 删除: <Run Text="{Binding AppCount}" FontSize="20"/> | |
| 111 | 删除: <Run Text="个" FontSize="12" Foreground="#5c5c5c"/> | |
| 112 | 新增: <Run Text="{Binding TopHours}" FontSize="20"/> | |
| 113 | 新增: <Run Text="小时" FontSize="12" Foreground="#5c5c5c"/> | |
| 112 | 114 | </TextBlock> |
| 113 | 删除: <TextBlock Grid.Row="1" Margin="0,3,0,0" Text="应用量" Foreground="#5c5c5c"/> | |
| 114 | 删除: | |
| 115 | 新增: <TextBlock Grid.Row="1" Margin="0,3,0,0" Text="最长使用" Foreground="#5c5c5c"/> | |
| 115 | 116 | </Grid> |
| 116 | 117 | </Grid> |
| 117 | 118 | </Border> |
| 118 | 119 | </Grid> |
| 119 | 删除: | |
| 120 | 新增: | |
| 120 | 121 | <TextBlock Text="时段" Foreground="#5c5c5c" FontSize="15" Margin="0,20,0,5"/> |
| 121 | 122 | |
| 122 | 123 | <Border Margin="0,5,0,0" Height="360" Width="680" HorizontalAlignment="Left" Background="White" Padding="20" CornerRadius="10"> |
| @@ -123,7 +123,7 @@ | ||
| 123 | 123 | |
| 124 | 124 | </StackPanel> |
| 125 | 125 | </Border>--> |
| 126 | 删除: <TextBlock Text="统计" Foreground="#5c5c5c" FontSize="14" Margin="0,20,0,0"/> | |
| 126 | 新增: <TextBlock Text="时段" Foreground="#5c5c5c" FontSize="14" Margin="0,20,0,0"/> | |
| 127 | 127 | <Tabbar:Tabbar Data="{Binding TabbarData}" SelectedIndex="{Binding TabbarSelectedIndex,Mode=TwoWay}" Width="180" HorizontalAlignment="Left"/> |
| 128 | 128 | <Border Margin="0,15,0,0" Width="680" HorizontalAlignment="Left" Background="White" Padding="20,10" CornerRadius="10"> |
| 129 | 129 | <StackPanel> |
| @@ -158,7 +158,7 @@ | ||
| 158 | 158 | </StackPanel> |
| 159 | 159 | |
| 160 | 160 | </Border> |
| 161 | 删除: <TextBlock Text="热力图" Foreground="#5c5c5c" FontSize="14" Margin="0,20,0,0"/> | |
| 161 | 新增: <TextBlock Text="每月" Foreground="#5c5c5c" FontSize="14" Margin="0,20,0,0"/> | |
| 162 | 162 | |
| 163 | 163 | <Border |
| 164 | 164 | Background="White" |
| @@ -179,15 +179,49 @@ | ||
| 179 | 179 | |
| 180 | 180 | </Grid.ColumnDefinitions> |
| 181 | 181 | <Charts:Charts Data="{Binding Data}" ChartsType="Month" HorizontalAlignment="Left"/> |
| 182 | 删除: <StackPanel Grid.Column="1"> | |
| 183 | 删除: <TextBlock FontSize="14"><Run Text="该月累计使用"/><Run Text="{Binding Total}"/> | |
| 184 | 删除: </TextBlock> | |
| 185 | 删除: <TextBlock Foreground="Gray" Margin="0,5,0,0" FontSize="14"><Run Text="{Binding LongDay}"/> | |
| 186 | 删除: </TextBlock> | |
| 187 | 删除: <TextBlock Text="在当月所有使用应用时长中占比" FontSize="14" Margin="0,20,0,0"/> | |
| 188 | 删除: | |
| 189 | 删除: <TextBlock Margin="0,10,0,0" FontSize="24"><Run Text="{Binding Ratio}"/> | |
| 190 | 删除: </TextBlock> | |
| 182 | 新增: <StackPanel Grid.Column="1" > | |
| 183 | 新增: <Border Padding="15" CornerRadius="10" BorderThickness="0"> | |
| 184 | 新增: <Border.Background> | |
| 185 | 新增: <SolidColorBrush Color="#2b20d9" Opacity=".02"/> | |
| 186 | 新增: </Border.Background> | |
| 187 | 新增: <Border.BorderBrush> | |
| 188 | 新增: <SolidColorBrush Color="#2b20d9" Opacity=".5"/> | |
| 189 | 新增: </Border.BorderBrush> | |
| 190 | 新增: <Grid> | |
| 191 | 新增: <Grid> | |
| 192 | 新增: <Grid.RowDefinitions> | |
| 193 | 新增: <RowDefinition Height="auto"/> | |
| 194 | 新增: <RowDefinition Height="auto"/> | |
| 195 | 新增: </Grid.RowDefinitions> | |
| 196 | 新增: <TextBlock FontSize="14"><Run Text="该月累计使用 " Foreground="Gray" /><Run FontSize="16" Text="{Binding Total}"/> | |
| 197 | 新增: </TextBlock> | |
| 198 | 新增: <TextBlock Grid.Row="1" Margin="0,5,0,0" FontSize="14"><Run Text="{Binding LongDay}"/> | |
| 199 | 新增: </TextBlock> | |
| 200 | 新增: </Grid> | |
| 201 | 新增: <base:Icon IconType="SkypeCircleClock" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="30" Foreground="#2b20d9" Opacity=".1"/> | |
| 202 | 新增: </Grid> | |
| 203 | 新增: </Border> | |
| 204 | 新增: <Border Margin="0,10,0,0" Padding="15" CornerRadius="10" BorderThickness="0"> | |
| 205 | 新增: <Border.Background> | |
| 206 | 新增: <SolidColorBrush Color="#2b20d9" Opacity=".02"/> | |
| 207 | 新增: </Border.Background> | |
| 208 | 新增: <Border.BorderBrush> | |
| 209 | 新增: <SolidColorBrush Color="#2b20d9" Opacity=".5"/> | |
| 210 | 新增: </Border.BorderBrush> | |
| 211 | 新增: <Grid> | |
| 212 | 新增: <Grid> | |
| 213 | 新增: <Grid.RowDefinitions> | |
| 214 | 新增: <RowDefinition Height="auto"/> | |
| 215 | 新增: <RowDefinition Height="auto"/> | |
| 216 | 新增: </Grid.RowDefinitions> | |
| 217 | 新增: <TextBlock Foreground="Gray" Text="在当月所有使用应用时长中占比" FontSize="14" /> | |
| 218 | 新增: | |
| 219 | 新增: <TextBlock Grid.Row="1" Margin="0,10,0,0" FontSize="24"><Run Text="{Binding Ratio}"/> | |
| 220 | 新增: </TextBlock> | |
| 221 | 新增: </Grid> | |
| 222 | 新增: <base:Icon IconType="PieSingleSolid" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="30" Foreground="#2b20d9" Opacity=".1"/> | |
| 223 | 新增: </Grid> | |
| 224 | 新增: </Border> | |
| 191 | 225 | |
| 192 | 226 | </StackPanel> |
| 193 | 227 | </Grid> |

