Merge remote-tracking branch 'origin/dev' into dev

2. 任务数配置不显示问题

App.xaml.cs

@@ -59,6 +59,7 @@ namespace HeBianGu.App.Disk
             services.AddPropertyGridMessage();
             services.AddAutoColumnPagedDataGridMessage();
             //services.AddNotifyMessage();
+            // 设置
             services.AddSetting();
             // 认证
             // services.AddIdentity(x => x.ProductFontSize = 50);
@@ -88,7 +89,7 @@ namespace HeBianGu.App.Disk
             //services.AddSurveyViewPresenter();
             //services.AddFeedbackViewPresenter();
             services.AddLogoutViewPresenter();
-            services.AddAboutViewPresenter();
+            //services.AddAboutViewPresenter();
             services.AddMoreViewPresenter(x =>
             {
                 //x.AddPersenter(UpgradeViewPresenter.Instance);
@@ -96,7 +97,7 @@ namespace HeBianGu.App.Disk
                 //x.AddPersenter(VipViewPresenter.Instance);
                 //x.AddPersenter(SurveyViewPresenter.Instance);
                 //x.AddPersenter(FeedbackViewPresenter.Instance);
-                x.AddPersenter(AboutViewPresenter.Instance);
+                //x.AddPersenter(AboutViewPresenter.Instance);
                 x.AddPersenter(LogoutViewPresenter.Instance);
             });
 
@@ -104,8 +105,8 @@ namespace HeBianGu.App.Disk
 
             #region - WindowCaption -
 
-            // 
+            //以下各种功能按钮
-            services.AddLoginViewPresenter();
+            //services.AddLoginViewPresenter();
             // 引导功能按钮
             services.AddGuideViewPresenter();
             services.AddHideWindowViewPresenter();
@@ -114,12 +115,12 @@ namespace HeBianGu.App.Disk
             //services.AddThemeRightViewPresenter();
             services.AddWindowCaptionViewPresenter(x =>
             {
-                //x.AddPersenter(LoginViewPresenter.Instance);
+                x.AddPersenter(LoginViewPresenter.Instance);
                 x.AddPersenter(MoreViewPresenter.Instance);
                 x.AddPersenter(GuideViewPresenter.Instance);
-                //x.AddPersenter(HideWindowViewPresenter.Instance);
+                x.AddPersenter(HideWindowViewPresenter.Instance);
                 x.AddPersenter(SettingViewPresenter.Instance);
-                x.AddPersenter(ThemeRightToolViewPresenter.Instance);
+                //x.AddPersenter(ThemeRightToolViewPresenter.Instance);
             });
 
             #endregion
@@ -138,6 +139,7 @@ namespace HeBianGu.App.Disk
                 x.Settings.Add(MySetting.Instance);
             });
             app.UseStyle();
+            //app.UseSettingDefault();
             //  Do：设置默认主题
             app.UseLocalTheme(l =>
             {

View/ShellWindow.xaml

@@ -5,6 +5,7 @@
                   xmlns:h="https://github.com/HeBianGu"
                   xmlns:local="clr-namespace:HeBianGu.App.Disk"
                   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  Title=""
                   Width="1266"
                   Height="720"
                   BorderBrush="Transparent"

View/Sync/SyncControl.xaml

@@ -46,7 +46,6 @@
                 <Setter Property="h:Cattach.TitleHorizontalAlignment" Value="Left" />
                 <Setter Property="h:Cattach.UseBackground" Value="False" />
                 <Setter Property="h:Cattach.BackgroundColumn" Value="1" />
-                <Setter Property="SelectedIndex" Value="0" />
             </Style>
 
             <Style BasedOn="{StaticResource {x:Static h:ButtonKeys.LabelSingle}}" TargetType="Button">
@@ -91,7 +90,9 @@
                 <StackPanel Margin="10,6">
                     <h:Row>
                         <StackPanel Orientation="Horizontal">
-                            <TextBox h:Cattach.Title="下载目录:" Text="{Binding SyncDir, Mode=TwoWay}"
+                            <TextBox h:Cattach.Title="下载目录"
+                                     Style="{StaticResource {x:Static h:TextBoxKeys.LabelNone}}"
+                                     Text="{Binding SyncDir, Mode=TwoWay}"
                                      VerticalAlignment="Center" Width="250"
                                      Grid.Column="0" />
                             <Button h:Cattach.Icon="&#xeadb;"
@@ -103,11 +104,16 @@
                     <h:Row>
                         <ComboBox Width="250" h:Cattach.Title="同时下载任务数"
                                   SelectedValue="{Binding TaskCount, Mode=TwoWay}">
-                            <system:String>1</system:String>
+                            <h:Interaction.Triggers>
-                            <system:String>2</system:String>
+                                <h:EventTrigger EventName="SelectionChanged">
-                            <system:String>3</system:String>
+                                    <h:InvokeCommandAction Command="{Binding ComboBox_SelectionChanged}"/>
-                            <system:String>4</system:String>
+                                </h:EventTrigger>
-                            <system:String>5</system:String>
+                            </h:Interaction.Triggers>
+                            <system:Int32>1</system:Int32>
+                            <system:Int32>2</system:Int32>
+                            <system:Int32>3</system:Int32>
+                            <system:Int32>4</system:Int32>
+                            <system:Int32>5</system:Int32>
                         </ComboBox>
                     </h:Row>
                     <h:Row>

ViewModel/Sync/SyncViewModel.cs

@@ -19,6 +19,7 @@ public class SyncViewModel : MvcViewModelBase
     protected override void Init()
     {
         Console.WriteLine("init");
+        EnumValues = ["1", "2", "3", "4", "5"];
         //RaisePropertyChanged();
         /*LinkActions.Add(new LinkAction() { Action = "Space", Controller = "Loyout", DisplayName = "会话", Logo = "\xe613" });
 
@@ -35,21 +36,28 @@ public class SyncViewModel : MvcViewModelBase
         _serializerService = serializerService;
         if (File.Exists("./settings.xml"))
         {
-             _setting = _serializerService.Load<SystemSetting>("./settings.xml");
+            _setting = _serializerService.Load<SystemSetting>("./settings.xml");
-             // 同步字段
+            // 同步字段
-            SyncDir = _setting.SyncDir;
             TaskCount = _setting.TaskCount;
+            SyncDir = _setting.SyncDir;
         }
         else
         {
             _setting = new SystemSetting();
         }
-
+        ComboBox_SelectionChanged = new RelayCommand( async()=> await ComboBox_SelectionUpdate());
         OpenDirCommand = new RelayCommand(async () => await ButtonBase_OnClick());
-        SyncData = new RelayCommand(async () => await SyncDataQuck());
+        SyncData = new RelayCommand(async () => await SyncDataQuick());
+      
     }
 
-    private async Task<object> SyncDataQuck()
+    private async Task ComboBox_SelectionUpdate()
+    {
+        _setting.TaskCount = TaskCount;
+        _serializerService.Save("./settings.xml", _setting);
+    }
+
+    private async Task<object> SyncDataQuick()
     {
         return _minioService.MirrorAsync1(_minioService._bucketName, SyncDir, _taskCount);
     }
@@ -59,7 +67,21 @@ public class SyncViewModel : MvcViewModelBase
         Console.WriteLine("Loaded");
     }
 
-    public int _taskCount = 3;
+
+    private List<string> _enumValues;
+
+    public List<string> EnumValues
+    {
+        get { return _enumValues; }
+        set
+        {
+            _enumValues = value;
+            RaisePropertyChanged();
+        }
+    }
+
+
+    private int _taskCount = 3;
 
     public int TaskCount
     {
@@ -67,9 +89,6 @@ public class SyncViewModel : MvcViewModelBase
         set
         {
             _taskCount = value;
-            _setting.TaskCount = value;
-            _serializerService.Save("./settings.xml", _setting);
-            //_serializerService.Save("./settings.xml", this);
             RaisePropertyChanged();
         }
     }
@@ -85,7 +104,9 @@ public class SyncViewModel : MvcViewModelBase
             RaisePropertyChanged();
         }
     }
+
     public RelayCommand SyncData { get; set; }
+    public RelayCommand ComboBox_SelectionChanged { get; set; }
 
 
     public class RelayCommand : ICommand