Commit 85124cc8 authored by Rabbit's avatar Rabbit
Browse files

优化存储空间体验

parent 7d4539bd
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ using System.Windows;
//
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”:
[assembly: AssemblyVersion("1.4.1.*")]
[assembly: AssemblyVersion("1.4.2.*")]

/// <summary>
/// 使用此类前需要把[assembly: ComVisible(false)]改为true
+136 −4
Original line number Diff line number Diff line
@@ -253,6 +253,138 @@ namespace CountDownList.Controls
                bg.Background = LabelBackground;
        }

        public Task<bool> RunOnce()
        {
            

            //存储结果
            SolidColorBrush textColorl;
            string 
                title = string.Empty, 
                titleFull = string.Empty, 
                time = string.Empty, 
                progress = string.Empty, 
                progressFull = string.Empty;
            double 
                progresBarWidth = 0d, 
                width = d.Dispatcher.Invoke
                (
                    delegate 
                    {
                        return d.ActualWidth; 
                    }
                );
            bool progressBarVisibility = true;

            //计算

            //文本颜色
            if (DarkText)
            {
                textColorl = Dark;
            }
            else
            {
                textColorl = Light;
            }

            //标题
            title = Title;

            if (EndTime <= DateTime.Now)
            {
                titleFull = $"距离{Title}已经过去";
            }
            else
            {
                if (IsCountMode)
                {
                    titleFull = $"距离{Title}已经过去";
                }
                else
                {
                    titleFull = $"距离{Title}还剩";
                }
            }

            //进度
            if (IsCountMode)
            {
                progressBarVisibility = false;
                progress = $"已经过去";
            }
            else
            {
                progressBarVisibility = true;
                if (!((EndTime - DateTime.Now).TotalMilliseconds <= 0d))
                {
                    Progress = ((EndTime - DateTime.Now).TotalMilliseconds / (EndTime - StartTime).TotalMilliseconds) * 100;
                    progress = $"{100 - Progress:F2}%";
                    progressFull = $"{100 - Progress:F2}%";
                    progresBarWidth = (d.ActualWidth / 100) * (100 - Progress);
                    progressBarVisibility = true;
                }
                else
                {
                    Progress = 0;
                    progress = $"已完成";
                    progressFull = $"100%";
                    progresBarWidth = d.ActualWidth;
                }
            }

            //时间
            if (IsCountMode)
            {
                //正计时
                time = (StartTime - DateTime.Now).ToString(TimeFormat);
            }
            else
            {
                //倒计时
                time = (EndTime - DateTime.Now).ToString(TimeFormat);
            }

            //刷新结果
            Dispatcher.Invoke((Action)delegate
            {
                //时间
                TimeText.Text = time;
                TimeTextFull.Text = time;

                //进度
                ProgressRectangleGeometry.Rect = new(0, 0, progresBarWidth, 6);
                ProgressText.Text = progress;
                ProgressTextFull.Text = progressFull;
                if (progressBarVisibility)
                {
                    ProgressTextFull.Visibility = Visibility.Visible;
                    ProgressBar.Visibility = Visibility.Visible;
                }
                else
                {
                    ProgressTextFull.Visibility = Visibility.Collapsed;
                    ProgressBar.Visibility = Visibility.Collapsed;
                }

                //标题
                TitleTextFull.Text = title;
                TitleText.Text = title;

                //文本颜色
                TitleText.Foreground = textColorl;
                ProgressText.Foreground = textColorl;
                TimeText.Foreground = textColorl;

                TitleTextFull.Foreground = textColorl;
                ProgressTextFull.Foreground = textColorl;
                TimeTextFull.Foreground = textColorl;
            });

            //完成
            return Task.FromResult(true);
        }

#pragma warning disable CS8602 // 解引用可能出现空引用。
        private void Delete_Click(object sender, RoutedEventArgs e)
        {
@@ -262,7 +394,7 @@ namespace CountDownList.Controls
            }
            else
            {
                MessageBox.Show("在预览模式下无法执行删除操作",Title,MessageBoxButton.OK,MessageBoxImage.Warning,MessageBoxResult.OK,MessageBoxOptions.ServiceNotification);
                System.Windows.MessageBox.Show("在预览模式下无法执行删除操作",Title,MessageBoxButton.OK,MessageBoxImage.Warning,MessageBoxResult.OK,MessageBoxOptions.ServiceNotification);
            }
        }

@@ -274,7 +406,7 @@ namespace CountDownList.Controls
            }
            else
            {
                MessageBox.Show("在预览模式下无法执行编辑操作", Title, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK, MessageBoxOptions.ServiceNotification);
                System.Windows.MessageBox.Show("在预览模式下无法执行编辑操作", Title, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK, MessageBoxOptions.ServiceNotification);
            }
        }

@@ -286,12 +418,12 @@ namespace CountDownList.Controls
            }
            else
            {
                MessageBox.Show("在预览模式下无法执行分享操作", Title, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK, MessageBoxOptions.ServiceNotification);
                System.Windows.MessageBox.Show("在预览模式下无法执行分享操作", Title, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK, MessageBoxOptions.ServiceNotification);
            }
        }

        public bool IsMouseEnter = false;
        private async void userControl_MouseEnter(object sender, MouseEventArgs e)
        private async void userControl_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
        {
            IsMouseEnter = true;

+6 −1
Original line number Diff line number Diff line
@@ -20,21 +20,26 @@
    <AssemblyOriginatorKeyFile>C:\Users\haora\source\repos\CountDownList\CountDownList.snk</AssemblyOriginatorKeyFile>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <ApplicationManifest>app.manifest</ApplicationManifest>
    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
    <Deterministic>False</Deterministic>
    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
    <DebugType>none</DebugType>
    <DebugType>full</DebugType>
    <WarningLevel>8</WarningLevel>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
    <Deterministic>False</Deterministic>
    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
    <DebugType>none</DebugType>
    <WarningLevel>8</WarningLevel>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Pub|AnyCPU'">
    <Deterministic>False</Deterministic>
    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
    <DebugType>none</DebugType>
    <WarningLevel>8</WarningLevel>
    <Optimize>True</Optimize>
  </PropertyGroup>
  <ItemGroup>
    <None Remove="Data\Image\1.jpg" />
+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@

        <local:MyScrollViewer Grid.Row="1" Margin="4" Style="{DynamicResource ScrollViewerBaseStyle}">
            <StackPanel>
                <TextBlock FontSize="18">CountDownList1.4.2更新内容</TextBlock>
                <TextBlock Margin="20,8,0,64">
                    优化存储空间界面体验
                </TextBlock>

                <TextBlock FontSize="18">CountDownList1.4.1更新内容</TextBlock>
                <TextBlock Margin="20,8,0,64">
                    增加存储空间管理的空目录判断,避免在精简安装后打开存储空间管理时崩溃的问题
+80 −59
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@

        <TextBlock Margin="16,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="24" Text="管理存储空间"/>

        <local:MyScrollViewer Grid.Row="1" Style="{DynamicResource ScrollViewerBaseStyle}" Margin="2,0,2,0">
            <StackPanel>
        <Grid Grid.Row="1" Height="96" VerticalAlignment="Top" Margin="32,32,32,0">
            <Rectangle x:Name="sizeBox" Height="48" Fill="#FFDEDEDE"/>

@@ -45,49 +43,52 @@
            </StackPanel>

            <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom">
                        <StackPanel Orientation="Horizontal">
                            <Rectangle Width="10" Height="10" Fill="#FFDEDEDE"/>
                            <TextBlock Margin="6,0,0,0">应用程序和其他文件</TextBlock>
                        </StackPanel>

                        <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
                <StackPanel x:Name="resTag" Orientation="Horizontal" Margin="8,0,0,0">
                    <Rectangle Width="10" Height="10" Fill="#FFD8BE0D"/>
                    <TextBlock Margin="6,0,0,0">UI和资源文件</TextBlock>
                </StackPanel>

                        <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
                <StackPanel x:Name="shareTag" Orientation="Horizontal" Margin="8,0,0,0">
                    <Rectangle Width="10" Height="10" Fill="#FF9746FD"/>
                    <TextBlock Margin="6,0,0,0">分享缓存</TextBlock>
                </StackPanel>

                        <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
                <StackPanel x:Name="customTag" Orientation="Horizontal" Margin="8,0,0,0">
                    <Rectangle Width="10" Height="10" Fill="#FF77B54E"/>
                    <TextBlock Margin="6,0,0,0">自定义图像集</TextBlock>
                </StackPanel>

                        <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
                <StackPanel x:Name="gsnTag" Orientation="Horizontal" Margin="8,0,0,0">
                    <Rectangle Width="10" Height="10" Fill="#FFECB02C"/>
                    <TextBlock Margin="6,0,0,0">Genshin图像集</TextBlock>
                </StackPanel>

                        <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
                <StackPanel x:Name="gseTag" Orientation="Horizontal" Margin="8,0,0,0">
                    <Rectangle Width="10" Height="10" Fill="#FFD02CEC"/>
                    <TextBlock Margin="6,0,0,0">Genshin扩展图像集</TextBlock>
                </StackPanel>

                        <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
                <StackPanel x:Name="mcTag" Orientation="Horizontal" Margin="8,0,0,0">
                    <Rectangle Width="10" Height="10" Fill="#FF16A79D"/>
                    <TextBlock Margin="6,0,0,0">Minecraft图像集</TextBlock>
                </StackPanel>

                        <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
                <StackPanel x:Name="bgTag" Orientation="Horizontal" Margin="8,0,0,0">
                    <Rectangle Width="10" Height="10" Fill="#FFD47634"/>
                    <TextBlock Margin="6,0,0,0">背景图片</TextBlock>
                </StackPanel>

                <StackPanel x:Name="appTag" Orientation="Horizontal" Margin="8,0,0,0">
                    <Rectangle Width="10" Height="10" Fill="#FFDEDEDE"/>
                    <TextBlock Margin="6,0,0,0">应用程序和其他文件</TextBlock>
                </StackPanel>
            </StackPanel>
        </Grid>


        <local:MyScrollViewer Grid.Row="1" Style="{DynamicResource ScrollViewerBaseStyle}" Margin="2,140,2,0">
            <StackPanel>

                <Expander x:Name="appE" Margin="32,12,32,4">
                    <Expander.Header>
                        应用程序
@@ -108,6 +109,8 @@
                        <StackPanel Margin="24,32,24,32">
                            <TextBlock>删除帮助窗口资源</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_1">删除</Button>
                            <TextBlock Margin="0,24,0,0">删除标签存储(关闭后删除)</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_6">删除并重启</Button>
                        </StackPanel>
                    </Border>
                </Expander>
@@ -120,6 +123,9 @@
                        <StackPanel Margin="24,32,24,32">
                            <TextBlock>删除所有分享缓存</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_2">删除</Button>

                            <TextBlock Margin="0,24,0,0">查看分享文件夹</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_7">打开</Button>
                        </StackPanel>
                    </Border>
                </Expander>
@@ -132,6 +138,9 @@
                        <StackPanel Margin="24,32,24,32">
                            <TextBlock>删除所有资源</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_21">删除</Button>

                            <TextBlock Margin="0,24,0,0">查看Custom文件夹</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_8">打开</Button>
                        </StackPanel>
                    </Border>
                </Expander>
@@ -144,6 +153,9 @@
                        <StackPanel Margin="24,32,24,32">
                            <TextBlock>删除所有资源</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_3">删除</Button>

                            <TextBlock Margin="0,24,0,0">查看GenshinNormal文件夹</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_9">打开</Button>
                        </StackPanel>
                    </Border>
                </Expander>
@@ -156,6 +168,9 @@
                        <StackPanel Margin="24,32,24,32">
                            <TextBlock>删除所有资源</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_31">删除</Button>

                            <TextBlock Margin="0,24,0,0">查看GenshinExtra文件夹</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_10">打开</Button>
                        </StackPanel>
                    </Border>
                </Expander>
@@ -168,6 +183,9 @@
                        <StackPanel Margin="24,32,24,32">
                            <TextBlock>删除所有资源</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_4">删除</Button>

                            <TextBlock Margin="0,24,0,0">查看Minecraft文件夹</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_11">打开</Button>
                        </StackPanel>
                    </Border>
                </Expander>
@@ -181,8 +199,11 @@
                            <TextBlock>尝试删除所有背景</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_5">删除</Button>

                            <TextBlock Margin="0,16,0,0">仅删除未使用的背景图片</TextBlock>
                            <TextBlock Margin="0,24,0,0">仅删除未使用的背景图片</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" IsEnabled="False">删除</Button>

                            <TextBlock Margin="0,24,0,0">查看背景图片文件夹</TextBlock>
                            <Button HorizontalAlignment="Left" Margin="0,6,0,0" Click="Button_Click_12">打开</Button>
                        </StackPanel>
                    </Border>
                </Expander>
Loading