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

fix: 修复无限提示远控地址为空的问题

Browse Source
This commit is contained in:
SherkeyXD
2024-02-07 18:40:19 +08:00
parent ea8a851593
commit f4a51be761
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/MaaWpfGui/Services/RemoteControl/RemoteControlService.cs
View File

@@ -18,6 +18,7 @@ using System.IO;
using System.Linq;
using System.Net.Http;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@@ -694,7 +695,7 @@ namespace MaaWpfGui.Services.RemoteControl
{
var endpoint = Instances.SettingsViewModel.RemoteControlGetTaskEndpointUri;
if (!IsEndpointValid(endpoint))
if (!IsEndpointValid(endpoint, alarm: true))
{
return;
}
@@ -755,12 +756,11 @@ namespace MaaWpfGui.Services.RemoteControl
Instances.SettingsViewModel.RemoteControlDeviceIdentity = Guid.NewGuid().ToString("N");
}
public static bool IsEndpointValid(string endpoint)
public static bool IsEndpointValid(string endpoint, bool alarm = false)
{
if (string.IsNullOrWhiteSpace(endpoint))
{
using var toast = new ToastNotification(LocalizationHelper.GetString("RemoteControlConnectionTestFailEmpty"));
toast.Show();
ShowToast("RemoteControlConnectionTestFailEmpty", alarm);
return false;
}
@@ -772,16 +772,23 @@ namespace MaaWpfGui.Services.RemoteControl
}
else if (lowerEndpoint.StartsWith("http://"))
{
using var toast = new ToastNotification(LocalizationHelper.GetString("RemoteControlConnectionTestWarningHttpUnsafe"));
toast.Show();
ShowToast("RemoteControlConnectionTestWarningHttpUnsafe", alarm);
return true;
}
else
{
using var toast = new ToastNotification(LocalizationHelper.GetString("RemoteControlConnectionTestFailNotHttpOrHttps"));
toast.Show();
ShowToast("RemoteControlConnectionTestFailNotHttpOrHttps", alarm);
return false;
}
}
public static void ShowToast(string message, bool alarm)
{
if (alarm)
{
using var toast = new ToastNotification(LocalizationHelper.GetString(message));
toast.Show();
}
}
}
}