改善版本检查

Author: cuiliang

ClickShow/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]

ClickShow/Settings/AppSetting.cs

@@ -116,7 +116,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
         }
 
         /// <summary>
-        /// 上次提醒的版本
+        /// 上次提醒的最新版本，避免重复提醒。
         /// </summary>
         public string LastNotifiedVersion { get; set; }
     }

ClickShow/UI/MainWindow.xaml

@@ -60,8 +60,11 @@
         </StackPanel>
         <StackPanel Grid.Column="1" VerticalAlignment="Center">
             <TextBlock Margin="10" HorizontalAlignment="Center">
-                <Hyperlink NavigateUri="https://github.com/cuiliang/clickshow" RequestNavigate="HyperlinkOpenHomepage_OnRequestNavigate">反馈与更新 / Homepage</Hyperlink>
+                <Hyperlink NavigateUri="https://github.com/cuiliang/clickshow" RequestNavigate="HyperlinkOpenHomepage_OnRequestNavigate">反馈与更新 / Homepage</Hyperlink>                
+                <LineBreak></LineBreak>
+                <TextBlock Name="LblNewVersion" Foreground="OrangeRed" FontWeight="Bold" Visibility="Collapsed" Text="已有新版本!"/>
             </TextBlock>
+            
 
             <Grid>
                 <Grid.ColumnDefinitions>

ClickShow/UI/MainWindow.xaml.cs

@@ -102,54 +102,72 @@ private void OnLoaded(object sender, RoutedEventArgs e)
             // 检查版本更新
             Task.Run(async () =>
             {
-                await Task.Delay(1000 * 60 * 1);
+                await Task.Delay(1000 * 10 );
                 CheckUpdate();
             });
 
         }
 
-        /// <summary>
-        /// 在主窗口上提示有新版本
-        /// </summary>
-        public bool ShowNewVersionTip { get; set; }
         public Version NewVersion { get; set; }
 
         /// <summary>
         /// 检查版本更新
         /// </summary>
         private void CheckUpdate()
         {
-            string url = "https://raw.githubusercontent.com/cuiliang/ClickShow/main/version.txt";
+            // 版本号检查网址
+            string url = "https://helperservice.getquicker.cn/clickshow/version";
+            string updateUrl = "https://github.com/cuiliang/ClickShow/releases";
 
             try
             {
                 var client = new WebClient();
+                
+                // 下载版本信息字符串。可能格式：（1）只有版本号。 （2）版本号|网址
                 var versionStr = client.DownloadString(url);
-                NewVersion = new Version(versionStr);
+
+                if (versionStr.Contains("|"))
+                {
+                    string[] parts = versionStr.Split('|');
+                    NewVersion = new Version(parts[0]);
+                    updateUrl = String.IsNullOrEmpty(parts[1]) ? updateUrl : parts[1];
+                }
+                else
+                {
+                    NewVersion = new Version(versionStr);
+                }
+
+
+              
 
                 // 版本落后了
                 if (NewVersion > Assembly.GetExecutingAssembly().GetName().Version)
                 {
                     // 如果之前已经提示了此版本，则不再提示，不然每次开机都会有一个提示了。
                     if (String.Equals(AppSetting.LastNotifiedVersion, versionStr))
                     {
-                        ShowNewVersionTip = true;
+                        Dispatcher.InvokeAsync(() =>
+                        {
+                            LblNewVersion.Visibility = Visibility.Visible;
+
+                        });
                     }
                     else
                     {
                         AppSetting.LastNotifiedVersion = versionStr;
                         SaveSettings();
 
-                        if (MessageBox.Show($"ClickShow有新版本（{versionStr}），是否立即打开网页？", "ClickShow", MessageBoxButton.YesNo, MessageBoxImage.Information) == MessageBoxResult.Yes)
+                        if (MessageBox.Show($"ClickShow有新版本（{versionStr}），是否立即打开网页？", "ClickShow", MessageBoxButton.YesNo, MessageBoxImage.Information) != MessageBoxResult.Yes)
+                        {
+                            return;
+                        }
+                        try
+                        {
+                            Process.Start(updateUrl);
+                        }
+                        catch
                         {
-                            try
-                            {
-                                Process.Start("https://github.com/cuiliang/ClickShow/releases");
-                            }
-                            catch
-                            {
-                                MessageBox.Show("无法打开网址：https://github.com/cuiliang/ClickShow/releases");
-                            }
+                            MessageBox.Show($"无法打开网址：{updateUrl}");
                         }
                     }
                 }