From c3d1abb6672fe93cdb9fa327a6af5b089be53fb2 Mon Sep 17 00:00:00 2001
From: lhhxxxxx <91231470+lhhxxxxx@users.noreply.github.com>
Date: Thu, 10 Nov 2022 22:10:48 +0800
Subject: [PATCH] =?UTF-8?q?feat.=20=E5=A2=9E=E5=8A=A0=E5=A7=8B=E7=BB=88?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A3=80=E6=B5=8B=E8=BF=9E=E6=8E=A5=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MeoAsstGui/Helper/AsstProxy.cs            |  5 +++-
 .../Resources/Localizations/zh-cn.xaml        |  3 +-
 .../ConnectSettingsUserControl.xaml           | 30 +++++++++++++------
 .../ViewModels/SettingsViewModel.cs           | 12 ++++++++
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/MeoAsstGui/Helper/AsstProxy.cs b/src/MeoAsstGui/Helper/AsstProxy.cs
index 770c222a8d..9a89bf4ba7 100644
--- a/src/MeoAsstGui/Helper/AsstProxy.cs
+++ b/src/MeoAsstGui/Helper/AsstProxy.cs
@@ -1064,7 +1064,10 @@ namespace MeoAsstGui
 
             if (ret)
             {
-                settings.AutoDetectConnection = false;
+                if (!settings.AlwaysAutoDetectConnection)
+                {
+                    settings.AutoDetectConnection = false;
+                }
             }
             else
             {
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
index 6d81c7e9b3..ab49e48c8c 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
@@ -206,7 +206,8 @@
     <system:String x:Key="CustomStageCodeTip">（测试功能）支持大部分主线关卡名与原列表的关卡名（如4-10、AP-5）</system:String>
 
     <system:String x:Key="AutoDetectConnection">自动检测连接</system:String>
-    <system:String x:Key="AutoDetectConnectionTip">每次检测完成后会自动取消勾选，若需要重新检测可再次勾选</system:String>
+    <system:String x:Key="AutoDetectConnectionTip">每次检测完成后会自动取消勾选，若需要重新检测可再次勾选，若反复连接失败可勾选始终自动检测连接</system:String>
+    <system:String x:Key="AlwaysAutoDetectConnection">始终自动检测连接</system:String>
     <system:String x:Key="ADBPath">adb 路径 (相对/绝对)</system:String>
     <system:String x:Key="ConnectionAddress">连接地址</system:String>
     <system:String x:Key="ConnectionAddressTip">若遇到问题可尝试手动修改</system:String>
diff --git a/src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml
index 99f64e66e2..ce63a7fc71 100644
--- a/src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml
@@ -24,6 +24,7 @@
             <RowDefinition />
             <RowDefinition />
             <RowDefinition />
+            <RowDefinition />
         </Grid.RowDefinitions>
         <CheckBox
             Grid.Row="0"
@@ -34,16 +35,26 @@
             Content="{DynamicResource AutoDetectConnection}"
             ToolTip="{DynamicResource AutoDetectConnectionTip}"
             HorizontalAlignment="Center" />
-        <TextBlock
+        <CheckBox
             Grid.Row="1"
             Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="15"
+            VerticalAlignment="Center"
+            IsChecked="{Binding AlwaysAutoDetectConnection}"
+            Content="{DynamicResource AlwaysAutoDetectConnection}"
+            Visibility="{c:Binding AutoDetectConnection}"
+            HorizontalAlignment="Center" />
+        <TextBlock
+            Grid.Row="2"
+            Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
             Style="{StaticResource TextBlockDefault}"
             Text="{DynamicResource ADBPath}"
             TextWrapping="Wrap" />
         <TextBox
-            Grid.Row="1"
+            Grid.Row="2"
             Grid.Column="1"
             Width="250"
             Height="30"
@@ -51,8 +62,8 @@
             IsEnabled="{c:Binding !AutoDetectConnection}"
             Text="{Binding AdbPath}" />
         <Button
-            Grid.Row="1"
-            Grid.Column="3"
+            Grid.Row="2"
+            Grid.Column="2"
             Width="60"
             Height="30"
             Margin="10"
@@ -62,7 +73,7 @@
             Content="{DynamicResource Select}" />
 
         <TextBlock
-            Grid.Row="2"
+            Grid.Row="3"
             Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
@@ -70,7 +81,7 @@
             Text="{DynamicResource ConnectionAddress}"
             TextWrapping="Wrap" />
         <TextBox
-            Grid.Row="2"
+            Grid.Row="3"
             Grid.Column="1"
             Width="250"
             Height="30"
@@ -80,7 +91,7 @@
             ToolTip="{DynamicResource ConnectionAddressTip}" />
 
         <TextBlock
-            Grid.Row="3"
+            Grid.Row="4"
             Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
@@ -88,7 +99,7 @@
             Text="{DynamicResource ConnectionPreset}"
             TextWrapping="Wrap" />
         <ComboBox
-            Grid.Row="3"
+            Grid.Row="4"
             Grid.Column="1"
             Width="250"
             Height="30"
@@ -100,7 +111,8 @@
             SelectedValuePath="Value" />
 
         <CheckBox
-            Grid.Row="4"
+            Grid.Row="5"
+            Grid.Column="0"
             Grid.ColumnSpan="2"
             Margin="15"
             VerticalAlignment="Center"
diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
index 2d4c46fd97..724bc49c04 100644
--- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
@@ -1620,6 +1620,18 @@ namespace MeoAsstGui
             }
         }
 
+        private bool _alwaysAutoDetectConnection = bool.Parse(ViewStatusStorage.Get("Connect.AlwaysAutoDetect", false.ToString()));
+
+        public bool AlwaysAutoDetectConnection
+        {
+            get => _alwaysAutoDetectConnection;
+            set
+            {
+                SetAndNotify(ref _alwaysAutoDetectConnection, value);
+                ViewStatusStorage.Set("Connect.AlwaysAutoDetect", value.ToString());
+            }
+        }
+
         private string _connectAddress = ViewStatusStorage.Get("Connect.Address", string.Empty);
 
         /// <summary>