From e9c925cf908060d2e22bdbdf99bcde6962791da7 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sun, 22 May 2022 00:35:32 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E7=AE=80=E5=8D=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8B=E7=95=8C=E9=9D=A2=E4=B8=8A=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEip=E5=9C=B0=E5=9D=80=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/540
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/538
---
 src/MeoAssistant/Controller.cpp                | 10 +++++-----
 .../ConnectSettingsUserControl.xaml            |  8 +++-----
 src/MeoAsstGui/ViewModels/SettingsViewModel.cs | 18 +++++++++++-------
 tools/ItemMappingCvt/Arknights-Bot-Resource    |  1 +
 tools/TestCaller/main.cpp                      |  8 ++++----
 5 files changed, 24 insertions(+), 21 deletions(-)
 create mode 160000 tools/ItemMappingCvt/Arknights-Bot-Resource

diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp
index 9ab6a6249f..b43517c11b 100644
--- a/src/MeoAssistant/Controller.cpp
+++ b/src/MeoAssistant/Controller.cpp
@@ -393,11 +393,11 @@ bool asst::Controller::screencap()
 {
     LogTraceFunction;
 
-    //if (true) {
-    //    std::unique_lock<std::shared_mutex> image_lock(m_image_mutex);
-    //    m_cache_image = cv::imread("err/1.png");
-    //    return true;
-    //}
+    if (true) {
+        std::unique_lock<std::shared_mutex> image_lock(m_image_mutex);
+        m_cache_image = cv::imread("err/1.png");
+        return true;
+    }
 
     DecodeFunc decode_raw_with_gzip = [&](const std::vector<uchar>& data) -> bool {
         auto unzip_data = gzip::decompress(data.data(), data.size());
diff --git a/src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml
index 93d264d7ba..4e3bc01f5f 100644
--- a/src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml
@@ -23,15 +23,13 @@
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
             <TextBlock Style="{StaticResource TextBlockDefault}" Block.TextAlignment="Center"
                    Text="连接地址" Margin="10" />
-            <ComboBox Width="250" Margin="0, 5"
-                      IsEditable="True"
-                      ItemsSource="{Binding ConnectAddressList}"
-                      SelectedValue="{Binding ConnectAddress}" />
+            <TextBox Text="{Binding ConnectAddress}" Margin="10"
+                     Width="250" />
         </StackPanel>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
             <TextBlock Style="{StaticResource TextBlockDefault}" Block.TextAlignment="Center"
                    Text="连接配置" Margin="10" />
-            <ComboBox Width="250" Margin="0, 5"
+            <ComboBox Width="250" Margin="10"
                       ItemsSource="{Binding ConnectConfigList}"
                       DisplayMemberPath="Display"
                       SelectedValuePath="Value"
diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
index 8f0f9ee21a..150562f6ed 100644
--- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
@@ -870,13 +870,16 @@ namespace MeoAsstGui
             {
                 SetAndNotify(ref _connectConfig, value);
                 ViewStatusStorage.Set("Connect.ConnectConfig", value);
-                UpdateAddressByConfig();
+                if (ConnectAddress.Length == 0)
+                {
+                    UpdateAddressByConfig();
+                }
             }
         }
 
         private readonly Dictionary<string, List<string>> ConfigAddressesMapping = new Dictionary<string, List<string>>
             {
-                { "General", new List<string> {} },
+                { "General", new List<string> {""} },
                 { "BlueStacks", new List<string> {"127.0.0.1:5555", "127.0.0.1:5556", "127.0.0.1:5557" } },
                 { "MuMuEmulator", new List<string>{"127.0.0.1:7555"} },
                 { "LDPlayer", new List<string>{ "127.0.0.1:5555", "emulator-5554" } },
@@ -888,11 +891,12 @@ namespace MeoAsstGui
         public void UpdateAddressByConfig()
         {
             var addresses = ConfigAddressesMapping[ConnectConfig];
-            ConnectAddressList.Clear();
-            foreach (var address in addresses)
-            {
-                ConnectAddressList.Add(address);
-            }
+            ConnectAddress = addresses.FirstOrDefault();
+            //ConnectAddressList.Clear();
+            //foreach (var address in addresses)
+            //{
+            //    ConnectAddressList.Add(address);
+            //}
         }
 
         public void SelectFile()
diff --git a/tools/ItemMappingCvt/Arknights-Bot-Resource b/tools/ItemMappingCvt/Arknights-Bot-Resource
new file mode 160000
index 0000000000..388e9b94d6
--- /dev/null
+++ b/tools/ItemMappingCvt/Arknights-Bot-Resource
@@ -0,0 +1 @@
+Subproject commit 388e9b94d65405e99620762446443f73247843cd
diff --git a/tools/TestCaller/main.cpp b/tools/TestCaller/main.cpp
index bcd291a2f7..04e55b83cb 100644
--- a/tools/TestCaller/main.cpp
+++ b/tools/TestCaller/main.cpp
@@ -35,7 +35,7 @@ int main(/*int argc, char** argv*/)
 
     /* 详细参数可参考 docs / 集成文档.md */
 
-    //AsstAppendTask(ptr, "StartUp", R"({})");
+    //AsstAppendTask(ptr, "StartUp", nullptr);
 
 //    AsstAppendTask(ptr, "Fight", R"(
 //{
@@ -58,7 +58,7 @@ int main(/*int argc, char** argv*/)
     //}
     //)");
     //
-    //    AsstAppendTask(ptr, "Visit", R"({})");
+    //    AsstAppendTask(ptr, "Visit", nullptr);
     //
     //    AsstAppendTask(ptr, "Mall", R"(
     //{
@@ -72,7 +72,7 @@ int main(/*int argc, char** argv*/)
     //    ]
     //}
     //)");
-    //    AsstAppendTask(ptr, "Award", R"({})");
+    //    AsstAppendTask(ptr, "Award", nullptr);
     //
     //AsstAppendTask(ptr, "Roguelike", R"(
     //{
@@ -92,7 +92,7 @@ int main(/*int argc, char** argv*/)
     //}
     //)");
 
-    AsstAppendTask(ptr, "Debug", R"({})");
+    AsstAppendTask(ptr, "Debug", nullptr);
 
     //    AsstAppendTask(ptr, "Copilot", R"(
     //{