feats

.idea/artifacts/hardware_jar.xml

@@ -0,0 +1,13 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="hardware:jar">
+    <output-path>$PROJECT_DIR$/out/artifacts/hardware_jar</output-path>
+    <root id="archive" name="hardware.jar">
+      <element id="module-output" name="hardware" />
+      <element id="extracted-dir" path="D:/REPO/com/alibaba/fastjson/1.2.56/fastjson-1.2.56.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="D:/REPO/com/sun/jna/jna/3.0.9/jna-3.0.9.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/src/main/resources/libs/examples.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="D:/REPO/com/squareup/okio/okio/1.17.2/okio-1.17.2.jar" path-in-jar="/" />
+    </root>
+  </artifact>
+</component>

.idea/compiler.xml

@@ -9,5 +9,6 @@
         <module name="hardware" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel target="8" />
   </component>
 </project>

.idea/libraries/examples.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="examples">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/src/main/resources/libs/examples.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

hardware.iml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />

pom.xml

@@ -7,28 +7,110 @@
     <groupId>com.huiju.welcome</groupId>
     <artifactId>hardware</artifactId>
     <version>v3.0.0</version>
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/libs</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--直接将所有依赖一起打包-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.1.1</version>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.huiju.welcome.hardware.Main</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>src/assembly/myassembly.xml</descriptorRef>
+                    </descriptorRefs>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-compiler-plugin</artifactId>-->
+                <!--<configuration>-->
+                    <!--<source>1.8</source>-->
+                    <!--<target>1.8</target>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-jar-plugin</artifactId>-->
+                <!--<version>3.1.1</version>-->
+                <!--<configuration>-->
+                    <!--<archive>-->
+                        <!--<manifest>-->
+                            <!--<addClasspath>true</addClasspath>-->
+                            <!--<useUniqueVersions>false</useUniqueVersions>-->
+                            <!--<classpathPrefix>lib/</classpathPrefix>-->
+                            <!--<mainClass>com.huiju.welcome.hardware.Main</mainClass>-->
+                        <!--</manifest>-->
+                    <!--</archive>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-assembly-plugin</artifactId>-->
+                <!--<configuration>-->
+                    <!--<archive>-->
+                        <!--<manifest>-->
+                            <!--<mainClass>com.huiju.welcome.hardware.Main</mainClass>-->
+                        <!--</manifest>-->
+                    <!--</archive>-->
+                    <!--<descriptors>-->
+                        <!--<descriptor>src/assembly/myassembly.xml</descriptor>-->
+                    <!--</descriptors>-->
+                <!--</configuration>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<id>make-assembly</id>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>single</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
         </plugins>
     </build>
 
     <dependencies>
         <dependency>
-            <groupId>com.huiju</groupId>
+            <groupId>com.sun.jna</groupId>
             <artifactId>examples</artifactId>
-            <version>1.0.0</version>
             <scope>system</scope>
+            <version>1.0</version>
             <systemPath>${project.basedir}\src\main\resources\libs\examples.jar</systemPath>
         </dependency>
-
         <dependency>
             <groupId>com.sun.jna</groupId>
             <artifactId>jna</artifactId>

setting.conf

@@ -5,5 +5,5 @@ password = huiju999
 ip = 192.168.0.13
 port = 8000
 api = 
-hiklib = E:\JavaProjects\welcome3.0\hardware\hklib
+hiklib = E:\\JavaProjects\\welcome3.0\\hardware\\hklib
 server = http://127.0.0.1:8080

src/assembly/myassembly.xml

@@ -0,0 +1,28 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>myassembly</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>\${project.basedir}</directory>
+            <outputDirectory>conf-sample</outputDirectory>
+            <includes>
+                <include>setting.conf</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/libs</directory>
+            <outputDirectory>libs</outputDirectory>
+        </fileSet>
+    </fileSets>
+    <dependencySets>
+        <dependencySet>
+            <unpack>false</unpack>
+            <outputDirectory>libs</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+</assembly>

src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.huiju.welcome.hardware.Main
+

src/main/java/Camera.java → src/main/java/com/huiju/welcome/hardware/Camera.java

@@ -1,10 +1,11 @@
+package com.huiju.welcome.hardware;
+
 import com.sun.jna.NativeLong;
 import com.sun.jna.Pointer;
-import com.sun.jna.ptr.NativeLongByReference;
-import hik.HCNetSDK;
-import utils.Configer;
-import utils.Server;
-import utils.TinyLog;
+import com.huiju.welcome.hardware.hik.HCNetSDK;
+import com.huiju.welcome.hardware.utils.Configer;
+import com.huiju.welcome.hardware.utils.Server;
+import com.huiju.welcome.hardware.utils.TinyLog;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;

src/main/java/Main.java → src/main/java/com/huiju/welcome/hardware/Main.java

@@ -1,9 +1,19 @@
-import utils.Configer;
-import utils.TinyLog;
+package com.huiju.welcome.hardware;
+
+import com.alibaba.fastjson.JSON;
+import com.huiju.welcome.hardware.utils.Configer;
+import com.huiju.welcome.hardware.utils.TinyLog;
 
 public class Main {
     public static void main(String[] args) {
 
+        for(String arg : args) {
+            System.out.println("------------");
+            System.out.println(arg);
+        }
+
+        JSON.parse("{}");
+
         TinyLog.info("开始读取配置文件...");
 
         Configer conf = new Configer();
@@ -14,12 +24,17 @@ public class Main {
             return;
         }
 
+        TinyLog.info("开始加载 dll 文件...");
         Camera camera = Camera.getInstance();
         Monitor monitor = new Monitor();
 
         camera.setConfig(conf);
         monitor.listen(camera, conf.get("ip"));
+
+        TinyLog.info("开始监听", conf.get("ip"));
         monitor.start();
+
+        TinyLog.info("开始进行接口初始化...");
         camera.connect();
     }
 }

src/main/java/Monitor.java → src/main/java/com/huiju/welcome/hardware/Monitor.java

@@ -1,4 +1,6 @@
-import utils.Ping;
+package com.huiju.welcome.hardware;
+
+import com.huiju.welcome.hardware.utils.Ping;
 
 /**
  * 主要为了监控设备网络是否在线

src/main/java/hik/HCNetSDK.java → src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java

@@ -14,7 +14,7 @@
  * @author Xubinfeng
  */
 
-package hik;
+package com.huiju.welcome.hardware.hik;
 
 import com.sun.jna.Native;
 import com.sun.jna.NativeLong;
@@ -29,7 +29,7 @@ import com.sun.jna.win32.StdCallLibrary;
 import com.sun.jna.ptr.IntByReference;
 import com.sun.jna.ptr.NativeLongByReference;
 import com.sun.jna.ptr.ShortByReference;
-import utils.Configer;
+import com.huiju.welcome.hardware.utils.Configer;
 
 import java.util.Arrays;
 import java.util.List;

src/main/java/utils/Configer.java → src/main/java/com/huiju/welcome/hardware/utils/Configer.java

@@ -1,4 +1,4 @@
-package utils;
+package com.huiju.welcome.hardware.utils;
 
 import java.io.BufferedReader;
 import java.io.FileReader;

src/main/java/utils/Ping.java → src/main/java/com/huiju/welcome/hardware/utils/Ping.java

@@ -1,4 +1,4 @@
-package utils;
+package com.huiju.welcome.hardware.utils;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/utils/Rand.java → src/main/java/com/huiju/welcome/hardware/utils/Rand.java

@@ -1,4 +1,4 @@
-package utils;
+package com.huiju.welcome.hardware.utils;
 
 import java.util.Random;
 

src/main/java/utils/Server.java → src/main/java/com/huiju/welcome/hardware/utils/Server.java

@@ -1,4 +1,4 @@
-package utils;
+package com.huiju.welcome.hardware.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

src/main/java/utils/TinyLog.java → src/main/java/com/huiju/welcome/hardware/utils/TinyLog.java

@@ -1,4 +1,4 @@
-package utils;
+package com.huiju.welcome.hardware.utils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;