Your Name před 6 roky
rodič
revize
15d30b474e
37 změnil soubory, kde provedl 149 přidání a 104 odebrání
  1. 13
    13
      .idea/compiler.xml
  2. 93
    89
      .idea/workspace.xml
  3. 27
    0
      hklib/logs/SdkLog_1_W.log
  4. 1
    1
      src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java
  5. 12
    1
      src/main/java/com/huiju/welcome/hardware/service/HikService.java
  6. 3
    0
      src/main/resources/application.properties
  7. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$BYTE_ARRAY.class
  8. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$CAPTURE_MODE.class
  9. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$DISPLAY_MODE.class
  10. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FColGlobalDataCallBack.class
  11. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FColLocalDataCallBack.class
  12. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FDrawFun.class
  13. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FExceptionCallBack.class
  14. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FJpegdataCallBack.class
  15. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMSGCallBack.class
  16. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMSGCallBack_V31.class
  17. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMessCallBack.class
  18. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMessCallBack_EX.class
  19. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMessCallBack_NEW.class
  20. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMessageCallBack.class
  21. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FPlayDataCallBack.class
  22. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FPostMessageCallBack.class
  23. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FRealDataCallBack_V30.class
  24. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FRemoteConfigCallback.class
  25. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FRowDataCallBack.class
  26. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FSerialDataCallBack.class
  27. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FStdDataCallBack.class
  28. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FVoiceDataCallBack.class
  29. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FVoiceDataCallBack2.class
  30. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FVoiceDataCallBack_MR.class
  31. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FVoiceDataCallBack_MR_V30.class
  32. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FVoiceDataCallBack_V30.class
  33. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$REALSOUND_MODE.class
  34. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$SEND_MODE.class
  35. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$_SDK_NET_ENV.class
  36. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$fGPSDataCallback.class
  37. binární
      target/classes/com/huiju/welcome/hardware/hik/HCNetSDK.class

+ 13
- 13
.idea/compiler.xml Zobrazit soubor

@@ -1,14 +1,14 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="CompilerConfiguration">
4
-    <annotationProcessing>
5
-      <profile name="Maven default annotation processors profile" enabled="true">
6
-        <sourceOutputDir name="target/generated-sources/annotations" />
7
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8
-        <outputRelativeToContentRoot value="true" />
9
-        <module name="hardware" />
10
-      </profile>
11
-    </annotationProcessing>
12
-    <bytecodeTargetLevel target="8" />
13
-  </component>
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="CompilerConfiguration">
4
+    <annotationProcessing>
5
+      <profile name="Maven default annotation processors profile" enabled="true">
6
+        <sourceOutputDir name="target/generated-sources/annotations" />
7
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8
+        <outputRelativeToContentRoot value="true" />
9
+        <module name="hardware" />
10
+      </profile>
11
+    </annotationProcessing>
12
+    <bytecodeTargetLevel target="8" />
13
+  </component>
14 14
 </project>

+ 93
- 89
.idea/workspace.xml Zobrazit soubor

@@ -2,11 +2,16 @@
2 2
 <project version="4">
3 3
   <component name="BookmarkManager">
4 4
     <bookmark url="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" line="53" />
5
+    <bookmark url="file://$PROJECT_DIR$/../service-welcome3/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java" description="boolean workingTime = iSysParamService.isInWorking..." line="79" />
5 6
   </component>
6 7
   <component name="ChangeListManager">
7 8
     <list default="true" id="ad2fe330-f201-4a05-ab3f-71348d2d007b" name="Default" comment="">
9
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
8 10
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java" afterDir="false" />
9 12
       <change beforePath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" afterDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/target/classes/com/huiju/welcome/hardware/hik/HCNetSDK.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/huiju/welcome/hardware/hik/HCNetSDK.class" afterDir="false" />
10 15
     </list>
11 16
     <ignored path="$PROJECT_DIR$/out/" />
12 17
     <ignored path="$PROJECT_DIR$/target/" />
@@ -71,34 +76,36 @@
71 76
     <session id="-280456795">
72 77
       <usages-collector id="statistics.lifecycle.project">
73 78
         <counts>
79
+          <entry key="project.closed" value="2" />
74 80
           <entry key="project.open.time.2" value="1" />
75 81
           <entry key="project.open.time.24" value="1" />
76
-          <entry key="project.opened" value="2" />
82
+          <entry key="project.open.time.45" value="1" />
83
+          <entry key="project.opened" value="3" />
77 84
         </counts>
78 85
       </usages-collector>
79 86
       <usages-collector id="statistics.file.extensions.edit">
80 87
         <counts>
81
-          <entry key="java" value="548" />
82
-          <entry key="properties" value="91" />
88
+          <entry key="java" value="768" />
89
+          <entry key="properties" value="194" />
83 90
         </counts>
84 91
       </usages-collector>
85 92
       <usages-collector id="statistics.file.types.edit">
86 93
         <counts>
87
-          <entry key="JAVA" value="548" />
88
-          <entry key="Properties" value="91" />
94
+          <entry key="JAVA" value="768" />
95
+          <entry key="Properties" value="194" />
89 96
         </counts>
90 97
       </usages-collector>
91 98
       <usages-collector id="statistics.file.extensions.open">
92 99
         <counts>
93
-          <entry key="java" value="29" />
94
-          <entry key="properties" value="3" />
100
+          <entry key="java" value="36" />
101
+          <entry key="properties" value="4" />
95 102
           <entry key="xml" value="1" />
96 103
         </counts>
97 104
       </usages-collector>
98 105
       <usages-collector id="statistics.file.types.open">
99 106
         <counts>
100
-          <entry key="JAVA" value="29" />
101
-          <entry key="Properties" value="3" />
107
+          <entry key="JAVA" value="36" />
108
+          <entry key="Properties" value="4" />
102 109
           <entry key="XML" value="1" />
103 110
         </counts>
104 111
       </usages-collector>
@@ -109,8 +116,8 @@
109 116
       <file pinned="false" current-in-tab="false">
110 117
         <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
111 118
           <provider selected="true" editor-type-id="text-editor">
112
-            <state relative-caret-position="228">
113
-              <caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
119
+            <state relative-caret-position="322">
120
+              <caret line="33" selection-start-line="33" selection-end-line="33" />
114 121
             </state>
115 122
           </provider>
116 123
         </entry>
@@ -118,17 +125,8 @@
118 125
       <file pinned="false" current-in-tab="false">
119 126
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
120 127
           <provider selected="true" editor-type-id="text-editor">
121
-            <state relative-caret-position="139">
122
-              <caret line="84" selection-start-line="84" selection-end-line="84" />
123
-            </state>
124
-          </provider>
125
-        </entry>
126
-      </file>
127
-      <file pinned="false" current-in-tab="false">
128
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java">
129
-          <provider selected="true" editor-type-id="text-editor">
130
-            <state relative-caret-position="50">
131
-              <caret line="38" selection-start-line="38" selection-end-line="38" />
128
+            <state relative-caret-position="249">
129
+              <caret line="38" column="30" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="30" />
132 130
             </state>
133 131
           </provider>
134 132
         </entry>
@@ -136,8 +134,8 @@
136 134
       <file pinned="false" current-in-tab="true">
137 135
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java">
138 136
           <provider selected="true" editor-type-id="text-editor">
139
-            <state relative-caret-position="79">
140
-              <caret line="519" selection-start-line="519" selection-end-line="519" />
137
+            <state relative-caret-position="175">
138
+              <caret line="186" lean-forward="true" selection-start-line="186" selection-end-line="186" />
141 139
               <folding>
142 140
                 <element signature="imports" expanded="true" />
143 141
               </folding>
@@ -146,31 +144,31 @@
146 144
         </entry>
147 145
       </file>
148 146
       <file pinned="false" current-in-tab="false">
149
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java">
147
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
150 148
           <provider selected="true" editor-type-id="text-editor">
151
-            <state relative-caret-position="114">
152
-              <caret line="511" column="36" selection-start-line="511" selection-start-column="36" selection-end-line="511" selection-end-column="36" />
153
-              <folding>
154
-                <element signature="imports" expanded="true" />
155
-              </folding>
149
+            <state relative-caret-position="19">
150
+              <caret line="4204" column="47" selection-start-line="4204" selection-start-column="47" selection-end-line="4204" selection-end-column="47" />
156 151
             </state>
157 152
           </provider>
158 153
         </entry>
159 154
       </file>
160 155
       <file pinned="false" current-in-tab="false">
161
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Monitor.java">
156
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java">
162 157
           <provider selected="true" editor-type-id="text-editor">
163
-            <state relative-caret-position="815">
164
-              <caret line="47" column="22" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="22" />
158
+            <state relative-caret-position="209">
159
+              <caret line="44" column="36" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" />
165 160
             </state>
166 161
           </provider>
167 162
         </entry>
168 163
       </file>
169 164
       <file pinned="false" current-in-tab="false">
170
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java">
165
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java">
171 166
           <provider selected="true" editor-type-id="text-editor">
172
-            <state relative-caret-position="113">
173
-              <caret line="47" column="53" selection-start-line="47" selection-start-column="53" selection-end-line="47" selection-end-column="53" />
167
+            <state relative-caret-position="258">
168
+              <caret line="332" column="36" selection-start-line="332" selection-start-column="36" selection-end-line="332" selection-end-column="36" />
169
+              <folding>
170
+                <element signature="imports" expanded="true" />
171
+              </folding>
174 172
             </state>
175 173
           </provider>
176 174
         </entry>
@@ -178,8 +176,8 @@
178 176
       <file pinned="false" current-in-tab="false">
179 177
         <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java">
180 178
           <provider selected="true" editor-type-id="text-editor">
181
-            <state relative-caret-position="158">
182
-              <caret line="41" selection-start-line="41" selection-end-line="41" />
179
+            <state relative-caret-position="179">
180
+              <caret line="61" column="36" selection-start-line="61" selection-start-column="28" selection-end-line="61" selection-end-column="36" />
183 181
               <folding>
184 182
                 <element signature="imports" expanded="true" />
185 183
               </folding>
@@ -187,6 +185,15 @@
187 185
           </provider>
188 186
         </entry>
189 187
       </file>
188
+      <file pinned="false" current-in-tab="false">
189
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java">
190
+          <provider selected="true" editor-type-id="text-editor">
191
+            <state relative-caret-position="133">
192
+              <caret line="47" column="51" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="51" />
193
+            </state>
194
+          </provider>
195
+        </entry>
196
+      </file>
190 197
     </leaf>
191 198
   </component>
192 199
   <component name="FileTemplateManagerImpl">
@@ -283,7 +290,6 @@
283 290
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java" />
284 291
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/Client.java" />
285 292
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/Action.java" />
286
-        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java" />
287 293
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/NativeString.java" />
288 294
         <option value="$PROJECT_DIR$/pom.xml" />
289 295
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java" />
@@ -291,9 +297,10 @@
291 297
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java" />
292 298
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java" />
293 299
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java" />
294
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
295 300
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Monitor.java" />
296 301
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java" />
302
+        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java" />
303
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
297 304
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" />
298 305
       </list>
299 306
     </option>
@@ -333,9 +340,8 @@
333 340
       <select />
334 341
     </treeState>
335 342
   </component>
336
-  <component name="ProjectFrameBounds" extendedState="6">
337
-    <option name="x" value="1" />
338
-    <option name="width" value="1918" />
343
+  <component name="ProjectFrameBounds" extendedState="7">
344
+    <option name="width" value="1919" />
339 345
     <option name="height" value="1030" />
340 346
   </component>
341 347
   <component name="ProjectLevelVcsManager">
@@ -346,8 +352,6 @@
346 352
       <foldersAlwaysOnTop value="true" />
347 353
     </navigator>
348 354
     <panes>
349
-      <pane id="Scope" />
350
-      <pane id="PackagesPane" />
351 355
       <pane id="AndroidView" />
352 356
       <pane id="ProjectPane">
353 357
         <subPane>
@@ -461,6 +465,8 @@
461 465
           <select />
462 466
         </subPane>
463 467
       </pane>
468
+      <pane id="PackagesPane" />
469
+      <pane id="Scope" />
464 470
     </panes>
465 471
   </component>
466 472
   <component name="PropertiesComponent">
@@ -471,7 +477,7 @@
471 477
     <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://E:/JavaProjects/welcome3.0/hardware/src/main/java/com/huiju/welcome/hardware/service/Monitor.java" />
472 478
     <property name="WebServerToolWindowFactoryState" value="false" />
473 479
     <property name="aspect.path.notification.shown" value="true" />
474
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1562591311143" />
480
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1562592768867" />
475 481
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
476 482
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../hardware - Copy" />
477 483
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
@@ -610,17 +616,18 @@
610 616
       <workItem from="1561692194101" duration="15054000" />
611 617
       <workItem from="1561966303564" duration="599000" />
612 618
       <workItem from="1561970448786" duration="22120000" />
613
-      <workItem from="1562216694804" duration="28301000" />
619
+      <workItem from="1562216694804" duration="29021000" />
620
+      <workItem from="1562634596989" duration="10430000" />
614 621
     </task>
615 622
     <servers />
616 623
   </component>
617 624
   <component name="TimeTrackingManager">
618
-    <option name="totallyTimeSpent" value="313245000" />
625
+    <option name="totallyTimeSpent" value="324395000" />
619 626
   </component>
620 627
   <component name="ToolWindowManager">
621
-    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
628
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
622 629
     <layout>
623
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49918962" visible="true" weight="0.24061662" />
630
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49918962" visible="true" weight="0.24396783" />
624 631
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
625 632
       <window_info id="Image Layers" order="2" />
626 633
       <window_info id="UI Designer" order="3" />
@@ -630,8 +637,8 @@
630 637
       <window_info id="Designer" order="7" />
631 638
       <window_info anchor="bottom" id="Message" order="0" />
632 639
       <window_info anchor="bottom" id="Find" order="1" weight="0.3295325" />
633
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.7140762" />
634
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.499002" weight="0.53519064" />
640
+      <window_info anchor="bottom" id="Run" order="2" weight="0.41348973" />
641
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.499002" weight="0.3181818" />
635 642
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
636 643
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
637 644
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32920536" />
@@ -776,9 +783,6 @@
776 783
       <provider selected="true" editor-type-id="text-editor">
777 784
         <state relative-caret-position="1083">
778 785
           <caret line="65" selection-start-line="65" selection-end-line="65" />
779
-          <folding>
780
-            <element signature="imports" expanded="true" />
781
-          </folding>
782 786
         </state>
783 787
       </provider>
784 788
     </entry>
@@ -873,79 +877,79 @@
873 877
         </state>
874 878
       </provider>
875 879
     </entry>
876
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java">
880
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java">
877 881
       <provider selected="true" editor-type-id="text-editor">
878
-        <state relative-caret-position="158">
879
-          <caret line="41" selection-start-line="41" selection-end-line="41" />
880
-          <folding>
881
-            <element signature="imports" expanded="true" />
882
-          </folding>
882
+        <state relative-caret-position="1053">
883
+          <caret line="67" selection-start-line="67" selection-end-line="67" />
883 884
         </state>
884 885
       </provider>
885 886
     </entry>
886
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java">
887
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Monitor.java">
887 888
       <provider selected="true" editor-type-id="text-editor">
888
-        <state relative-caret-position="1053">
889
-          <caret line="67" selection-start-line="67" selection-end-line="67" />
889
+        <state relative-caret-position="817">
890
+          <caret line="47" column="22" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="22" />
890 891
         </state>
891 892
       </provider>
892 893
     </entry>
893
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
894
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java">
894 895
       <provider selected="true" editor-type-id="text-editor">
895
-        <state relative-caret-position="228">
896
-          <caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
896
+        <state relative-caret-position="258">
897
+          <caret line="332" column="36" selection-start-line="332" selection-start-column="36" selection-end-line="332" selection-end-column="36" />
898
+          <folding>
899
+            <element signature="imports" expanded="true" />
900
+          </folding>
897 901
         </state>
898 902
       </provider>
899 903
     </entry>
900
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
904
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java">
901 905
       <provider selected="true" editor-type-id="text-editor">
902
-        <state relative-caret-position="139">
903
-          <caret line="84" selection-start-line="84" selection-end-line="84" />
906
+        <state relative-caret-position="209">
907
+          <caret line="44" column="36" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" />
904 908
         </state>
905 909
       </provider>
906 910
     </entry>
907
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Monitor.java">
911
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java">
908 912
       <provider selected="true" editor-type-id="text-editor">
909
-        <state relative-caret-position="815">
910
-          <caret line="47" column="22" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="22" />
913
+        <state relative-caret-position="179">
914
+          <caret line="61" column="36" selection-start-line="61" selection-start-column="28" selection-end-line="61" selection-end-column="36" />
915
+          <folding>
916
+            <element signature="imports" expanded="true" />
917
+          </folding>
911 918
         </state>
912 919
       </provider>
913 920
     </entry>
914 921
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
915 922
       <provider selected="true" editor-type-id="text-editor">
916
-        <state relative-caret-position="-154">
917
-          <caret line="3007" column="24" selection-start-line="3007" selection-start-column="24" selection-end-line="3007" selection-end-column="24" />
923
+        <state relative-caret-position="19">
924
+          <caret line="4204" column="47" selection-start-line="4204" selection-start-column="47" selection-end-line="4204" selection-end-column="47" />
918 925
         </state>
919 926
       </provider>
920 927
     </entry>
921
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java">
928
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
922 929
       <provider selected="true" editor-type-id="text-editor">
923
-        <state relative-caret-position="113">
924
-          <caret line="47" column="53" selection-start-line="47" selection-start-column="53" selection-end-line="47" selection-end-column="53" />
930
+        <state relative-caret-position="322">
931
+          <caret line="33" selection-start-line="33" selection-end-line="33" />
925 932
         </state>
926 933
       </provider>
927 934
     </entry>
928
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java">
935
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java">
929 936
       <provider selected="true" editor-type-id="text-editor">
930
-        <state relative-caret-position="114">
931
-          <caret line="511" column="36" selection-start-line="511" selection-start-column="36" selection-end-line="511" selection-end-column="36" />
932
-          <folding>
933
-            <element signature="imports" expanded="true" />
934
-          </folding>
937
+        <state relative-caret-position="133">
938
+          <caret line="47" column="51" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="51" />
935 939
         </state>
936 940
       </provider>
937 941
     </entry>
938
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java">
942
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
939 943
       <provider selected="true" editor-type-id="text-editor">
940
-        <state relative-caret-position="50">
941
-          <caret line="38" selection-start-line="38" selection-end-line="38" />
944
+        <state relative-caret-position="249">
945
+          <caret line="38" column="30" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="30" />
942 946
         </state>
943 947
       </provider>
944 948
     </entry>
945 949
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java">
946 950
       <provider selected="true" editor-type-id="text-editor">
947
-        <state relative-caret-position="79">
948
-          <caret line="519" selection-start-line="519" selection-end-line="519" />
951
+        <state relative-caret-position="175">
952
+          <caret line="186" lean-forward="true" selection-start-line="186" selection-end-line="186" />
949 953
           <folding>
950 954
             <element signature="imports" expanded="true" />
951 955
           </folding>

+ 27
- 0
hklib/logs/SdkLog_1_W.log Zobrazit soubor

@@ -0,0 +1,27 @@
1
+[2019-07-10 11:56:24.099][INF] The COM:Core ver is 5.3.6.30, 2018_08_16. Async:1.
2
+[2019-07-10 11:56:24.099][DBG] CCoreGlobalCtrl::GetHCNetUtilsAPI, new HCNetUtilsAPI SUCC
3
+[2019-07-10 11:56:24.099][DBG] CCoreGlobalCtrl::GetHCNetUtilsAPI, Init, SUCC, m_pHCNetUtilsAPI[19011072]
4
+[2019-07-10 11:56:24.099][DBG] CCoreGlobalCtrl::GetHCNetUtilsAPI, m_pHCNetUtilsAPI[19011072]
5
+[2019-07-10 11:56:24.099][INF] This hcnetsdk ver is 5.3.6.30 Ver 2018_08_16.
6
+[2019-07-10 11:56:24.195][INF] login dev 192.168.1.215:8000.
7
+[2019-07-10 11:56:24.199][INF] Private connect 192.168.1.215:8000 sock=2568 this=0x1284884 cmd=0x10000 port=63084
8
+[2019-07-10 11:56:24.199][INF] LogonDev1 in[192.168.1.215:8000]
9
+[2019-07-10 11:56:24.289][INF] Private connect 192.168.1.215:8000 sock=2712 this=0x1284e68 cmd=0x10100 port=63085
10
+[2019-07-10 11:56:24.294][INF] StopSendThread threadHandle:0
11
+[2019-07-10 11:56:24.297][INF] Private connect 192.168.1.215:8000 sock=2712 this=0x1284884 cmd=0x10000 port=63086
12
+[2019-07-10 11:56:24.297][INF] LogonDev1 in[192.168.1.215:8000]
13
+[2019-07-10 11:56:24.333][DBG] load[E:\CODE\hdware-welcome3\hklib\HCNetSDKCom/HCAlarm.dll] succ
14
+[2019-07-10 11:56:24.335][INF] AbilityAnalyze---Init-- start
15
+[2019-07-10 11:56:24.368][INF] The COM:HCAlarm ver is 5.3.6.30, 2018_08_16.
16
+[2019-07-10 11:56:24.371][INF] Private connect 192.168.1.215:8000 sock=2596 this=0x1284e68 cmd=0x111020 port=63087
17
+[2019-07-10 11:56:24.374][INF] [SendCommandWithRecv] linkId=1284e68, cmd=0x111020
18
+[2019-07-10 11:56:24.374][DBG] Alarm[0] IP[192.168.1.215] CArmingSession::Start SUCC
19
+[2019-07-10 11:56:34.404][DBG] Alarm chan [0] recv timeout[2]!
20
+[2019-07-10 12:02:00.268][INF] Alarm[0] IP[192.168.1.215] data_len[80] alarm_len[80] status[175]
21
+[2019-07-10 12:12:01.396][INF] Alarm[0] IP[192.168.1.215] data_len[80] alarm_len[80] status[175]
22
+[2019-07-10 12:14:20.630][INF] Alarm[0] IP[192.168.1.215] data_len[156] alarm_len[156] status[176]
23
+[2019-07-10 12:14:21.318][INF] Alarm[0] IP[192.168.1.215] data_len[991715] alarm_len[991715] status[170]
24
+[2019-07-10 12:14:25.896][INF] Alarm[0] IP[192.168.1.215] data_len[904531] alarm_len[904531] status[170]
25
+[2019-07-10 12:14:27.312][INF] Alarm[0] IP[192.168.1.215] data_len[156] alarm_len[156] status[176]
26
+[2019-07-10 12:15:04.979][INF] Alarm[0] IP[192.168.1.215] data_len[956419] alarm_len[956419] status[170]
27
+[2019-07-10 12:15:06.248][INF] Alarm[0] IP[192.168.1.215] data_len[156] alarm_len[156] status[176]

+ 1
- 1
src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java Zobrazit soubor

@@ -4202,7 +4202,7 @@ EMAIL参数结构
4202 4202
     boolean  NET_DVR_SetConfigFile_EX(NativeLong lUserID, String sInBuffer, int dwInSize);
4203 4203
 
4204 4204
     //启用日志文件写入接口
4205
-    boolean  NET_DVR_SetLogToFile(boolean bLogEnable, String strLogDir, boolean bAutoDel);
4205
+    boolean  NET_DVR_SetLogToFile(int nLogLevel, String strLogDir, boolean bAutoDel);
4206 4206
     boolean  NET_DVR_GetSDKState(NET_DVR_SDKSTATE pSDKState);
4207 4207
     boolean  NET_DVR_GetSDKAbility(NET_DVR_SDKABL pSDKAbl);
4208 4208
     boolean  NET_DVR_GetPTZProtocol(NativeLong lUserID, NET_DVR_PTZCFG pPtzcfg);

+ 12
- 1
src/main/java/com/huiju/welcome/hardware/service/HikService.java Zobrazit soubor

@@ -86,6 +86,17 @@ public class HikService {
86 86
             return false;
87 87
         } else {
88 88
             log.info("设备初始化成功");
89
+
90
+            String logpath =  Configer.pick("hik.log");
91
+            if (null != logpath && !"".equals(logpath)) {
92
+                String logfile = Configer.pick("hik.dlldir") + logpath + "\\";
93
+                boolean success = hcNetSDK.NET_DVR_SetLogToFile(3, logfile, false);
94
+                if (!success) {
95
+                    log.error("启动硬件写日志服务失败, {}", getHcNetError());
96
+                } else {
97
+                    log.info("启动硬件写日志服务成功, 日志地址: {}", logfile);
98
+                }
99
+            }
89 100
         }
90 101
         return true;
91 102
     }
@@ -172,7 +183,7 @@ public class HikService {
172 183
 
173 184
     // 上传人脸图片到设备
174 185
     public void uploadFace(String personId, byte[] avatar) throws Exception {
175
-        initDevice();
186
+//        initDevice();
176 187
 
177 188
         HCNetSDK.NET_DVR_FACELIB_COND facelibCond = new HCNetSDK.NET_DVR_FACELIB_COND();
178 189
         facelibCond.dwSize = facelibCond.size();

+ 3
- 0
src/main/resources/application.properties Zobrazit soubor

@@ -28,3 +28,6 @@ api.websocket=wss://welcome.ycjcjy.com/ws
28 28
 
29 29
 # 海康相关
30 30
 hik.dlldir=E:\\CODE\\hdware-welcome3\\hklib
31
+# 是否记录日志, 不填则代表不写日志
32
+# 日志路径会拼在 hik.dlldir 后面。需要先手动创建好目录
33
+hik.log = \\logs

binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$BYTE_ARRAY.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$CAPTURE_MODE.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$DISPLAY_MODE.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FColGlobalDataCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FColLocalDataCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FDrawFun.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FExceptionCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FJpegdataCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMSGCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMSGCallBack_V31.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMessCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMessCallBack_EX.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMessCallBack_NEW.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FMessageCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FPlayDataCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FPostMessageCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FRealDataCallBack_V30.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FRemoteConfigCallback.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FRowDataCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FSerialDataCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FStdDataCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FVoiceDataCallBack.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FVoiceDataCallBack2.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FVoiceDataCallBack_MR.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FVoiceDataCallBack_MR_V30.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$FVoiceDataCallBack_V30.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$REALSOUND_MODE.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$SEND_MODE.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$_SDK_NET_ENV.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK$fGPSDataCallback.class Zobrazit soubor


binární
target/classes/com/huiju/welcome/hardware/hik/HCNetSDK.class Zobrazit soubor