From eebd1cfa5eb2b6f08102c616fd079d01da95aacf Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Fri, 24 Mar 2023 20:24:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E2=80=9C=E5=AE=9A?=
=?UTF-8?q?=E6=97=B6=E6=A3=80=E6=B5=8B=E6=9B=B4=E6=96=B0=E2=80=9D=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
fix #3991
---
src/MaaWpfGui/Helper/Config.cs | 1 +
src/MaaWpfGui/Main/SettingsViewModel.cs | 15 +++++++++++
src/MaaWpfGui/Main/TaskQueueViewModel.cs | 25 ++++++++++++++++++-
src/MaaWpfGui/Res/Localizations/en-us.xaml | 3 ++-
src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 3 ++-
src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 3 ++-
src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 3 ++-
src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 3 ++-
.../VersionUpdateSettingsUserControl.xaml | 8 +++++-
9 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/src/MaaWpfGui/Helper/Config.cs b/src/MaaWpfGui/Helper/Config.cs
index 5f89f39d8d..5dcc53f361 100644
--- a/src/MaaWpfGui/Helper/Config.cs
+++ b/src/MaaWpfGui/Helper/Config.cs
@@ -308,6 +308,7 @@ namespace MaaWpfGui
public const string UpdateProxy = "VersionUpdate.Proxy";
public const string VersionType = "VersionUpdate.VersionType";
public const string UpdateCheck = "VersionUpdate.UpdateCheck";
+ public const string UpdatAutoCheck = "VersionUpdate.ScheduledUpdateCheck";
public const string UseAria2 = "VersionUpdate.UseAria2";
public const string AutoDownloadUpdatePackage = "VersionUpdate.AutoDownloadUpdatePackage";
diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs
index 7ac1d41a54..a8981a2c06 100644
--- a/src/MaaWpfGui/Main/SettingsViewModel.cs
+++ b/src/MaaWpfGui/Main/SettingsViewModel.cs
@@ -1674,6 +1674,21 @@ namespace MaaWpfGui
}
}
+ private bool _updateAutoCheck = Convert.ToBoolean(Config.Get(Config.UpdatAutoCheck, bool.TrueString));
+
+ ///
+ /// Gets or sets a value indicating whether to check update.
+ ///
+ public bool UpdatAutoCheck
+ {
+ get => _updateAutoCheck;
+ set
+ {
+ SetAndNotify(ref _updateAutoCheck, value);
+ Config.Set(Config.UpdatAutoCheck, value.ToString());
+ }
+ }
+
private string _proxy = Config.Get(Config.UpdateProxy, string.Empty);
///
diff --git a/src/MaaWpfGui/Main/TaskQueueViewModel.cs b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
index a20dcf5483..51834143d1 100644
--- a/src/MaaWpfGui/Main/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
@@ -189,6 +189,14 @@ namespace MaaWpfGui
return;
}
+ if (NeedToCheckForUpdates())
+ {
+ if (_settingsViewModel.UpdatAutoCheck)
+ {
+ _settingsViewModel.ManualUpdate();
+ }
+ }
+
int intMinute = DateTime.Now.Minute;
int intHour = DateTime.Now.Hour;
var timeToStart = false;
@@ -362,7 +370,7 @@ namespace MaaWpfGui
var hour = now.Hour;
var min = now.Minute;
- // yj历的16点
+ // yj历的4/16点
if (min == 0 && hour == 12)
{
return true;
@@ -381,6 +389,21 @@ namespace MaaWpfGui
}
}
+ private bool NeedToCheckForUpdates()
+ {
+ var now = Utils.GetYJTimeNow();
+ var hour = now.Hour;
+ var min = now.Minute;
+
+ // yj历的4/22点
+ if (min == 0 && hour == 18)
+ {
+ return true;
+ }
+
+ return false;
+ }
+
///
/// Updates date prompt.
///
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index bdd0353d05..add4a2b7e5 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -138,7 +138,8 @@
This option is not saved after restart
The feature does not automatically navigate to the stage
- Auto check update
+ Startup Update Check
+ Scheduled Update Check
Auto download update
Stable release
Beta release
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index d6185c781c..dbfd5f1653 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -139,7 +139,8 @@
このオプション設定は再起動後に保存されません
このオプションは、対応するステージに自動的に移動するものではありません
- アップデートチェック
+ 起動時の更新チェック
+ 定期的な更新チェック
自動アップデート
安定版
ベータ版
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index 57ef3d2f39..848568a35a 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -133,7 +133,8 @@
재시작 후 변경 사항이 저장되지 않습니다
해당 스테이지로 자동 이동하지 않습니다
- 자동으로 업데이트 확인
+ 시작시 업데이트 확인
+ 일정 시간마다 업데이트 확인
자동으로 업데이트
안정 버전
베타 버전
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 15ffc0207b..f471864f6a 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -139,7 +139,8 @@
该选项设置重启后不保存
该选项不会自动导航至对应关卡
- 自动检查更新
+ 自动检查更新
+ 定时检查更新
自动下载更新包
稳定版
公测版
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index ff21497016..fefbc96558 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -124,7 +124,8 @@
該選項設定重啟後不保存
該選項不會自動導航至對應關卡
- 自動檢查更新
+ 啟動時檢查更新
+ 定時檢查更新
自動下載更新包
穩定版
公測版
diff --git a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
index eead030830..e18ac01f51 100644
--- a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
@@ -28,9 +28,15 @@
Margin="10"
HorizontalAlignment="Left"
VerticalAlignment="Center"
- Content="{DynamicResource UpdateAutoCheck}"
+ Content="{DynamicResource StartupUpdateCheck}"
IsChecked="{Binding UpdateCheck}"
IsEnabled="False" />
+