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

perf: null check

Browse Source 
[skip changelog]
This commit is contained in:
status102
2024-08-08 10:58:00 +08:00
parent 67cc9dee63
commit 12005f0e1a
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1688,7 +1688,7 @@ namespace MaaWpfGui.Main
/// </summary>
/// <param name="address">连接地址。</param>
/// <returns>是否有效。</returns>
private static bool IfPortEstablished(string address)
private static bool IfPortEstablished(string? address)
{
if (string.IsNullOrEmpty(address) || !address.Contains(':'))
{
@@ -1745,7 +1745,7 @@ namespace MaaWpfGui.Main
if (Instances.SettingsViewModel.AutoDetectConnection)
{
string bsHvAddress = Instances.SettingsViewModel.TryToSetBlueStacksHyperVAddress();
string? bsHvAddress = Instances.SettingsViewModel.TryToSetBlueStacksHyperVAddress();
if (string.Equals(Instances.SettingsViewModel.ConnectAddress, bsHvAddress))
{

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

@@ -1943,7 +1943,7 @@ namespace MaaWpfGui.ViewModels.UI
}
var jsonStr = File.ReadAllText(filePath);
var json = (JObject)JsonConvert.DeserializeObject(jsonStr);
var json = (JObject?)JsonConvert.DeserializeObject(jsonStr);
var roguelikeCoreCharList = new ObservableCollection<string>();
@@ -1964,7 +1964,7 @@ namespace MaaWpfGui.ViewModels.UI
continue;
}
var name = (string)operItem["name"];
var name = (string?)operItem["name"];
if (string.IsNullOrEmpty(name))
{
continue;
@@ -3419,7 +3419,7 @@ namespace MaaWpfGui.ViewModels.UI
return versionName;
}
JObject versionJson = (JObject)JsonConvert.DeserializeObject(File.ReadAllText(jsonPath));
var versionJson = (JObject?)JsonConvert.DeserializeObject(File.ReadAllText(jsonPath));
var currentTime = (ulong)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
var poolTime = (ulong?)versionJson?["gacha"]?["time"]; // 卡池的开始时间
var activityTime = (ulong?)versionJson?["activity"]?["time"]; // 活动的开始时间
@@ -4172,7 +4172,7 @@ namespace MaaWpfGui.ViewModels.UI
/// Get the path of bluestacks.conf
/// </summary>
/// <returns>path</returns>
private static string GetBluestacksConfig()
private static string? GetBluestacksConfig()
{
var conf = ConfigurationHelper.GetValue(ConfigurationKeys.BluestacksConfigPath, string.Empty);
if (!string.IsNullOrEmpty(conf))
@@ -4180,8 +4180,8 @@ namespace MaaWpfGui.ViewModels.UI
return conf;
}
using RegistryKey key = Registry.LocalMachine.OpenSubKey(BluestacksNxtRegistryKey);
object value = key?.GetValue(BluestacksNxtValueName);
using var key = Registry.LocalMachine.OpenSubKey(BluestacksNxtRegistryKey);
var value = key?.GetValue(BluestacksNxtValueName);
if (value != null)
{
return (string)value + @"\bluestacks.conf";
@@ -4334,14 +4334,14 @@ namespace MaaWpfGui.ViewModels.UI
rvm.WindowTitle = $"{prefix}MAA{currentConfiguration} - {CoreVersion}{resourceVersion}{connectConfigName}{connectAddress}{clientName}";
}
private readonly string _bluestacksConfig = GetBluestacksConfig();
private readonly string? _bluestacksConfig = GetBluestacksConfig();
private string _bluestacksKeyWord = ConfigurationHelper.GetValue(ConfigurationKeys.BluestacksConfigKeyword, string.Empty);
/// <summary>
/// Tries to set BlueStack Hyper V address.
/// </summary>
/// <returns>success</returns>
public string TryToSetBlueStacksHyperVAddress()
public string? TryToSetBlueStacksHyperVAddress()
{
if (string.IsNullOrEmpty(_bluestacksConfig))
{
@@ -4574,7 +4574,6 @@ namespace MaaWpfGui.ViewModels.UI
}
}
private bool _minimizeToTray = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.MinimizeToTray, bool.FalseString));
/// <summary>

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

@@ -116,7 +116,6 @@ namespace MaaWpfGui.ViewModels.UI
await Task.Run(() => Instances.SettingsViewModel.RunScript("EndsWithScript"));
var actions = TaskSettingDataContext.PostActionSetting;
if (actions.BackToAndroidHome)
{
Instances.AsstProxy.AsstBackToHome();
@@ -2536,7 +2535,7 @@ namespace MaaWpfGui.ViewModels.UI
if (value >= CustomInfrastPlanInfoList.Count || value < 0)
{
var count = CustomInfrastPlanInfoList.Count;
value = (value % count + count) % count;
value = ((value % count) + count) % count;
_logger.Warning($"CustomInfrastPlanIndex out of range, reset to Index % Count: {value}");
}