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

chore: 获取当地区域格式字符串

Browse Source
This commit is contained in:
uye
2024-09-05 15:31:20 +08:00
parent be872da15b
commit 92d4b012cb
6 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MaaWpfGui/Extensions/DateTimeExtension.cs
View File

@@ -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);

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

@@ -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)

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

@@ -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));

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

@@ -3636,11 +3636,9 @@ namespace MaaWpfGui.ViewModels.UI
/// </summary>
public static string UiVersion { get; } = _uiVersion == "0.0.1" ? "DEBUG VERSION" : _uiVersion;
private static readonly DateTime _buildDateTime = Assembly.GetExecutingAssembly().GetCustomAttribute<BuildDateTimeAttribute>()?.BuildDateTime ?? DateTime.MinValue;
public static DateTime BuildDateTime { get; } = Assembly.GetExecutingAssembly().GetCustomAttribute<BuildDateTimeAttribute>()?.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)
{

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

@@ -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)

6
src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml Executable file → Normal file
View File

@@ -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" />
</Border>
</Grid>