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

perf: 优化部分 WPF 代码 (#6510)

Browse Source
This commit is contained in:
uye
2023-09-24 14:05:15 +08:00
committed by GitHub
parent 141ed1329e 2f5b58c6f5
commit f2fa4a440d
15 changed files with 179 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MAA.sln.DotSettings
View File

@@ -8,12 +8,15 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=arkplanner/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=asnipe/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Bilibili/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Bluestacks/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=desp/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=findstr/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Gacha/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=hwnd/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Infrast/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Inited/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Lolicon/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=luestacks/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=netstat/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=oper/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=opers/@EntryIndexedValue">True</s:Boolean>
@@ -27,5 +30,6 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Roguelike/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=rsnipe/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Todays/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=txwy/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=XYAZ/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=_0020_003D_0020stri/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

1
src/MaaWpfGui/Helper/ConfigurationHelper.cs
View File

@@ -157,6 +157,7 @@ namespace MaaWpfGui.Helper
/// </summary>
/// <param name="key">The configuration key.</param>
/// <returns>The return value of <see cref="Save"/>.</returns>
// ReSharper disable once UnusedMember.Global
public static bool DeleteValue(string key)
{
lock (_lock)

2
src/MaaWpfGui/Helper/WindowManager.cs
View File

@@ -115,7 +115,7 @@ namespace MaaWpfGui.Helper
return false;
}
private bool GetConfiguration(out WindowPlacement wp)
private static bool GetConfiguration(out WindowPlacement wp)
{
wp = default;
var jsonStr = ConfigurationHelper.GetValue(ConfigurationKeys.WindowPlacement, string.Empty);

12
src/MaaWpfGui/MaaWpfGui.csproj
View File

@@ -41,6 +41,18 @@
<ItemGroup>
<AdditionalFiles Include="stylecop.json" />
</ItemGroup>
<ItemGroup>
<COMReference Include="IWshRuntimeLibrary">
<WrapperTool>tlbimp</WrapperTool>
<VersionMinor>0</VersionMinor>
<VersionMajor>1</VersionMajor>
<Guid>f935dc20-1cf0-11d0-adb9-00c04fd58a0b</Guid>
<Lcid>0</Lcid>
<Isolated>false</Isolated>
<EmbedInteropTypes>true</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<!-- StyleCop -->
<ItemGroup>

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

@@ -618,13 +618,13 @@ namespace MaaWpfGui.Main
TimeSpan timeDiff = TimeSpan.Zero;
do
{
if (sanity_report?.Count() != 2 || !sanity_report[0].Contains("/"))
if (sanity_report?.Length != 2 || !sanity_report[0].Contains("/"))
{
break;
}
int[] sanity = sanity_report[0].Split('/').Select(i => Convert.ToInt32(i)).ToArray();
if (sanity?.Length != 2 || sanity[1] <= 1)
if (sanity.Length != 2 || sanity[1] <= 1)
{
break;
}
@@ -1231,7 +1231,7 @@ namespace MaaWpfGui.Main
/// </summary>
/// <param name="address">连接地址。</param>
/// <returns>是否有效。</returns>
public bool IfPortEstablished(string address)
private static bool IfPortEstablished(string address)
{
if (string.IsNullOrEmpty(address) || !address.Contains(":"))
{
@@ -1259,11 +1259,9 @@ namespace MaaWpfGui.Main
client.EndConnect(result);
return true;
}
else
{
client.Close();
return false;
}
client.Close();
return false;
}
catch (Exception)
{
@@ -1906,23 +1904,16 @@ namespace MaaWpfGui.Main
};
AsstTaskId id = AsstAppendTaskWithEncoding(type, task_params);
_latestTaskId[TaskType.Copilot] = id;
if (asst_start)
{
return id != 0 && AsstStart();
}
else
{
return id != 0;
}
return id != 0 && (!asst_start || AsstStart());
}
public bool AsstStartVideoRec(string filename)
{
var task_params = new JObject
var taskParams = new JObject
{
["filename"] = filename,
};
AsstTaskId id = AsstAppendTaskWithEncoding("VideoRecognition", task_params);
AsstTaskId id = AsstAppendTaskWithEncoding("VideoRecognition", taskParams);
_latestTaskId[TaskType.Copilot] = id;
return id != 0 && AsstStart();
}

19
src/MaaWpfGui/Main/Bootstrapper.cs
View File

@@ -227,25 +227,6 @@ namespace MaaWpfGui.Main
base.OnExit(e);
}
/// <summary>
/// 会带参数重启，切换配置等操作会切换回去
/// </summary>
public static void RestartApplication()
{
//// 释放互斥量
/*
_mutex?.ReleaseMutex();
_mutex?.Dispose();
// 避免 OnExit 时再次释放
_mutex = null;
*/
// 有时候软件自重启时 gui.log 会无法正常写入
Log.CloseAndFlush();
System.Windows.Forms.Application.Restart();
}
/// <summary>
/// 重启，不带参数
/// </summary>

32
src/MaaWpfGui/Models/ResourceUpdater.cs
View File

@@ -9,11 +9,11 @@ using Stylet;
namespace MaaWpfGui.Models
{
public class ResourceUpdater
public static class ResourceUpdater
{
private const string MaaResourceApi = "https://ota.maa.plus/MaaAssistantArknights/MaaAssistantArknights/";
private static readonly List<string> MaaSingleFiles = new List<string>
private static readonly List<string> _maaSingleFiles = new List<string>
{
"resource/Arknights-Tile-Pos/overview.json",
"resource/battle_data.json",
@@ -36,7 +36,7 @@ namespace MaaWpfGui.Models
"resource/global/YoStarKR/resource/version.json",
};
private static readonly string MaaDynamicFilesIndex = "resource/dynamic_list.txt";
private const string MaaDynamicFilesIndex = "resource/dynamic_list.txt";
public enum UpdateResult
{
@@ -63,15 +63,16 @@ namespace MaaWpfGui.Models
{
_updating = false;
var ret1 = await updateSingleFiles();
var ret2 = await updateFilesWithIndex();
var ret1 = await UpdateSingleFiles();
var ret2 = await UpdateFilesWithIndex();
ETagCache.Save();
if (ret1 == UpdateResult.Failed || ret2 == UpdateResult.Failed)
{
return UpdateResult.Failed;
}
else if (ret1 == UpdateResult.Success || ret2 == UpdateResult.Success)
if (ret1 == UpdateResult.Success || ret2 == UpdateResult.Success)
{
return UpdateResult.Success;
}
@@ -79,11 +80,11 @@ namespace MaaWpfGui.Models
return UpdateResult.NotModified;
}
private static async Task<UpdateResult> updateSingleFiles()
private static async Task<UpdateResult> UpdateSingleFiles()
{
UpdateResult ret = UpdateResult.NotModified;
foreach (var file in MaaSingleFiles)
foreach (var file in _maaSingleFiles)
{
var sRet = await UpdateFileWithETag(MaaResourceApi, file, file);
@@ -103,7 +104,7 @@ namespace MaaWpfGui.Models
// 地图文件、掉落材料的图片、基建技能图片
// 这些文件数量不固定，需要先获取索引文件，再根据索引文件下载
private static async Task<UpdateResult> updateFilesWithIndex()
private static async Task<UpdateResult> UpdateFilesWithIndex()
{
var indexSRet = await UpdateFileWithETag(MaaResourceApi, MaaDynamicFilesIndex, MaaDynamicFilesIndex);
if (indexSRet == UpdateResult.Failed || indexSRet == UpdateResult.NotModified)
@@ -114,7 +115,12 @@ namespace MaaWpfGui.Models
var ret = UpdateResult.NotModified;
var context = File.ReadAllText(Path.Combine(Environment.CurrentDirectory, MaaDynamicFilesIndex));
context.Split('\n').ToList().ForEach(async file =>
context.Split('\n').ToList().ForEach(Action);
return ret;
// lambda 避免使用异步，任何未被 lambda 处理的异常都可能导致进程崩溃
async void Action(string file)
{
if (string.IsNullOrEmpty(file))
{
@@ -138,14 +144,12 @@ namespace MaaWpfGui.Models
{
ret = UpdateResult.Success;
}
});
return ret;
}
}
private static bool _updating;
public static async Task<UpdateResult> UpdateFileWithETag(string baseUrl, string file, string saveTo)
private static async Task<UpdateResult> UpdateFileWithETag(string baseUrl, string file, string saveTo)
{
saveTo = Path.Combine(Environment.CurrentDirectory, saveTo);
var url = baseUrl + file;

3
src/MaaWpfGui/Services/Notification/ServerChanNotificationProvider.cs
View File

@@ -68,10 +68,13 @@ namespace MaaWpfGui.Services.Notification
private class ServerChanPostContent
{
// 这两个没用过，不知道有没有用，之后再看看
[JsonPropertyName("title")]
// ReSharper disable once UnusedAutoPropertyAccessor.Local
public string Title { get; set; }
[JsonPropertyName("desp")]
// ReSharper disable once UnusedAutoPropertyAccessor.Local
public string Content { get; set; }
}
}

32
src/MaaWpfGui/Utilities/AutoStart.cs
View File

@@ -11,8 +11,9 @@
// but WITHOUT ANY WARRANTY
// </copyright>
using System;
using System.Diagnostics;
using Microsoft.Win32;
using System.IO;
namespace MaaWpfGui.Utilities
{
@@ -21,7 +22,17 @@ namespace MaaWpfGui.Utilities
/// </summary>
public static class AutoStart
{
private static readonly string fileValue = Process.GetCurrentProcess().MainModule?.FileName;
private static readonly string _fileValue = Process.GetCurrentProcess().MainModule?.FileName;
private static readonly string _uniqueIdentifier = GetUniqueIdentifierFromPath(_fileValue);
private static readonly string _startupFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.Startup);
private static readonly string _startupShortcutPath = Path.Combine(_startupFolderPath, $"MAA_{_uniqueIdentifier}.lnk");
static string GetUniqueIdentifierFromPath(string path)
{
int hash = path.GetHashCode();
return hash.ToString("X");
}
/// <summary>
/// Checks whether this program starts up with OS.
@@ -31,8 +42,7 @@ namespace MaaWpfGui.Utilities
{
try
{
using var key = Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Windows\\CurrentVersion\\Run", false);
return key.GetValue("MeoAsst") != null;
return File.Exists(_startupShortcutPath);
}
catch
{
@@ -49,14 +59,22 @@ namespace MaaWpfGui.Utilities
{
try
{
using var key = Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Windows\\CurrentVersion\\Run", true);
if (set)
{
key.SetValue("MeoAsst", "\"" + fileValue + "\"");
// 创建启动文件夹的快捷方式
var shell = new IWshRuntimeLibrary.WshShell();
var shortcut = shell.CreateShortcut(_startupShortcutPath);
shortcut.TargetPath = _fileValue;
shortcut.WorkingDirectory = Path.GetDirectoryName(_fileValue);
shortcut.Save();
}
else
{
key.DeleteValue("MeoAsst");
// 删除启动文件夹的快捷方式
if (File.Exists(_startupShortcutPath))
{
File.Delete(_startupShortcutPath);
}
}
return set == CheckStart();

69
src/MaaWpfGui/ViewModels/CopilotItemViewModel.cs
View File

@@ -13,32 +13,20 @@ namespace MaaWpfGui.ViewModels
/// <param name="isChecked">isChecked</param>
public CopilotItemViewModel(string name, string filePath, bool isChecked = true)
{
_name = name;
_filePath = filePath;
Name = name;
FilePath = filePath;
_isChecked = isChecked;
}
private string _filePath;
/// <summary>
/// Gets the original_name.
/// </summary>
public string FilePath { get; }
/// <summary>
/// Gets or sets the original_name.
/// Gets the name.
/// </summary>
public string FilePath
{
get => _filePath;
set => SetAndNotify(ref _filePath, value);
}
private string _name;
/// <summary>
/// Gets or sets the name.
/// </summary>
public string Name
{
get => _name;
set => SetAndNotify(ref _name, value);
}
public string Name { get; }
private bool _isChecked;
@@ -55,51 +43,12 @@ namespace MaaWpfGui.ViewModels
}
}
// 换成图标的话要这个，暂时没用
private string _iconPath;
/// <summary>
/// Gets or sets the icon path.
/// </summary>
// ReSharper disable once UnusedMember.Global
public string IconPath
{
get => _iconPath;
set => SetAndNotify(ref _iconPath, value);
}
private string _token;
/// <summary>
/// Gets or sets the token.
/// </summary>
// ReSharper disable once UnusedMember.Global
public string Token
{
get => _token;
set => SetAndNotify(ref _token, value);
}
private string _runStatus;
/// <summary>
/// Gets or sets the running status.
/// </summary>
// ReSharper disable once UnusedMember.Global
public string RunStatus
{
get => _runStatus;
set => SetAndNotify(ref _runStatus, value);
}
private int _index = 0;
private int _index;
public int Index
{
get => _index;
set => SetAndNotify(ref _index, value);
}
public int GetIndex() => Index;
}
}

72
src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs
View File

@@ -66,19 +66,21 @@ namespace MaaWpfGui.ViewModels.UI
_runningState.IdleChanged += RunningState_IdleChanged;
var copilotTaskList = ConfigurationHelper.GetValue(ConfigurationKeys.CopilotTaskList, string.Empty);
if (!string.IsNullOrEmpty(copilotTaskList))
if (string.IsNullOrEmpty(copilotTaskList))
{
JArray jArray = JArray.Parse(copilotTaskList);
foreach (var item in jArray)
{
if ((item as JObject).TryGetValue("file_path", out var token) && File.Exists(token.ToString()))
{
CopilotItemViewModels.Add(new CopilotItemViewModel((string)item["name"], (string)item["file_path"], (bool)item["is_checked"]));
}
}
CopilotItemIndexChanged();
return;
}
JArray jArray = JArray.Parse(copilotTaskList);
foreach (var item in jArray)
{
if (((JObject)item).TryGetValue("file_path", out var token) && File.Exists(token.ToString()))
{
CopilotItemViewModels.Add(new CopilotItemViewModel((string)item["name"], (string)item["file_path"], (bool)item["is_checked"]));
}
}
CopilotItemIndexChanged();
}
private void RunningState_IdleChanged(object sender, bool e)
@@ -570,32 +572,36 @@ namespace MaaWpfGui.ViewModels.UI
private const string CopilotJsonDir = "cache/copilot";
//UI 绑定的方法
// ReSharper disable once UnusedMember.Global
public void AddCopilotTask()
{
var stage_name = CopilotTaskName.Trim().Replace("突袭", "-Adverse");
if (!stage_name.IsNullOrEmpty())
var stageName = CopilotTaskName.Trim().Replace("突袭", "-Adverse");
if (!stageName.IsNullOrEmpty())
{
AddCopilotTaskToList(stage_name);
AddCopilotTaskToList(stageName);
}
}
//UI 绑定的方法
// ReSharper disable once UnusedMember.Global
public void AddCopilotTask_Adverse()
{
var stage_name = CopilotTaskName.Trim().Replace("突袭", "-Adverse");
if (!stage_name.EndsWith("-Adverse"))
var stageName = CopilotTaskName.Trim().Replace("突袭", "-Adverse");
if (!stageName.EndsWith("-Adverse"))
{
stage_name += "-Adverse";
stageName += "-Adverse";
}
if (!stage_name.IsNullOrEmpty())
if (!stageName.IsNullOrEmpty())
{
AddCopilotTaskToList(stage_name);
AddCopilotTaskToList(stageName);
}
}
public void AddCopilotTaskToList(string stage_name)
private void AddCopilotTaskToList(string stageName)
{
var jsonPath = $"{CopilotJsonDir}/{stage_name}.json";
var jsonPath = $"{CopilotJsonDir}/{stageName}.json";
try
{
@@ -603,16 +609,18 @@ namespace MaaWpfGui.ViewModels.UI
}
catch (Exception)
{
// ignored
}
try
{
if (jsonPath != (IsDataFromWeb ? TempCopilotFile : Filename))
{// 相同路径跳拷贝
{
// 相同路径跳拷贝
File.Copy(IsDataFromWeb ? TempCopilotFile : Filename, jsonPath, true);
}
var item = new CopilotItemViewModel(stage_name, jsonPath)
var item = new CopilotItemViewModel(stageName, jsonPath)
{
Index = CopilotItemViewModels.Count,
};
@@ -637,12 +645,16 @@ namespace MaaWpfGui.ViewModels.UI
ConfigurationHelper.SetValue(ConfigurationKeys.CopilotTaskList, JsonConvert.SerializeObject(jArray));
}
//UI 绑定的方法
// ReSharper disable once UnusedMember.Global
public void DeleteCopilotTask(int index)
{
CopilotItemViewModels.RemoveAt(index);
CopilotItemIndexChanged();
}
//UI 绑定的方法
// ReSharper disable once UnusedMember.Global
public void CleanUnableCopilotTask()
{
foreach (var item in CopilotItemViewModels.Where(model => !model.IsChecked).ToList())
@@ -653,6 +665,8 @@ namespace MaaWpfGui.ViewModels.UI
CopilotItemIndexChanged();
}
//UI 绑定的方法
// ReSharper disable once UnusedMember.Global
public void ClearCopilotTask()
{
CopilotItemViewModels.Clear();
@@ -663,13 +677,15 @@ namespace MaaWpfGui.ViewModels.UI
{
Application.Current.Dispatcher.InvokeAsync(() =>
{
for (int i = 0; i < CopilotItemViewModels.Count; i++)
foreach (var model in CopilotItemViewModels)
{
if (CopilotItemViewModels[i].IsChecked)
if (!model.IsChecked)
{
CopilotItemViewModels[i].IsChecked = false;
break;
continue;
}
model.IsChecked = false;
break;
}
SaveCopilotTask();
@@ -679,7 +695,7 @@ namespace MaaWpfGui.ViewModels.UI
/// <summary>
/// 更新任务顺序
/// </summary>
public void CopilotItemIndexChanged()
private void CopilotItemIndexChanged()
{
Application.Current.Dispatcher.InvokeAsync(() =>
{

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

@@ -152,6 +152,8 @@ namespace MaaWpfGui.ViewModels.UI
#region External Notifications
// UI 绑定的方法
// ReSharper disable once UnusedMember.Global
public void ExternalNotificationSendTest()
{
ExternalNotificationService.Send(
@@ -160,7 +162,7 @@ namespace MaaWpfGui.ViewModels.UI
true);
}
public List<CombinedData> ExternalNotificationProviders => new List<CombinedData>
public static List<CombinedData> ExternalNotificationProviders => new List<CombinedData>
{
new CombinedData { Display = LocalizationHelper.GetString("Off"), Value = "Off" },
new CombinedData { Display = "Server Chan", Value = "ServerChan" },
@@ -560,7 +562,9 @@ namespace MaaWpfGui.ViewModels.UI
}
}
public void AccountSwitchMannualRun()
// UI 绑定的方法
// ReSharper disable once UnusedMember.Global
public void AccountSwitchManualRun()
{
Instances.TaskQueueViewModel.QuickSwitchAccount();
}
@@ -968,33 +972,34 @@ namespace MaaWpfGui.ViewModels.UI
// This allows for SQL injection, but since it is not on a real database nothing horrible would happen.
// The following query string does what I want, but WMI does not accept it.
// var wmiQueryString = string.Format("SELECT ProcessId, CommandLine FROM Win32_Process WHERE ExecutablePath='{0}'", adbPath);
var wmiQueryString = "SELECT ProcessId, ExecutablePath, CommandLine FROM Win32_Process";
using (var searcher = new ManagementObjectSearcher(wmiQueryString))
using (var results = searcher.Get())
{
var query = from p in Process.GetProcesses()
join mo in results.Cast<ManagementObject>()
const string WmiQueryString = "SELECT ProcessId, ExecutablePath, CommandLine FROM Win32_Process";
using var searcher = new ManagementObjectSearcher(WmiQueryString);
using var results = searcher.Get();
var query = from p in Process.GetProcesses()
join mo in results.Cast<ManagementObject>()
on p.Id equals (int)(uint)mo["ProcessId"]
select new
{
Process = p,
Path = (string)mo["ExecutablePath"],
};
foreach (var item in query)
select new
{
Process = p,
Path = (string)mo["ExecutablePath"],
};
foreach (var item in query)
{
if (item.Path != adbPath)
{
if (item.Path == adbPath)
{
// Some emulators start their adb with administrator privilege.
// Not sure if this is necessary
try
{
item.Process.Kill();
item.Process.WaitForExit();
}
catch
{
}
}
continue;
}
// Some emulators start their adb with administrator privilege.
// Not sure if this is necessary
try
{
item.Process.Kill();
item.Process.WaitForExit();
}
catch
{
// ignored
}
}
}
@@ -1598,7 +1603,7 @@ namespace MaaWpfGui.ViewModels.UI
ConfigurationHelper.SetValue(ConfigurationKeys.RoguelikeMode, value);
// 烧开水模式可选项
this.RoguelikeStartWithEliteTwoEnable = mapRoguelikeStartWithEliteTwoEnable(value);
this.RoguelikeStartWithEliteTwoEnable = MapRoguelikeStartWithEliteTwoEnable(value);
}
}
@@ -1661,7 +1666,7 @@ namespace MaaWpfGui.ViewModels.UI
public ObservableCollection<string> RoguelikeCoreCharList
{
get => _roguelikeCoreCharList;
set => SetAndNotify(ref _roguelikeCoreCharList, value);
private set => SetAndNotify(ref _roguelikeCoreCharList, value);
}
private string _roguelikeStartWithEliteTwo = ConfigurationHelper.GetValue(ConfigurationKeys.RoguelikeStartWithEliteTwo, false.ToString());
@@ -1674,7 +1679,7 @@ namespace MaaWpfGui.ViewModels.UI
get => bool.Parse(_roguelikeStartWithEliteTwo);
set
{
if (value == true && RoguelikeUseSupportUnit == true)
if (value && RoguelikeUseSupportUnit)
{
RoguelikeUseSupportUnit = false;
}
@@ -1684,7 +1689,7 @@ namespace MaaWpfGui.ViewModels.UI
}
}
private string _roguelikeStartWithEliteTwoEnable = mapRoguelikeStartWithEliteTwoEnable(ConfigurationHelper.GetValue(ConfigurationKeys.RoguelikeMode, "0"));
private string _roguelikeStartWithEliteTwoEnable = MapRoguelikeStartWithEliteTwoEnable(ConfigurationHelper.GetValue(ConfigurationKeys.RoguelikeMode, "0"));
public string RoguelikeStartWithEliteTwoEnable
{
@@ -1699,14 +1704,9 @@ namespace MaaWpfGui.ViewModels.UI
}
}
private static string mapRoguelikeStartWithEliteTwoEnable(string mode)
private static string MapRoguelikeStartWithEliteTwoEnable(string mode)
{
if (mode == "4")
{
return "Visible";
}
return "Collapsed";
return mode == "4" ? "Visible" : "Collapsed";
}
private string _roguelikeUseSupportUnit = ConfigurationHelper.GetValue(ConfigurationKeys.RoguelikeUseSupportUnit, false.ToString());
@@ -1719,7 +1719,7 @@ namespace MaaWpfGui.ViewModels.UI
get => bool.Parse(_roguelikeUseSupportUnit);
set
{
if (value == true && RoguelikeStartWithEliteTwo == true)
if (value && RoguelikeStartWithEliteTwo)
{
RoguelikeStartWithEliteTwo = false;
}
@@ -2720,9 +2720,9 @@ namespace MaaWpfGui.ViewModels.UI
/// <summary>
/// RegisterKey of Bluestacks_Nxt
/// </summary>
public static string BluestacksNxtRegistryKey = @"SOFTWARE\BlueStacks_nxt";
private const string BluestacksNxtRegistryKey = @"SOFTWARE\BlueStacks_nxt";
public static string BluestacksNxtValueName = "UserDefinedDir";
private const string BluestacksNxtValueName = "UserDefinedDir";
/// <summary>
/// Refreshes ADB config.
@@ -2795,7 +2795,7 @@ namespace MaaWpfGui.ViewModels.UI
/// Get the path of bluestacks.conf
/// </summary>
/// <returns>path</returns>
public static string GetBluestacksConfig()
private static string GetBluestacksConfig()
{
var conf = ConfigurationHelper.GetValue(ConfigurationKeys.BluestacksConfigPath, string.Empty);
if (!string.IsNullOrEmpty(conf))
@@ -2803,16 +2803,11 @@ namespace MaaWpfGui.ViewModels.UI
return conf;
}
using (RegistryKey key = Registry.LocalMachine.OpenSubKey(BluestacksNxtRegistryKey))
using RegistryKey key = Registry.LocalMachine.OpenSubKey(BluestacksNxtRegistryKey);
object value = key?.GetValue(BluestacksNxtValueName);
if (value != null)
{
if (key != null)
{
object value = key.GetValue(BluestacksNxtValueName);
if (value != null)
{
return (string)value + "\\bluestacks.conf";
}
}
return (string)value + "\\bluestacks.conf";
}
return null;
@@ -3576,19 +3571,11 @@ namespace MaaWpfGui.ViewModels.UI
return true;
}
var wine_list = new[] { "酒", "drink", "wine", "beer", "술", "🍷", "🍸", "🍺", "🍻", "🥃", "🍶" };
foreach (var wine in wine_list)
{
if (CreditFirstList.Contains(wine))
{
return true;
}
}
return false;
var wineList = new[] { "酒", "drink", "wine", "beer", "술", "🍷", "🍸", "🍺", "🍻", "🥃", "🍶" };
return wineList.Any(wine => CreditFirstList.Contains(wine));
}
public void UpdateRoguelikeSquadList()
private void UpdateRoguelikeSquadList()
{
var roguelikeSquad = RoguelikeSquad;
@@ -3665,7 +3652,7 @@ namespace MaaWpfGui.ViewModels.UI
_roguelikeSquad = RoguelikeSquadList.Any(x => x.Value == roguelikeSquad) ? roguelikeSquad : string.Empty;
}
public void UpdateRoguelikeCoreCharList()
private void UpdateRoguelikeCoreCharList()
{
var filePath = $"resource/roguelike/{RoguelikeTheme}/recruitment.json";
if (File.Exists(filePath) is false)

5
src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
View File

@@ -977,9 +977,6 @@ namespace MaaWpfGui.ViewModels.UI
AddLog(LocalizationHelper.GetString("AdbReplacementTips"), UiLogColor.Info);
}
string errMsg = string.Empty;
bool connected = await Task.Run(() => Instances.AsstProxy.AsstConnect(ref errMsg));
// 一般是点了“停止”按钮了
if (Stopping)
{
@@ -1190,7 +1187,7 @@ namespace MaaWpfGui.ViewModels.UI
Instances.SettingsViewModel.CreditForceShoppingIfCreditFull);
}
private bool AppendAward()
private static bool AppendAward()
{
var receiveAward = Instances.SettingsViewModel.ReceiveAward;
var receiveMail = Instances.SettingsViewModel.ReceiveMail;

2
src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
View File

@@ -449,7 +449,7 @@ namespace MaaWpfGui.ViewModels.UI
/// 检查更新，并下载更新包。
/// </summary>
/// <returns>操作成功返回 <see langword="true"/>，反之则返回 <see langword="false"/>。</returns>
public async Task<CheckUpdateRetT> CheckAndDownloadVersionUpdate()
private async Task<CheckUpdateRetT> CheckAndDownloadVersionUpdate()
{
var checkResult = await CheckUpdateInner();

2
src/MaaWpfGui/Views/UserControl/ConnectSettingsOnWakeUpUserControl.xaml
View File

@@ -34,7 +34,7 @@
VerticalAlignment="Bottom"
hc:BorderElement.CornerRadius="0,4,4,0"
BorderThickness="0,1,1,1"
Command="{s:Action AccountSwitchMannualRun}"
Command="{s:Action AccountSwitchManualRun}"
Content="{DynamicResource AccountSwitchManualRun}" />
</Grid>