客户端更新

apq-pc-common/src/main/java/com/TestDemo.java

@@ -28,8 +28,8 @@ public class TestDemo {
         log.info("APQ_HWPORT_Initialize ret:{}", result);
 
         // 注册设备热插拔通知后，接收热插拔事件
-        DeviceChangeCallbackImpl deviceChangeCallback = new DeviceChangeCallbackImpl();
-        IHwPortController.instanceDll.APQ_HWPORT_Register_Device_Notification(deviceChangeCallback);
+//        DeviceChangeCallbackImpl deviceChangeCallback = new DeviceChangeCallbackImpl();
+//        IHwPortController.instanceDll.APQ_HWPORT_Register_Device_Notification(deviceChangeCallback);
 
 
         /*
@@ -67,16 +67,16 @@ public class TestDemo {
         int result4 = IHwPortController.instanceDll.APQ_HWPORT_get_net_device_permit(0);
         log.info("APQ_HWPORT_get_net_device_permit ret:{}, speed:{}", result4, speed);*/
 
-        try {
-            Thread.sleep(100000);
-        } catch (InterruptedException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
+//        try {
+//            Thread.sleep(100000);
+//        } catch (InterruptedException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
 
         // --- 3. 清理资源 ---
         // 停止监听并释放资源
-        IHwPortController.instanceDll.APQ_HWPORT_Unregister_Device_Notification();
+//        IHwPortController.instanceDll.APQ_HWPORT_Unregister_Device_Notification();
 
         // 清理硬件接口管理模块
         int result2 = IHwPortController.instanceDll.APQ_HWPORT_Uninitialize();

apq-pc-common/src/main/java/com/priusis/utils/CoreTempUtil.java

@@ -15,9 +15,9 @@ import java.util.Arrays;
 @Slf4j
 public class CoreTempUtil {
 
-    static final String coreFromOs = "CoreTemp" + (OshiUtil.getOs().getBitness() == 64 ? "x64" : "");
-    static final String WR0_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/" + coreFromOs + ".dll", System.getProperty("user.dir") + "/apq-pc-common");
-//    static final String WR0_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/CoreTemp.dll", System.getProperty("user.dir") + "/apq-pc-common");
+//    static final String coreFromOs = "CoreTemp" + (OshiUtil.getOs().getBitness() == 64 ? "x64" : "");
+//    static final String WR0_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/" + coreFromOs + ".dll", System.getProperty("user.dir") + "/apq-pc-common");
+    static final String WR0_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/CoreTemp.dll", System.getProperty("user.dir") + "/apq-pc-common");
 
     /**
      * CPU温度

apq-pc-common/src/main/java/com/priusis/utils/IHwPortController.java

@@ -69,8 +69,8 @@ public interface IHwPortController extends Library {
      */
     //如果本地类库不是线程安全的，可用Native.synchronizedLibrary
 
-    IHwPortController instanceDll = (IHwPortController) Native.loadLibrary(ParseUrlUtil.parseAbsolutePath("/dact/" + (OshiUtil.getOs().getBitness() == 64 ? "x64" : "x32") + "/HwPortController.dll", System.getProperty("user.dir") + "/apq-pc-common"), IHwPortController.class);
-//    IHwPortController instanceDll = (IHwPortController) Native.loadLibrary(ParseUrlUtil.parseAbsolutePath("/dact/x32/HwPortController.dll", System.getProperty("user.dir") + "/apq-pc-common"), IHwPortController.class);
+//    IHwPortController instanceDll = (IHwPortController) Native.loadLibrary(ParseUrlUtil.parseAbsolutePath("/dact/" + (OshiUtil.getOs().getBitness() == 64 ? "x64" : "x32") + "/HwPortController.dll", System.getProperty("user.dir") + "/apq-pc-common"), IHwPortController.class);
+    IHwPortController instanceDll = (IHwPortController) Native.loadLibrary(ParseUrlUtil.parseAbsolutePath("/dact/x32/HwPortController.dll", System.getProperty("user.dir") + "/apq-pc-common"), IHwPortController.class);
 
     /**
      * 初始化硬件接口管理模块

apq-pc-common/src/main/java/com/priusis/utils/ProcessExtensionsApqUtil.java

@@ -13,8 +13,8 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class ProcessExtensionsApqUtil {
 
-    static final String CP_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/apq_CreatProcess" + (OshiUtil.getOs().getBitness() == 64 ? "x64" : "") + ".dll", System.getProperty("user.dir") + "/apq-pc-common");
-//    static final String CP_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/apq_CreatProcess.dll", System.getProperty("user.dir") + "/apq-pc-common");
+//    static final String CP_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/apq_CreatProcess" + (OshiUtil.getOs().getBitness() == 64 ? "x64" : "") + ".dll", System.getProperty("user.dir") + "/apq-pc-common");
+    static final String CP_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/apq_CreatProcess.dll", System.getProperty("user.dir") + "/apq-pc-common");
     static ProcessExtensionsApq CP_API_INSTANCE = Native.loadLibrary(CP_DLL_NAME, ProcessExtensionsApq.class);
 
     /**

apq-pc-common/src/main/java/com/priusis/utils/WinRing0Util.java

@@ -15,10 +15,10 @@ import java.util.Map;
  * Java通过JNA调用WinRing0.dll实现模拟驱动级别按键
  */
 public class WinRing0Util {
-    static final String WR0_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/WinRing0" + (OshiUtil.getOs().getBitness() == 64 ? "x64" : "") + ".dll",
-            System.getProperty("user.dir") + "/apq-pc-common");
-//    static final String WR0_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/WinRing0.dll",
+//    static final String WR0_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/WinRing0" + (OshiUtil.getOs().getBitness() == 64 ? "x64" : "") + ".dll",
 //            System.getProperty("user.dir") + "/apq-pc-common");
+    static final String WR0_DLL_NAME = ParseUrlUtil.parseAbsolutePath("/core/WinRing0.dll",
+            System.getProperty("user.dir") + "/apq-pc-common");
 
     static WR0 WR0_INSTANCE = Native.loadLibrary(WR0_DLL_NAME, WR0.class);
 

tools/install-package/boot/apq-client/apq-client-x32.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
                  
 #define MyAppName "阿普奇检测客户端"   
-#define MyAppVersion "V1.3.2"               
+#define MyAppVersion "V1.3.32"               
 #define MyAppPublisher "阿普奇"           
 #define MyAppURL "https://www.apq.com/"        
 #define MyAppDirName "apq-client"        
@@ -233,6 +233,8 @@ function InitializeSetup: Boolean;
 var  
   CurVer: string;
   CurVerStr: string;
+  CurVerStrTwo: string;
+  CurVerStrThree: string;
 begin                                                
 // Do not use any user defined vars in here such as {app}
   // Result := not ( CheckProcessRunning( 'apq-client-service.exe', 'apq-client-service' ));
@@ -241,15 +243,33 @@ begin
   CheckProcessRunning( 'apq-register.exe', 'apq客户端插件' )
   CheckProcessRunning( 'apq.exe', 'apq客户端桌面' )
 
-  RegQueryStringValue(HKLM, 'SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64', 'Version', CurVer);
+  RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86', 'Version', CurVer);
   CurVerStr := Copy(CurVer,2,2);
+ 
+  RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86', 'Version', CurVer);
+  CurVerStrTwo := Copy(CurVer,2,2);
+
+  RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\11.0\VC\Runtimes\x86', 'Version', CurVer);
+  CurVerStrThree := Copy(CurVer,2,2);    
 
   if CurVerStr = '14' then
   begin
       vc9SP1Missing := false;
   end 
   else begin
-      vc9SP1Missing := true;
+      if CurVerStrTwo = '12' then
+      begin
+          if CurVerStrTwo = '11' then
+          begin
+              vc9SP1Missing := false;
+          end 
+          else begin
+              vc9SP1Missing := true;
+          end;
+      end 
+      else begin
+          vc9SP1Missing := true;
+      end;
   end;
 
   Result := not ( CheckProcessRunning( 'apq-client.exe', 'apq-client客户端' ));

tools/install-package/boot/apq-client/apq-client.iss

@@ -2,14 +2,14 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
                  
 #define MyAppName "阿普奇检测客户端"  
-#define MyAppVersion "V1.3.1"             
+#define MyAppVersion "V1.3.3"             
 #define MyAppPublisher "阿普奇"           
 #define MyAppURL "https://www.apq.com/"        
 #define MyAppDirName "apq-client"
 #define MyAppEnName "apq-client"          
 #define MyAppExeName "apq-client.exe"                   
-; apq-iot-client
-#define MyAppInstallPwd "2a96d11973c7caa1a72eb816d7db6d17"
+; apq-iot-client                                                      
+#define MyAppInstallPwd "2a96d11973c7caa1a72eb816d7db6d17"     
 ; hk-remove2022
 #define MyAppUnInstallPwd "5b559ab76c08f97b5bd6c3a852e44141"  
 
@@ -233,6 +233,8 @@ function InitializeSetup: Boolean;
 var  
   CurVer: string;
   CurVerStr: string;
+  CurVerStrTwo: string;
+  CurVerStrThree: string;
 begin                                                
 // Do not use any user defined vars in here such as {app}
   // Result := not ( CheckProcessRunning( 'apq-client-service.exe', 'apq-client-service' ));
@@ -244,6 +246,12 @@ begin
   RegQueryStringValue(HKLM, 'SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64', 'Version', CurVer);
   CurVerStr := Copy(CurVer,2,2);
 
+  //RegQueryStringValue(HKLM, 'SOFTWARE\WOW6432Node\Microsoft\VisualStudio\12.0\VC\Runtimes\x64', 'Version', CurVer);
+  //CurVerStrTwo := Copy(CurVer,2,2);
+
+  //RegQueryStringValue(HKLM, 'SOFTWARE\WOW6432Node\Microsoft\VisualStudio\11.0\VC\Runtimes\x64', 'Version', CurVer);
+  //CurVerStrThree := Copy(CurVer,2,2);
+
   if CurVerStr = '14' then
   begin
       vc9SP1Missing := false;