From c2dfe33d7f1d539b57da2b349e1c7ba1cd081ea9 Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Wed, 5 Mar 2025 21:35:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20wpf=E5=BC=80=E5=A7=8B=E5=94=A4=E9=86=92?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=9C=A8=E6=9C=AA=E9=80=89=E6=8B=A9=E5=AE=98?=
 =?UTF-8?q?=E6=9C=8D/B=E6=9C=8D=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E8=B4=A6=E5=8F=B7=E5=88=87=E6=8D=A2=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/UI/TaskQueueViewModel.cs       |  8 +------
 .../StartUpSettingsUserControlModel.cs        | 22 +++++++++++++++++++
 .../TaskQueue/StartUpTaskUserControl.xaml     |  8 ++++---
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index e5b68cb22d..5795ed7932 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -1541,13 +1541,7 @@ namespace MaaWpfGui.ViewModels.UI
 
         private static bool AppendStart()
         {
-            var clientType = SettingsViewModel.GameSettings.ClientType;
-            var (type, param) = new AsstStartUpTask()
-            {
-                ClientType = clientType,
-                StartGame = !string.IsNullOrEmpty(clientType),
-                AccountName = StartUpTask.AccountName,
-            }.Serialize();
+            var (type, param) = StartUpTask.Serialize();
             return Instances.AsstProxy.AsstAppendTaskWithEncoding(AsstProxy.TaskType.StartUp, type, param);
         }
 
diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/StartUpSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/StartUpSettingsUserControlModel.cs
index 07e087d27b..cfc5d6e612 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/StartUpSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/StartUpSettingsUserControlModel.cs
@@ -14,6 +14,9 @@
 using MaaWpfGui.Constants;
 using MaaWpfGui.Helper;
 using MaaWpfGui.Main;
+using MaaWpfGui.Models.AsstTasks;
+using MaaWpfGui.Services;
+using MaaWpfGui.ViewModels.UI;
 using Newtonsoft.Json.Linq;
 
 namespace MaaWpfGui.ViewModels.UserControl.TaskQueue;
@@ -54,4 +57,23 @@ public class StartUpSettingsUserControlModel : TaskViewModel
             Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("AccountSwitch") + $" -->> {details["details"]!["account_name"]}", UiLogColor.Info); // subTaskDetails!["current_account"]
         }
     }
+
+    public override (AsstTaskType Type, JObject Params) Serialize()
+    {
+        var clientType = SettingsViewModel.GameSettings.ClientType;
+        var accountName = clientType switch
+        {
+            "Official" or "Bilibili" => AccountName,
+            _ => string.Empty,
+        };
+
+        var task = new AsstStartUpTask()
+        {
+            ClientType = clientType,
+            StartGame = !string.IsNullOrEmpty(clientType),
+            AccountName = accountName,
+        };
+
+        return task.Serialize();
+    }
 }
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/StartUpTaskUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/StartUpTaskUserControl.xaml
index 658c3cb067..f167ccd9b9 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/StartUpTaskUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/StartUpTaskUserControl.xaml
@@ -19,14 +19,15 @@
     s:View.ActionTarget="{Binding}"
     mc:Ignorable="d">
     <StackPanel>
-        <Grid Margin="0,5" Visibility="{c:Binding 'ClientType == &quot;Official&quot; or ClientType == &quot;Bilibili&quot; or ClientType == &quot;&quot;', Source={x:Static ui:SettingsViewModel.GameSettings}}">
+        <Grid Margin="0,5" Visibility="{c:Binding 'ClientType == &quot;Official&quot; or ClientType == &quot;Bilibili&quot;', Source={x:Static ui:SettingsViewModel.GameSettings}}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <hc:TextBox
                 hc:TitleElement.Title="{DynamicResource AccountSwitch}"
-                IsReadOnly="{c:Binding !Idle, Source={x:Static helper:Instances.SettingsViewModel}}"
+                IsReadOnly="{c:Binding !Idle,
+                                       Source={x:Static helper:Instances.SettingsViewModel}}"
                 Style="{StaticResource TextBoxExtend}"
                 Text="{Binding AccountName, UpdateSourceTrigger=PropertyChanged}"
                 ToolTip="{DynamicResource AccountSwitchTip}" />
@@ -135,7 +136,8 @@
             SelectedValue="{Binding ClientType, Source={x:Static ui:SettingsViewModel.GameSettings}}"
             SelectedValuePath="Value"
             Style="{StaticResource ComboBoxExtend}"
-            Visibility="{c:Binding !TaskSettingVisibilities.Guide, Source={x:Static helper:Instances.SettingsViewModel}}" />
+            Visibility="{c:Binding !TaskSettingVisibilities.Guide,
+                                   Source={x:Static helper:Instances.SettingsViewModel}}" />
 
     </StackPanel>
 </UserControl>