install2 项目 添加联网中提示

Install2/Install/Core/InstallWizard.cs

@@ -51,10 +51,16 @@ namespace Install.Core
         /// </summary>
         public bool HasNewestInstallZip { get; private set; }
 
+        /// <summary>
+        /// 从网络检测信息中
+        /// </summary>
+        public bool IsCheckingNetwork { get; private set; }
+
         /// <summary>
         /// 最新的安装包版本
         /// </summary>
         public string NewestInstallZipVersion { get; private set; }
+
         /// <summary>
         /// 当前的安装包版本
         /// </summary>
@@ -115,6 +121,7 @@ namespace Install.Core
         /// </summary>
         void DownloadNewestInstallZipInfo() 
         {
+            IsCheckingNetwork = true;
             //新建线程
             Task.Factory.StartNew(() =>
             {
@@ -130,7 +137,9 @@ namespace Install.Core
                 NewestInstallZipVersion = NewestInstallZipVersionInfo.InstallZipVersion;
 
                 int ret = VerExt.VersionCompare(InstallPacks.InstallZipVersion, NewestInstallZipVersionInfo.InstallZipVersion);
+                IsCheckingNetwork = false;
                 HasNewestInstallZip = (ret < 0);
+                 
             });
         }
 

Install2/Install/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("佛山市枫莱尔自动化有限公司")]
 [assembly: AssemblyProduct("FLY系列软件安装向导")]
-[assembly: AssemblyCopyright("Copyright ©  2021 flyautomation")]
+[assembly: AssemblyCopyright("Copyright ©  2022 flyautomation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,6 +51,6 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.1")]
-[assembly: AssemblyFileVersion("4.0.1")]
+[assembly: AssemblyVersion("4.0.2")]
+[assembly: AssemblyFileVersion("4.0.2")]
 [assembly: Guid("AB127AC6-16C6-411F-8892-D90413A863C8")]

Install2/Install/View/PgUpdate/PgUpdate.xaml

@@ -22,6 +22,10 @@
             </Grid.ColumnDefinitions>
             <TextBlock Text="已安装项目" Style="{StaticResource h1}"/>
             <StackPanel Orientation="Horizontal" Grid.Column="1">
+                <TextBlock 
+                        Visibility="{Binding InstallWizard.IsCheckingNetwork,Converter={StaticResource visbilityconv}}"
+                        Foreground="Green" FontSize="20" 
+                        Text="正在联网检测版本更新" />
                 <Button Margin="5" Command="{Binding DownloadCmd}" Visibility="{Binding InstallWizard.HasNewestInstallZip,Converter={StaticResource visbilityconv}}">
                     <TextBlock Margin="10,2">
                         点击下载 最新版本 v<Run Foreground="Red" FontSize="20" Text="{Binding InstallWizard.NewestInstallZipVersion,Mode=OneWay}"/> 

Install2/Update/Core/InstallWizard.cs

@@ -45,6 +45,10 @@ namespace Update.Core
         /// </summary>
         public bool HasNewestInstallZip { get; private set; }
 
+        /// <summary>
+        /// 从网络检测信息中
+        /// </summary>
+        public bool IsCheckingNetwork { get; private set; }
         /// <summary>
         /// 最新的安装包版本
         /// </summary>
@@ -94,7 +98,7 @@ namespace Update.Core
             UpdateHasInstalled();
 
             UpdateIcons();
-
+            
             DownloadNewestInstallZipInfo();
             return true;
         }
@@ -104,6 +108,7 @@ namespace Update.Core
         /// </summary>
         void DownloadNewestInstallZipInfo() 
         {
+            IsCheckingNetwork = true;
             //新建线程
             Task.Factory.StartNew(() =>
             {
@@ -119,7 +124,9 @@ namespace Update.Core
                 NewestInstallZipVersion = NewestInstallZipVersionInfo.InstallZipVersion;
 
                 int ret = VerExt.VersionCompare(InstallPacks.InstallZipVersion, NewestInstallZipVersionInfo.InstallZipVersion);
+                IsCheckingNetwork = false;
                 HasNewestInstallZip = (ret < 0);
+                
             });
         }
 

Install2/Update/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("佛山市枫莱尔自动化技术有限公司")]
 [assembly: AssemblyProduct("FLY系列软件升级检测")]
-[assembly: AssemblyCopyright("Copyright ©  2021 flyautomation")]
+[assembly: AssemblyCopyright("Copyright ©  2022 flyautomation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]

Install2/Update/View/PgUpdate/PgUpdate.xaml

@@ -24,11 +24,17 @@
                 <TextBlock Style="{StaticResource h1}">
                     当前版本号: v<Run Text="{Binding InstallWizard.CurrentInstallZipVersion,Mode=OneWay}"/>
                 </TextBlock>
-                <TextBlock Margin="10,2"
-                    VerticalAlignment="Center"
-                    Visibility="{Binding InstallWizard.HasNewestInstallZip,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}"
-                    Foreground="Red" FontSize="20" 
-                    Text="(已经为最新版本)" />
+                <Grid Margin="10,2" VerticalAlignment="Center">
+                    <Grid Visibility="{Binding InstallWizard.IsCheckingNetwork,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
+                        <TextBlock Visibility="{Binding InstallWizard.HasNewestInstallZip,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}"
+                            Foreground="Red" FontSize="20" 
+                            Text="(已经为最新版本)" />
+                    </Grid>
+                    <TextBlock 
+                        Visibility="{Binding InstallWizard.IsCheckingNetwork,Converter={StaticResource visbilityconv}}"
+                        Foreground="Green" FontSize="20" 
+                        Text="正在联网检测版本更新" />
+                </Grid>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Grid.Column="1">
                 <Button Margin="5" Command="{Binding DownloadCmd}" Visibility="{Binding InstallWizard.HasNewestInstallZip,Converter={StaticResource visbilityconv}}">