fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复拉起模拟器失败报错

Browse Source
This commit is contained in:
uye
2022-12-22 20:41:46 +08:00
parent 7ff594faee
commit 5e3740451d
2 changed files with 75 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/MaaWpfGui/MaaWpfGui.csproj
View File

@@ -495,6 +495,17 @@
<ItemGroup>
<Resource Include="newlogo.ico" />
</ItemGroup>
<ItemGroup>
<COMReference Include="IWshRuntimeLibrary">
<Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /e /y /i /c "$(ProjectDir)..\..\3rdparty\tools" "$(TargetDir)"

100
src/MaaWpfGui/Main/SettingsViewModel.cs
View File

@@ -21,8 +21,8 @@ using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using IWshRuntimeLibrary;
using MaaWpfGui.MaaHotKeys;
using Newtonsoft.Json.Linq;
using Stylet;
using StyletIoC;
@@ -402,46 +402,74 @@ namespace MaaWpfGui
public void TryToStartEmulator(bool manual = false)
{
if ((EmulatorPath.Length == 0
|| !File.Exists(EmulatorPath))
|| !System.IO.File.Exists(EmulatorPath))
|| !(StartEmulator
|| manual))
{
return;
}
ProcessStartInfo startInfo;
if (EmulatorAddCommand.Length != 0)
{
startInfo = new ProcessStartInfo(EmulatorPath, EmulatorAddCommand);
}
else
{
startInfo = new ProcessStartInfo(EmulatorPath);
}
startInfo.UseShellExecute = false;
Process process = new Process
{
StartInfo = startInfo,
};
process.Start();
process.WaitForInputIdle();
if (MinimizingStartup)
{
for (int i = 0; !IsIconic(process.MainWindowHandle) && i < 5000; ++i)
{
ShowWindow(process.MainWindowHandle, SWMINIMIZE);
Thread.Sleep(1);
}
}
if (!int.TryParse(EmulatorWaitSeconds, out int delay))
{
delay = 60;
}
Thread.Sleep(delay * 1000);
try
{
string fileName;
string arguments;
ProcessStartInfo startInfo;
if (Path.GetExtension(EmulatorPath).ToLower() == ".lnk")
{
WshShell shell = new WshShell();
WshShortcut shortcut = (WshShortcut)shell.CreateShortcut(EmulatorPath);
fileName = shortcut.TargetPath;
arguments = shortcut.Arguments;
}
else
{
fileName = EmulatorPath;
arguments = EmulatorAddCommand;
}
if (arguments.Length != 0)
{
startInfo = new ProcessStartInfo(fileName, arguments);
}
else
{
startInfo = new ProcessStartInfo(fileName);
}
startInfo.UseShellExecute = false;
Process process = new Process
{
StartInfo = startInfo,
};
process.Start();
process.WaitForInputIdle();
if (MinimizingStartup)
{
for (int i = 0; !IsIconic(process.MainWindowHandle) && i < delay * 1000; ++i)
{
ShowWindow(process.MainWindowHandle, SWMINIMIZE);
Thread.Sleep(1);
}
}
}
catch (Exception)
{
if (EmulatorAddCommand.Length != 0)
{
Process.Start(EmulatorPath);
}
else
{
Process.Start(EmulatorPath, EmulatorAddCommand);
Thread.Sleep(delay * 1000);
}
}
}
/// <summary>
@@ -1934,13 +1962,13 @@ namespace MaaWpfGui
return;
}
if (!File.Exists(_bluestacksConfig))
if (!System.IO.File.Exists(_bluestacksConfig))
{
ViewStatusStorage.Set("Bluestacks.Config.Error", "File not exists");
return;
}
var all_lines = File.ReadAllLines(_bluestacksConfig);
var all_lines = System.IO.File.ReadAllLines(_bluestacksConfig);
foreach (var line in all_lines)
{
if (line.StartsWith(_bluestacksKeyWord))
@@ -1981,7 +2009,7 @@ namespace MaaWpfGui
public async void ReplaceADB()
{
if (!File.Exists(AdbPath))
if (!System.IO.File.Exists(AdbPath))
{
Execute.OnUIThread(() =>
{
@@ -1993,7 +2021,7 @@ namespace MaaWpfGui
return;
}
if (!File.Exists(GoogleAdbFilename))
if (!System.IO.File.Exists(GoogleAdbFilename))
{
var downloadTask = Task.Run(() =>
{
@@ -2022,7 +2050,7 @@ namespace MaaWpfGui
process.Kill();
}
File.Copy(AdbPath, AdbPath + ".bak", true);
System.IO.File.Copy(AdbPath, AdbPath + ".bak", true);
const string UnzipDir = "adb_unzip";
if (Directory.Exists(UnzipDir))
@@ -2031,7 +2059,7 @@ namespace MaaWpfGui
}
System.IO.Compression.ZipFile.ExtractToDirectory(GoogleAdbFilename, UnzipDir);
File.Copy(UnzipDir + "/platform-tools/adb.exe", AdbPath, true);
System.IO.File.Copy(UnzipDir + "/platform-tools/adb.exe", AdbPath, true);
Directory.Delete(UnzipDir, true);
});
await procTask;