test

pom.xml

@@ -127,9 +127,9 @@
         <dependency>
             <groupId>com.netsdk</groupId>
             <artifactId>netsdk</artifactId>
-            <version>1.0</version>
+            <version>1.0-demo</version>
-            <scope>system</scope>
+<!--            <scope>system</scope>-->
-            <systemPath>${project.basedir}/src/main/resources/sdk/netsdk-1.0-demo.jar</systemPath>
+<!--            <systemPath>${project.basedir}/src/main/resources/sdk/netsdk-1.0-demo.jar</systemPath>-->
         </dependency>
     </dependencies>
 
@@ -192,7 +192,7 @@
                     <include>**/*.xml</include>
                     <include>**/*.yml</include>
                     <include>**/*.properties</include>
-                    <include>libs/*.jar</include>
+                    <include>**/*.so</include>
                 </includes>
                 <filtering>false</filtering>
             </resource>

src/main/java/com/educoder/netsdk/init/Runner.java

@@ -45,35 +45,35 @@ public class Runner implements CommandLineRunner {
         }
         log.info("初始化SDK成功");
 
-        // 登录人脸识别设备
+//        // 登录人脸识别设备
-        List<DhDevice> faceDevices = dhFaceDevices.getFaceDevice();
+//        List<DhDevice> faceDevices = dhFaceDevices.getFaceDevice();
-        if (faceDevices == null || faceDevices.size() == 0) {
+//        if (faceDevices == null || faceDevices.size() == 0) {
-            log.error("没有配置人脸识别设备 faceDevice");
+//            log.error("没有配置人脸识别设备 faceDevice");
-            dhLoginService.cleanup();
+//            dhLoginService.cleanup();
-            Runtime.getRuntime().exit(-1);
+//            Runtime.getRuntime().exit(-1);
-        }
+//        }
-
+//
-        long loginHandle = dhLoginService.login(faceDevices.get(0).getIp(), faceDevices.get(0).getPort(),
+//        long loginHandle = dhLoginService.login(faceDevices.get(0).getIp(), faceDevices.get(0).getPort(),
-                appConfig.getSdkUsername(), appConfig.getSdkPassword());
+//                appConfig.getSdkUsername(), appConfig.getSdkPassword());
-        if (loginHandle == 0) {
+//        if (loginHandle == 0) {
-            log.error("登录人脸识别设备失败");
+//            log.error("登录人脸识别设备失败");
-            dhLoginService.cleanup();
+//            dhLoginService.cleanup();
-            Runtime.getRuntime().exit(-1);
+//            Runtime.getRuntime().exit(-1);
-        }
+//        }
-
+//
-        DhModule.dhFaceLoginHandle.setValue(loginHandle);
+//        DhModule.dhFaceLoginHandle.setValue(loginHandle);
-        log.info("登录人脸识别设备成功");
+//        log.info("登录人脸识别设备成功");
-
+//
-        // 订阅事件
+//        // 订阅事件
-        Long aLong = dhTargetRecognitionService.realLoadPicture(0, DhModule.AnalyzerDataCallBack.getInstance(),
+//        Long aLong = dhTargetRecognitionService.realLoadPicture(0, DhModule.AnalyzerDataCallBack.getInstance(),
-                DhModule.dhFaceLoginHandle);
+//                DhModule.dhFaceLoginHandle);
-        if (aLong == 0) {
+//        if (aLong == 0) {
-            log.error("订阅事件失败");
+//            log.error("订阅事件失败");
-            dhLoginService.cleanup();
+//            dhLoginService.cleanup();
-            Runtime.getRuntime().exit(-1);
+//            Runtime.getRuntime().exit(-1);
-        }
+//        }
-
+//
-        log.info("订阅事件成功");
+//        log.info("订阅事件成功");
 
         log.info("初始化完成");
     }

src/main/java/com/educoder/netsdk/model/DhModule.java

@@ -4,6 +4,8 @@ import cn.hutool.core.map.MapUtil;
 import com.educoder.netsdk.config.AppConfig;
 import com.educoder.netsdk.utils.OKHttp3Utils3;
 import com.netsdk.lib.NetSDKLib;
+import com.netsdk.lib.NetSDKLib.fDisConnect;
+import com.netsdk.lib.NetSDKLib.fHaveReConnect;
 import com.netsdk.lib.ToolKits;
 import com.sun.jna.Pointer;
 import lombok.extern.slf4j.Slf4j;
@@ -34,7 +36,7 @@ public class DhModule {
     /**
      * 设备断线回调
      */
-    public static class DisConnectCallBack implements NetSDKLib.fDisConnect {
+    public static class DisConnectCallBack implements fDisConnect {
 
         private DisConnectCallBack() {
         }
@@ -56,7 +58,7 @@ public class DhModule {
     /**
      * 设备重连回调
      */
-    public static class HaveReConnectCallBack implements NetSDKLib.fHaveReConnect {
+    public static class HaveReConnectCallBack implements fHaveReConnect {
         private HaveReConnectCallBack() {
         }
 

src/main/java/com/educoder/netsdk/model/DownloadRecordFileParam.java

@@ -19,11 +19,11 @@ public class DownloadRecordFileParam implements Serializable {
     @NotBlank
     private String ip;
 
-    private int port = 22;
+    private Integer port = 22;
 
-    private int channel = 2;
+    private Integer channel = 2;
 
-    private int recordFileType = 0;
+    private Integer recordFileType = 0;
 
     /**
      * 开始时间

src/main/java/com/educoder/netsdk/service/DhLoginService.java

@@ -2,6 +2,8 @@ package com.educoder.netsdk.service;
 
 import com.netsdk.lib.LibraryLoad;
 import com.netsdk.lib.NetSDKLib;
+import com.netsdk.lib.NetSDKLib.fDisConnect;
+import com.netsdk.lib.NetSDKLib.fHaveReConnect;
 import com.netsdk.lib.ToolKits;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
@@ -29,7 +31,7 @@ public class DhLoginService {
     private static boolean bLogopen = false;
 
 
-    public boolean init(NetSDKLib.fDisConnect disConnect, NetSDKLib.fHaveReConnect haveReConnect) {
+    public boolean init(fDisConnect disConnect, fHaveReConnect haveReConnect) {
         // 将动态库文件写入主机文件夹
         setAllResourceFile();
 
@@ -142,10 +144,10 @@ public class DhLoginService {
 
     private byte[] readResourceFileByte(String name) {
         try {
-            URL resource = this.getClass().getClassLoader().getResource(name);
+            URL resource = this.getClass().getClassLoader().getResource("linux64/" + name);
             return IOUtils.toByteArray(resource);
         } catch (Exception e) {
-            throw new RuntimeException("读取二进制资源文件" + name + "失败", e);
+            throw new RuntimeException("读取文件" + name + "失败 "+ e.getMessage());
         }
     }