diff --git a/src/MaaWpfGui/Extensions/DateTimeExtension.cs b/src/MaaWpfGui/Extensions/DateTimeExtension.cs index 23fefebda2..e7aae1728c 100644 --- a/src/MaaWpfGui/Extensions/DateTimeExtension.cs +++ b/src/MaaWpfGui/Extensions/DateTimeExtension.cs @@ -56,6 +56,12 @@ namespace MaaWpfGui.Extensions return dt is { Month: 4, Day: 1 }; } + public static string ToLocalTimeString(this DateTime dt) + { + var dateTimeFormat = CultureInfo.CurrentCulture.DateTimeFormat; + return dt.ToLocalTime().ToString(dateTimeFormat.ShortDatePattern + " HH:mm:ss"); + } + public static DateTime ToDateTime(this System.Runtime.InteropServices.ComTypes.FILETIME filetime) { return DateTime.FromFileTime(((long)filetime.dwHighDateTime << 32) | (uint)filetime.dwLowDateTime); diff --git a/src/MaaWpfGui/Services/RemoteControl/RemoteControlService.cs b/src/MaaWpfGui/Services/RemoteControl/RemoteControlService.cs index a71a6da0b5..477a6ceada 100644 --- a/src/MaaWpfGui/Services/RemoteControl/RemoteControlService.cs +++ b/src/MaaWpfGui/Services/RemoteControl/RemoteControlService.cs @@ -619,10 +619,6 @@ namespace MaaWpfGui.Services.RemoteControl /*await Task.Run(() => Instances.SettingsViewModel.RunScript("StartsWithScript"));*/ Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("ConnectingToEmulator")); - if (!Instances.SettingsViewModel.AdbReplaced && !Instances.SettingsViewModel.IsAdbTouchMode()) - { - Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("AdbReplacementTips"), UiLogColor.Info); - } // 一般是点了“停止”按钮了 if (Instances.TaskQueueViewModel.Stopping) diff --git a/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs b/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs index 289c4b2ae4..2d4c186dc8 100644 --- a/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs @@ -1027,10 +1027,6 @@ namespace MaaWpfGui.ViewModels.UI } AddLog(LocalizationHelper.GetString("ConnectingToEmulator")); - if (!Instances.SettingsViewModel.AdbReplaced && !Instances.SettingsViewModel.IsAdbTouchMode()) - { - AddLog(LocalizationHelper.GetString("AdbReplacementTips"), UiLogColor.Info); - } string errMsg = string.Empty; _caught = await Task.Run(() => Instances.AsstProxy.AsstConnect(ref errMsg)); diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index 7446de1519..eb1505f947 100755 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -3636,11 +3636,9 @@ namespace MaaWpfGui.ViewModels.UI /// public static string UiVersion { get; } = _uiVersion == "0.0.1" ? "DEBUG VERSION" : _uiVersion; - private static readonly DateTime _buildDateTime = Assembly.GetExecutingAssembly().GetCustomAttribute()?.BuildDateTime ?? DateTime.MinValue; + public static DateTime BuildDateTime { get; } = Assembly.GetExecutingAssembly().GetCustomAttribute()?.BuildDateTime ?? DateTime.MinValue; - public static DateTime BuildDateTime => _buildDateTime.ToLocalTime(); - - public static string BuildDateTimeLong => BuildDateTime.ToString("yyyy-MM-dd HH:mm"); + public static string BuildDateTimeCurrentCultureString => BuildDateTime.ToLocalTimeString(); private static (DateTime DateTime, string VersionName) _resourceInfo = GetResourceVersionByClientType(ConfigurationHelper.GetValue(ConfigurationKeys.ClientType, string.Empty)); @@ -3663,7 +3661,7 @@ namespace MaaWpfGui.ViewModels.UI set => SetAndNotify(ref _resourceDateTime, value); } - public string ResourceDateTimeLong => ResourceDateTime.ToString("yyyy-MM-dd HH:mm"); + public string ResourceDateTimeCurrentCultureString => ResourceDateTime.ToLocalTimeString(); private static (DateTime DateTime, string VersionName) GetResourceVersionByClientType(string clientType) { diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index 1bdaf9ea6a..9419020177 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -1051,22 +1051,31 @@ namespace MaaWpfGui.ViewModels.UI ClearLog(); + var buildDateTimeLong = SettingsViewModel.BuildDateTimeCurrentCultureString; + var resourceDateTimeLong = Instances.SettingsViewModel.ResourceDateTimeCurrentCultureString; + AddLog($"Build Time:\n{buildDateTimeLong}\nResource Time:\n{resourceDateTimeLong}"); + var uiVersion = SettingsViewModel.UiVersion; var coreVersion = SettingsViewModel.CoreVersion; if (uiVersion != coreVersion && Instances.VersionUpdateViewModel.IsStdVersion(uiVersion) && Instances.VersionUpdateViewModel.IsStdVersion(coreVersion)) { - AddLog(string.Format(LocalizationHelper.GetString("VersionMismatch"), uiVersion, coreVersion), UiLogColor.Warning); + AddLog(string.Format(LocalizationHelper.GetString("VersionMismatch"), uiVersion, coreVersion), UiLogColor.Error); + return; } await Task.Run(() => Instances.SettingsViewModel.RunScript("StartsWithScript")); AddLog(LocalizationHelper.GetString("ConnectingToEmulator")); + + /* + // 现在的主流模拟器都已经更新过自带的 adb 了,不再需要替换 if (!Instances.SettingsViewModel.AdbReplaced && !Instances.SettingsViewModel.IsAdbTouchMode()) { AddLog(LocalizationHelper.GetString("AdbReplacementTips"), UiLogColor.Info); } + */ // 一般是点了“停止”按钮了 if (Stopping) @@ -1277,10 +1286,14 @@ namespace MaaWpfGui.ViewModels.UI await Task.Run(() => Instances.SettingsViewModel.RunScript("StartsWithScript")); AddLog(LocalizationHelper.GetString("ConnectingToEmulator")); + + /* + // 现在的主流模拟器都已经更新过自带的 adb 了,不再需要替换 if (!Instances.SettingsViewModel.AdbReplaced && !Instances.SettingsViewModel.IsAdbTouchMode()) { AddLog(LocalizationHelper.GetString("AdbReplacementTips"), UiLogColor.Info); } + */ // 一般是点了“停止”按钮了 if (Stopping) diff --git a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml old mode 100755 new mode 100644 index b5f0bcfdd6..8eda6b6d0f --- a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml @@ -292,7 +292,7 @@ Padding="5,3,5,3" HorizontalAlignment="Center" VerticalAlignment="Center" - hc:FloatingBlock.Content="{Binding BuildDateTimeLong}" + hc:FloatingBlock.Content="{Binding BuildDateTimeCurrentCultureString}" Foreground="White" PreviewMouseDown="CoreVersionClick" Text="构建日期" @@ -309,10 +309,10 @@ Padding="5,3,5,3" HorizontalAlignment="Left" VerticalAlignment="Center" - hc:FloatingBlock.Content="{Binding BuildDateTimeLong}" + hc:FloatingBlock.Content="{Binding BuildDateTimeCurrentCultureString}" Foreground="White" PreviewMouseDown="CoreVersionClick" - Text="{Binding BuildDateTimeLong, Mode=OneWay}" + Text="{Binding BuildDateTimeCurrentCultureString, Mode=OneWay}" TextWrapping="Wrap" />