fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(main): Extract connection detection logic to method

Browse Source 
Refactored the connection detection logic in AsstProxy.cs to a separate method for improved readability and maintainability. Adjusted return types in SettingsViewModel.cs to return empty strings instead of nulls for better consistency.

Signed-off-by: acturea <acturea@gmail.com>
This commit is contained in:
acturea
2024-08-07 23:36:49 +08:00
parent c707825a92
commit 06a8cb68ff
2 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -1745,46 +1745,7 @@ namespace MaaWpfGui.Main
if (Instances.SettingsViewModel.AutoDetectConnection)
{
string? bsHvAddress = Instances.SettingsViewModel.TryToSetBlueStacksHyperVAddress();
if (string.Equals(Instances.SettingsViewModel.ConnectAddress, bsHvAddress))
{
// 防止bsHvAddress和connectAddress重合
bsHvAddress = string.Empty;
}
// tcp连接测试端口是否有效，超时时间500ms
// 如果是本地设备，没有冒号
bool adbResult =
(!Instances.SettingsViewModel.ConnectAddress.Contains(':') &&
!string.IsNullOrEmpty(Instances.SettingsViewModel.ConnectAddress)) ||
IfPortEstablished(Instances.SettingsViewModel.ConnectAddress);
bool bsResult = IfPortEstablished(bsHvAddress);
if (adbResult)
{
error = string.Empty;
}
else if (bsResult)
{
if (string.IsNullOrEmpty(Instances.SettingsViewModel.AdbPath))
{
Instances.SettingsViewModel.DetectAdbConfig(ref error);
}
Instances.SettingsViewModel.ConnectAddress = bsHvAddress;
if (string.IsNullOrEmpty(error))
{
error = string.Empty;
}
}
else if (Instances.SettingsViewModel.DetectAdbConfig(ref error))
{
// https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8547
// DetectAdbConfig 会把 ConnectAddress 变成第一个不是 emulator 开头的地址，可能会存在多开问题
error = string.Empty;
}
else
if (!AutoDetectConnection(ref error))
{
return false;
}
@@ -1861,6 +1822,48 @@ namespace MaaWpfGui.Main
return ret;
}
private static bool AutoDetectConnection(ref string error)
{
string bsHvAddress = Instances.SettingsViewModel.TryToSetBlueStacksHyperVAddress();
// tcp连接测试端口是否有效，超时时间500ms
// 如果是本地设备，没有冒号
bool adbResult =
(!Instances.SettingsViewModel.ConnectAddress.Contains(':') &&
!string.IsNullOrEmpty(Instances.SettingsViewModel.ConnectAddress)) ||
IfPortEstablished(Instances.SettingsViewModel.ConnectAddress);
if (adbResult)
{
error = string.Empty;
return true;
}
bool bsResult = IfPortEstablished(bsHvAddress);
if (bsResult)
{
error = string.Empty;
if (string.IsNullOrEmpty(Instances.SettingsViewModel.AdbPath) && Instances.SettingsViewModel.DetectAdbConfig(ref error))
{
return string.IsNullOrEmpty(error);
}
Instances.SettingsViewModel.ConnectAddress = bsHvAddress;
return true;
}
if (Instances.SettingsViewModel.DetectAdbConfig(ref error))
{
// https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8547
// DetectAdbConfig 会把 ConnectAddress 变成第一个不是 emulator 开头的地址，可能会存在多开问题
error = string.Empty;
return true;
}
return false;
}
private AsstTaskId AsstAppendTaskWithEncoding(string type, JObject? taskParams = null)
{
taskParams ??= new();

4
src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
View File

@@ -4345,13 +4345,13 @@ namespace MaaWpfGui.ViewModels.UI
{
if (string.IsNullOrEmpty(_bluestacksConfig))
{
return null;
return string.Empty;
}
if (!File.Exists(_bluestacksConfig))
{
ConfigurationHelper.SetValue(ConfigurationKeys.BluestacksConfigError, "File not exists");
return null;
return string.Empty;
}
var allLines = File.ReadAllLines(_bluestacksConfig);