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

fix: 获取雷电 pid 失败

Browse Source
This commit is contained in:
uye
2025-07-09 17:29:25 +08:00
parent 66f60a206a
commit 0c175c4ba7
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/MaaWpfGui/ViewModels/UserControl/Settings/ConnectSettingsUserControlModel.cs
View File

@@ -593,6 +593,29 @@ public class ConnectSettingsUserControlModel : PropertyChangedBase
return 0;
}
private static int GetEmulatorIndex(string address)
{
int index = 0;
if (string.IsNullOrEmpty(address))
{
return index;
}
const int BaseEmulatorPort = 5554;
const int BaseAdbPort = 5555;
if (address.StartsWith("emulator-") && int.TryParse(address[9..], out int port))
{
index = (port - BaseEmulatorPort) / 2;
}
else if (address.StartsWith("127.0.0.1:") && int.TryParse(address[10..], out int port2))
{
index = (port2 - BaseAdbPort) / 2;
}
return index;
}
public string Config
{
get
@@ -602,17 +625,22 @@ public class ConnectSettingsUserControlModel : PropertyChangedBase
return JsonConvert.SerializeObject(new JObject());
}
var index = int.TryParse(Index, out var indexParse) ? indexParse : 0;
int index;
if (ManualSetIndex)
{
index = int.TryParse(Index, out var indexParse) ? indexParse : 0;
}
else
{
index = GetEmulatorIndex(SettingsViewModel.ConnectSettings.ConnectAddress);
}
var configObject = new JObject
{
["path"] = EmulatorPath,
["index"] = index,
["pid"] = GetEmulatorPid(index),
};
if (ManualSetIndex)
{
configObject["index"] = index;
}
return JsonConvert.SerializeObject(configObject);
}