升级VC版本

XHWK.WKTool/App.config

@@ -9,8 +9,8 @@
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="106" />
-    <add key="VersionName" value="3.1.12" />
+    <add key="VersionCode" value="107" />
+    <add key="VersionName" value="3.1.13" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

星火微课/星火微课-正式.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.1.12"
+#define MyAppVersion "3.1.13"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"
@@ -56,9 +56,8 @@ Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Fil
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
 [Code]  
-
 // 自定义函数，判断软件是否运行，参数为需要判断的软件的exe名称
-function KDetectSoft(strExeName: String): Boolean;
+function CheckSoftRun(strExeName: String): Boolean;
 // 变量定义
 var ErrorCode: Integer;
 var bRes: Boolean;
@@ -100,7 +99,7 @@ end;
 function NextButtonClick(CurPageID: Integer): Boolean;
 begin
   if 1=CurPageID then begin
-      Result := KDetectSoft('{#MyAppExeName}');
+      Result := CheckSoftRun('{#MyAppExeName}');
       Exit;
   end; 
   Result:= true;
@@ -109,34 +108,38 @@ end;
 // 卸载时关闭软件
 function InitializeUninstall(): Boolean;
 begin
-  Result := KDetectSoft('{#MyAppExeName}');
+  Result := CheckSoftRun('{#MyAppExeName}');
+end;
+
+function CheckVC():boolean;
+var Path:string; 
+      ResultCode: Integer;  
+begin
+  if RegValueExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{01FAEC41-B3BC-44F4-B185-5E8475AEB855}', 'Version') 
+  or RegValueExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{77EB1EA9-8E1B-459D-8CDC-1984D0FF15B6}', 'Version') 
+  then  
+    begin  
+      Result := true;   
+    end  
+  else  
+  begin  
+    if MsgBox('系统检测到您没有安装VC++环境，是否立刻下载并安装？', mbConfirmation, MB_YESNO) = idYes then  
+      begin  
+        Path := ExpandConstant('{pf}/Internet Explorer/iexplore.exe');   
+        Exec(Path, 'https://xhkjedu.oss-cn-huhehaote.aliyuncs.com/runtime/vc_redist.x86.exe', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);   
+        MsgBox('请安装好VC++环境后，再运行本安装包程序！',mbInformation,MB_OK);   
+        Result := false;   
+      end  
+    else  
+      begin  
+        MsgBox('取消后请手动安装VC2015-2019环境！',mbInformation,MB_OK);   
+        Result := true;   
+      end;   
+  end;
 end;
 
 
-// Indicates whether the specified version and service pack of the .NET Framework is installed.
-//
-// version -- Specify one of these strings for the required .NET Framework version:
-//    'v1.1'          .NET Framework 1.1
-//    'v2.0'          .NET Framework 2.0
-//    'v3.0'          .NET Framework 3.0
-//    'v3.5'          .NET Framework 3.5
-//    'v4\Client'     .NET Framework 4.0 Client Profile
-//    'v4\Full'       .NET Framework 4.0 Full Installation
-//    'v4.5'          .NET Framework 4.5
-//    'v4.5.1'        .NET Framework 4.5.1
-//    'v4.5.2'        .NET Framework 4.5.2
-//    'v4.6'          .NET Framework 4.6
-//    'v4.6.1'        .NET Framework 4.6.1
-//    'v4.6.2'        .NET Framework 4.6.2
-//    'v4.7'          .NET Framework 4.7
-//    'v4.7.1'        .NET Framework 4.7.1
-//    'v4.7.2'        .NET Framework 4.7.2
-//    'v4.8'          .NET Framework 4.8
-//
-// service -- Specify any non-negative integer for the required service pack level:
-//    0               No service packs required
-//    1, 2, etc.      Service pack 1, 2, etc. required
-function IsDotNetDetected(version: string; service: cardinal): boolean;
+function IsInstallDotNet(version: string; service: cardinal): boolean;
 var
     key, versionKey: string;
     install, release, serviceCount, versionRelease: cardinal;
@@ -196,31 +199,14 @@ begin
     result := success and (install = 1) and (serviceCount >= service);
 end;
 
-function InitializeSetup: Boolean;   
+// 检查.Net是否安装
+function CheckDotNet : Boolean;
 var Path:string;   
     ResultCode: Integer;   
 begin  
-  if IsDotNetDetected('v4.5.2', 0) then  
+  if IsInstallDotNet('v4.5.2', 0) then  
     begin  
-      if RegValueExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{01FAEC41-B3BC-44F4-B185-5E8475AEB855}', 'Version') then  
-        begin  
-          Result := true;   
-        end  
-      else  
-      begin  
-        if MsgBox('系统检测到您没有安装VC++环境，是否立刻下载并安装？', mbConfirmation, MB_YESNO) = idYes then  
-          begin  
-            Path := ExpandConstant('{pf}/Internet Explorer/iexplore.exe');   
-            Exec(Path, 'https://xhkjedu.oss-cn-huhehaote.aliyuncs.com/runtime/VC_redist.x86.exe', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);   
-            MsgBox('请安装好VC++环境后，再运行本安装包程序！',mbInformation,MB_OK);   
-            Result := false;   
-          end  
-        else  
-          begin  
-            MsgBox('取消后请手动安装VC2015-2019环境！',mbInformation,MB_OK);   
-            Result := true;   
-          end;   
-      end;
+        Result := true; 
     end  
   else  
     begin  
@@ -239,5 +225,12 @@ begin
     end;
 end;
 
+function InitializeSetup: Boolean;
+begin
+  Result := CheckDotNet();
+  Result := CheckVC();
+end;   
+
+
 [CustomMessages]
 chinesesimp.checkSoftTip=安装程序检测到将安装的软件正在运行！%n%n点击"确定"终止软件后继续操作，否则点击"取消"。

星火微课/星火微课-测试.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.1.12"
+#define MyAppVersion "3.1.13"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"
@@ -55,9 +55,9 @@ Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Fil
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
-[Code]
+[Code]  
 // 自定义函数，判断软件是否运行，参数为需要判断的软件的exe名称
-function KDetectSoft(strExeName: String): Boolean;
+function CheckSoftRun(strExeName: String): Boolean;
 // 变量定义
 var ErrorCode: Integer;
 var bRes: Boolean;
@@ -99,7 +99,7 @@ end;
 function NextButtonClick(CurPageID: Integer): Boolean;
 begin
   if 1=CurPageID then begin
-      Result := KDetectSoft('{#MyAppExeName}');
+      Result := CheckSoftRun('{#MyAppExeName}');
       Exit;
   end; 
   Result:= true;
@@ -108,33 +108,38 @@ end;
 // 卸载时关闭软件
 function InitializeUninstall(): Boolean;
 begin
-  Result := KDetectSoft('{#MyAppExeName}');
+  Result := CheckSoftRun('{#MyAppExeName}');
 end;
 
-// Indicates whether the specified version and service pack of the .NET Framework is installed.
-//
-// version -- Specify one of these strings for the required .NET Framework version:
-//    'v1.1'          .NET Framework 1.1
-//    'v2.0'          .NET Framework 2.0
-//    'v3.0'          .NET Framework 3.0
-//    'v3.5'          .NET Framework 3.5
-//    'v4\Client'     .NET Framework 4.0 Client Profile
-//    'v4\Full'       .NET Framework 4.0 Full Installation
-//    'v4.5'          .NET Framework 4.5
-//    'v4.5.1'        .NET Framework 4.5.1
-//    'v4.5.2'        .NET Framework 4.5.2
-//    'v4.6'          .NET Framework 4.6
-//    'v4.6.1'        .NET Framework 4.6.1
-//    'v4.6.2'        .NET Framework 4.6.2
-//    'v4.7'          .NET Framework 4.7
-//    'v4.7.1'        .NET Framework 4.7.1
-//    'v4.7.2'        .NET Framework 4.7.2
-//    'v4.8'          .NET Framework 4.8
-//
-// service -- Specify any non-negative integer for the required service pack level:
-//    0               No service packs required
-//    1, 2, etc.      Service pack 1, 2, etc. required
-function IsDotNetDetected(version: string; service: cardinal): boolean;
+function CheckVC():boolean;
+var Path:string; 
+      ResultCode: Integer;  
+begin
+  if RegValueExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{01FAEC41-B3BC-44F4-B185-5E8475AEB855}', 'Version') 
+  or RegValueExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{77EB1EA9-8E1B-459D-8CDC-1984D0FF15B6}', 'Version') 
+  then  
+    begin  
+      Result := true;   
+    end  
+  else  
+  begin  
+    if MsgBox('系统检测到您没有安装VC++环境，是否立刻下载并安装？', mbConfirmation, MB_YESNO) = idYes then  
+      begin  
+        Path := ExpandConstant('{pf}/Internet Explorer/iexplore.exe');   
+        Exec(Path, 'https://xhkjedu.oss-cn-huhehaote.aliyuncs.com/runtime/vc_redist.x86.exe', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);   
+        MsgBox('请安装好VC++环境后，再运行本安装包程序！',mbInformation,MB_OK);   
+        Result := false;   
+      end  
+    else  
+      begin  
+        MsgBox('取消后请手动安装VC2015-2019环境！',mbInformation,MB_OK);   
+        Result := true;   
+      end;   
+  end;
+end;
+
+
+function IsInstallDotNet(version: string; service: cardinal): boolean;
 var
     key, versionKey: string;
     install, release, serviceCount, versionRelease: cardinal;
@@ -194,31 +199,14 @@ begin
     result := success and (install = 1) and (serviceCount >= service);
 end;
 
-function InitializeSetup: Boolean;   
+// 检查.Net是否安装
+function CheckDotNet : Boolean;
 var Path:string;   
     ResultCode: Integer;   
 begin  
-  if IsDotNetDetected('v4.5.2', 0) then  
+  if IsInstallDotNet('v4.5.2', 0) then  
     begin  
-      if RegValueExists(HKLM, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{01FAEC41-B3BC-44F4-B185-5E8475AEB855}', 'Version') then  
-        begin  
-          Result := true;   
-        end  
-      else  
-      begin  
-        if MsgBox('系统检测到您没有安装VC++环境，是否立刻下载并安装？', mbConfirmation, MB_YESNO) = idYes then  
-          begin  
-            Path := ExpandConstant('{pf}/Internet Explorer/iexplore.exe');   
-            Exec(Path, 'https://xhkjedu.oss-cn-huhehaote.aliyuncs.com/runtime/VC_redist.x86.exe', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);   
-            MsgBox('请安装好VC++环境后，再运行本安装包程序！',mbInformation,MB_OK);   
-            Result := false;   
-          end  
-        else  
-          begin  
-            MsgBox('取消后请手动安装VC2015-2019环境！',mbInformation,MB_OK);   
-            Result := true;   
-          end;   
-      end;
+        Result := true; 
     end  
   else  
     begin  
@@ -237,6 +225,12 @@ begin
     end;
 end;
 
+function InitializeSetup: Boolean;
+begin
+  Result := CheckDotNet();
+  Result := CheckVC();
+end; 
+
 
 [CustomMessages]
-chinesesimp.checkSoftTip=安装程序检测到将安装的软件正在运行！%n%n点击"确定"终止软件后继续操作，否则点击"取消"。
+chinesesimp.checkSoftTip=安装程序检测到将安装的软件正在运行！%n%n点击"确定"终止软件后继续操作，否则点击"取消"。