fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix.简单修复一下界面上连接设置ip地址错误的问题

Browse Source 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/540
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/538
This commit is contained in:
MistEO
2022-05-22 00:35:32 +08:00
parent bfd364cabe
commit c976ec41b2
5 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MeoAssistant/Controller.cpp
View File

@@ -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());

8
src/MeoAsstGui/UserControl/ConnectSettingsUserControl.xaml
View File

@@ -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"

18
src/MeoAsstGui/ViewModels/SettingsViewModel.cs
View File

@@ -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()

1
tools/ItemMappingCvt/Arknights-Bot-Resource Submodule

Submodule tools/ItemMappingCvt/Arknights-Bot-Resource added at 388e9b94d6

8
tools/TestCaller/main.cpp
View File

@@ -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"(
//{