From ab1c460225577ccf27e668a4522a2bd983f7df47 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Mon, 6 Oct 2025 22:41:42 +0800
Subject: [PATCH] =?UTF-8?q?Reapply=20"add:=E6=89=8B=E5=8A=A8=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 703a8a4e0def74a3f6c1919c517339d0ff97815e.
---
Ink Canvas/Helpers/Converters.cs | 23 ++++
Ink Canvas/MainWindow.xaml | 8 ++
Ink Canvas/MainWindow_cs/MW_Settings.cs | 143 ++++++++++++++++++++++++
3 files changed, 174 insertions(+)
diff --git a/Ink Canvas/Helpers/Converters.cs b/Ink Canvas/Helpers/Converters.cs
index ac5f7612..31feedb0 100644
--- a/Ink Canvas/Helpers/Converters.cs
+++ b/Ink Canvas/Helpers/Converters.cs
@@ -112,4 +112,27 @@ namespace Ink_Canvas.Converter
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { throw new NotImplementedException(); }
}
+
+ public class InverseBooleanToVisibilityConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if ((bool)value)
+ {
+ return Visibility.Collapsed;
+ }
+
+ return Visibility.Visible;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if ((bool)value)
+ {
+ return Visibility.Collapsed;
+ }
+
+ return Visibility.Visible;
+ }
+ }
}
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index d37c026d..11a96d23 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -40,6 +40,7 @@
+
@@ -631,6 +632,13 @@
+
+
+
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index c87378d8..618c7158 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs
@@ -3181,6 +3181,149 @@ namespace Ink_Canvas
}
}
+ private async void ManualUpdateButton_Click(object sender, RoutedEventArgs e)
+ {
+ ManualUpdateButton.IsEnabled = false;
+ ManualUpdateButton.Content = "正在检查更新...";
+
+ try
+ {
+ LogHelper.WriteLogToFile("ManualUpdate | Manual update button clicked");
+
+ // 使用当前选择的更新通道检查更新
+ var (remoteVersion, lineGroup, apiReleaseNotes) = await AutoUpdateHelper.CheckForUpdates(Settings.Startup.UpdateChannel, true, false);
+
+ if (remoteVersion != null)
+ {
+ LogHelper.WriteLogToFile($"ManualUpdate | Found new version: {remoteVersion}");
+
+ // 获取当前版本
+ string currentVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+
+ // 创建并显示更新窗口
+ HasNewUpdateWindow updateWindow = new HasNewUpdateWindow(currentVersion, remoteVersion, "", apiReleaseNotes);
+ updateWindow.Owner = Application.Current.MainWindow;
+ bool? dialogResult = updateWindow.ShowDialog();
+
+ // 如果窗口被关闭但没有点击按钮，则不执行任何操作
+ if (dialogResult != true)
+ {
+ LogHelper.WriteLogToFile("ManualUpdate | Update dialog closed without selection");
+ return;
+ }
+
+ // 根据用户选择处理更新
+ switch (updateWindow.Result)
+ {
+ case HasNewUpdateWindow.UpdateResult.UpdateNow:
+ // 立即更新：显示下载进度，下载完成后立即安装
+ LogHelper.WriteLogToFile("ManualUpdate | User chose to update now");
+
+ // 显示下载进度提示
+ MessageBox.Show("开始下载更新，请稍候...", "正在更新", MessageBoxButton.OK, MessageBoxImage.Information);
+
+ // 下载更新文件，使用多线路组下载功能
+ bool isDownloadSuccessful = await DownloadUpdateWithFallback(remoteVersion, lineGroup, Settings.Startup.UpdateChannel);
+
+ if (isDownloadSuccessful)
+ {
+ // 下载成功，提示用户准备安装
+ MessageBoxResult result = MessageBox.Show("更新已下载完成，点击确定后将关闭软件并安装新版本！", "安装更新", MessageBoxButton.OKCancel, MessageBoxImage.Information);
+
+ // 只有当用户点击确定按钮后才关闭软件
+ if (result == MessageBoxResult.OK)
+ {
+ // 设置为用户主动退出，避免被看门狗判定为崩溃
+ App.IsAppExitByUser = true;
+
+ // 准备批处理脚本
+ AutoUpdateHelper.InstallNewVersionApp(remoteVersion, true);
+
+ // 关闭软件，让安装程序接管
+ Application.Current.Shutdown();
+ }
+ else
+ {
+ LogHelper.WriteLogToFile("ManualUpdate | User cancelled update installation");
+ }
+ }
+ else
+ {
+ // 下载失败
+ MessageBox.Show("更新下载失败，请检查网络连接后重试。", "下载失败", MessageBoxButton.OK, MessageBoxImage.Error);
+ }
+ break;
+
+ case HasNewUpdateWindow.UpdateResult.UpdateLater:
+ // 稍后更新：静默下载，在软件关闭时自动安装
+ LogHelper.WriteLogToFile("ManualUpdate | User chose to update later");
+
+ // 不管设置如何，都进行下载，使用多线路组下载功能
+ isDownloadSuccessful = await DownloadUpdateWithFallback(remoteVersion, lineGroup, Settings.Startup.UpdateChannel);
+
+ if (isDownloadSuccessful)
+ {
+ LogHelper.WriteLogToFile("ManualUpdate | Update downloaded successfully, will install when application closes");
+
+ // 设置标志，在应用程序关闭时安装
+ Settings.Startup.IsAutoUpdate = true;
+ Settings.Startup.IsAutoUpdateWithSilence = true;
+
+ // 启动检查定时器
+ timerCheckAutoUpdateWithSilence.Start();
+
+ // 通知用户
+ MessageBox.Show("更新已下载完成，将在软件关闭时自动安装。", "更新已准备就绪", MessageBoxButton.OK, MessageBoxImage.Information);
+ }
+ else
+ {
+ LogHelper.WriteLogToFile("ManualUpdate | Update download failed", LogHelper.LogType.Error);
+ MessageBox.Show("更新下载失败，请检查网络连接后重试。", "下载失败", MessageBoxButton.OK, MessageBoxImage.Error);
+ }
+ break;
+
+ case HasNewUpdateWindow.UpdateResult.SkipVersion:
+ // 跳过该版本：记录到设置中
+ LogHelper.WriteLogToFile($"ManualUpdate | User chose to skip version {remoteVersion}");
+
+ // 记录要跳过的版本号
+ Settings.Startup.SkippedVersion = remoteVersion;
+
+ // 保存设置到文件
+ SaveSettingsToFile();
+
+ // 通知用户
+ MessageBox.Show($"已设置跳过版本 {remoteVersion}，在下次发布新版本之前不会再提示更新。",
+ "已跳过此版本",
+ MessageBoxButton.OK,
+ MessageBoxImage.Information);
+ break;
+ }
+ }
+ else
+ {
+ // 没有更新
+ LogHelper.WriteLogToFile("ManualUpdate | No updates available");
+ MessageBox.Show("当前已是最新版本！", "无可用更新", MessageBoxButton.OK, MessageBoxImage.Information);
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"Error in ManualUpdateButton_Click: {ex.Message}", LogHelper.LogType.Error);
+ MessageBox.Show(
+ $"手动更新过程中发生错误: {ex.Message}",
+ "更新错误",
+ MessageBoxButton.OK,
+ MessageBoxImage.Error);
+ }
+ finally
+ {
+ // 恢复按钮状态
+ ManualUpdateButton.IsEnabled = true;
+ ManualUpdateButton.Content = "手动更新";
+ }
+ }
+
private async void FixVersionButton_Click(object sender, RoutedEventArgs e)
{
// 显示确认对话框