张延森 6 年前
父节点
当前提交
27ad54e3fa

+ 209
- 211
.idea/workspace.xml 查看文件

1
 <?xml version="1.0" encoding="UTF-8"?>
1
 <?xml version="1.0" encoding="UTF-8"?>
2
 <project version="4">
2
 <project version="4">
3
+  <component name="BookmarkManager">
4
+    <bookmark url="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" line="53" />
5
+  </component>
3
   <component name="ChangeListManager">
6
   <component name="ChangeListManager">
4
     <list default="true" id="ad2fe330-f201-4a05-ab3f-71348d2d007b" name="Default" comment="">
7
     <list default="true" id="ad2fe330-f201-4a05-ab3f-71348d2d007b" name="Default" comment="">
5
       <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
8
       <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
7
     <ignored path="$PROJECT_DIR$/out/" />
10
     <ignored path="$PROJECT_DIR$/out/" />
8
     <ignored path="$PROJECT_DIR$/target/" />
11
     <ignored path="$PROJECT_DIR$/target/" />
9
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10
-    <option name="TRACKING_ENABLED" value="true" />
11
     <option name="SHOW_DIALOG" value="false" />
13
     <option name="SHOW_DIALOG" value="false" />
12
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
14
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
13
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
15
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
30
     <expand />
32
     <expand />
31
     <select />
33
     <select />
32
   </component>
34
   </component>
35
+  <component name="FUSProjectUsageTrigger">
36
+    <session id="87954253">
37
+      <usages-collector id="statistics.lifecycle.project">
38
+        <counts>
39
+          <entry key="project.open.time.2" value="1" />
40
+          <entry key="project.opened" value="1" />
41
+        </counts>
42
+      </usages-collector>
43
+      <usages-collector id="statistics.file.extensions.open">
44
+        <counts>
45
+          <entry key="class" value="2" />
46
+          <entry key="java" value="16" />
47
+          <entry key="properties" value="2" />
48
+        </counts>
49
+      </usages-collector>
50
+      <usages-collector id="statistics.file.types.open">
51
+        <counts>
52
+          <entry key="CLASS" value="2" />
53
+          <entry key="JAVA" value="16" />
54
+          <entry key="Properties" value="2" />
55
+        </counts>
56
+      </usages-collector>
57
+      <usages-collector id="statistics.file.extensions.edit">
58
+        <counts>
59
+          <entry key="java" value="127" />
60
+          <entry key="properties" value="2" />
61
+        </counts>
62
+      </usages-collector>
63
+      <usages-collector id="statistics.file.types.edit">
64
+        <counts>
65
+          <entry key="JAVA" value="127" />
66
+          <entry key="Properties" value="2" />
67
+        </counts>
68
+      </usages-collector>
69
+    </session>
70
+  </component>
33
   <component name="FileEditorManager">
71
   <component name="FileEditorManager">
34
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
72
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
35
       <file leaf-file-name="InitService.java" pinned="false" current-in-tab="false">
73
       <file leaf-file-name="InitService.java" pinned="false" current-in-tab="false">
98
   </component>
136
   </component>
99
   <component name="FindInProjectRecents">
137
   <component name="FindInProjectRecents">
100
     <findStrings>
138
     <findStrings>
101
-      <find>hasHKError</find>
102
-      <find>../lib/HCNetSDK</find>
103
-      <find>/HCNetSDK</find>
104
-      <find>Pointer</find>
105
-      <find>fastjson</find>
106
-      <find>NET_DVR_FACELIB_COND</find>
107
-      <find>NET_DVR_UploadFile_V40</find>
108
-      <find>IMPORT_DATA_TO_FACELIB</find>
109
-      <find>NET_DVR_SetupAlarmChan_V41</find>
110
       <find>hd.server</find>
139
       <find>hd.server</find>
111
       <find>deviceAPI</find>
140
       <find>deviceAPI</find>
112
       <find>body()</find>
141
       <find>body()</find>
128
       <find>NET_DVR_PLATE_INFO</find>
157
       <find>NET_DVR_PLATE_INFO</find>
129
       <find>parseObject</find>
158
       <find>parseObject</find>
130
       <find>VLR_VEHICLE_CLASS</find>
159
       <find>VLR_VEHICLE_CLASS</find>
160
+      <find>fmsgCallBack</find>
161
+      <find>init</find>
162
+      <find>initde</find>
163
+      <find>log.info</find>
164
+      <find>设备SDK错误</find>
165
+      <find>buildHeaders</find>
166
+      <find>buildFileBytes</find>
167
+      <find>getHcNetError</find>
168
+      <find>未知文件</find>
131
     </findStrings>
169
     </findStrings>
132
     <replaceStrings>
170
     <replaceStrings>
133
       <replace>log.info</replace>
171
       <replace>log.info</replace>
180
         <option value="$PROJECT_DIR$/pom.xml" />
218
         <option value="$PROJECT_DIR$/pom.xml" />
181
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/WebSocketConfig.java" />
219
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/WebSocketConfig.java" />
182
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSocketServer.java" />
220
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSocketServer.java" />
183
-        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java" />
184
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java" />
221
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/controller/CommController.java" />
185
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/ISubcriber.java" />
222
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/ISubcriber.java" />
186
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java" />
223
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java" />
188
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/Action.java" />
225
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/Action.java" />
189
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Monitor.java" />
226
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Monitor.java" />
190
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java" />
227
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java" />
191
-        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java" />
192
-        <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/HikService.java" />
193
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java" />
228
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/MainService.java" />
194
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java" />
229
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java" />
195
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java" />
230
         <option value="$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java" />
206
   <component name="MavenImportPreferences">
241
   <component name="MavenImportPreferences">
207
     <option name="generalSettings">
242
     <option name="generalSettings">
208
       <MavenGeneralSettings>
243
       <MavenGeneralSettings>
209
-        <option name="mavenHome" value="D:/Application/apache-maven-3.6.0" />
210
-        <option name="userSettingsFile" value="D:\Application\apache-maven-3.6.0\conf\settings.xml" />
244
+        <option name="mavenHome" value="E:/apache-maven-3.5.4" />
245
+        <option name="userSettingsFile" value="E:\apache-maven-3.5.4\conf\settings.xml" />
211
       </MavenGeneralSettings>
246
       </MavenGeneralSettings>
212
     </option>
247
     </option>
213
     <option name="importingSettings">
248
     <option name="importingSettings">
237
       <select />
272
       <select />
238
     </treeState>
273
     </treeState>
239
   </component>
274
   </component>
240
-  <component name="NodePackageJsonFileManager">
241
-    <packageJsonPaths />
242
-  </component>
243
   <component name="ProjectFrameBounds" extendedState="6">
275
   <component name="ProjectFrameBounds" extendedState="6">
244
-    <option name="x" value="-8" />
245
-    <option name="y" value="-8" />
246
-    <option name="width" value="1296" />
247
-    <option name="height" value="735" />
276
+    <option name="x" value="-10" />
277
+    <option name="width" value="2585" />
278
+    <option name="height" value="1465" />
248
   </component>
279
   </component>
249
   <component name="ProjectLevelVcsManager">
280
   <component name="ProjectLevelVcsManager">
250
     <ConfirmationsSetting value="1" id="Add" />
281
     <ConfirmationsSetting value="1" id="Add" />
261
           <expand>
292
           <expand>
262
             <path>
293
             <path>
263
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
294
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
264
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
295
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
265
             </path>
296
             </path>
266
             <path>
297
             <path>
267
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
298
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
268
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
269
-              <item name="bak" type="462c0819:PsiDirectoryNode" />
299
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
300
+              <item name="src" type="462c0819:PsiDirectoryNode" />
270
             </path>
301
             </path>
271
             <path>
302
             <path>
272
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
303
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
273
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
274
-              <item name="bak" type="462c0819:PsiDirectoryNode" />
304
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
275
               <item name="src" type="462c0819:PsiDirectoryNode" />
305
               <item name="src" type="462c0819:PsiDirectoryNode" />
306
+              <item name="main" type="462c0819:PsiDirectoryNode" />
276
             </path>
307
             </path>
277
             <path>
308
             <path>
278
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
309
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
279
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
310
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
280
               <item name="src" type="462c0819:PsiDirectoryNode" />
311
               <item name="src" type="462c0819:PsiDirectoryNode" />
312
+              <item name="main" type="462c0819:PsiDirectoryNode" />
313
+              <item name="java" type="462c0819:PsiDirectoryNode" />
281
             </path>
314
             </path>
282
             <path>
315
             <path>
283
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
316
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
284
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
317
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
285
               <item name="src" type="462c0819:PsiDirectoryNode" />
318
               <item name="src" type="462c0819:PsiDirectoryNode" />
286
               <item name="main" type="462c0819:PsiDirectoryNode" />
319
               <item name="main" type="462c0819:PsiDirectoryNode" />
320
+              <item name="java" type="462c0819:PsiDirectoryNode" />
321
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
287
             </path>
322
             </path>
288
             <path>
323
             <path>
289
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
324
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
290
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
325
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
291
               <item name="src" type="462c0819:PsiDirectoryNode" />
326
               <item name="src" type="462c0819:PsiDirectoryNode" />
292
               <item name="main" type="462c0819:PsiDirectoryNode" />
327
               <item name="main" type="462c0819:PsiDirectoryNode" />
293
               <item name="java" type="462c0819:PsiDirectoryNode" />
328
               <item name="java" type="462c0819:PsiDirectoryNode" />
329
+              <item name="hardware" type="462c0819:PsiDirectoryNode" />
330
+              <item name="config" type="462c0819:PsiDirectoryNode" />
294
             </path>
331
             </path>
295
             <path>
332
             <path>
296
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
333
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
297
-              <item name="hardware" type="462c0819:PsiDirectoryNode" />
334
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
298
               <item name="src" type="462c0819:PsiDirectoryNode" />
335
               <item name="src" type="462c0819:PsiDirectoryNode" />
299
               <item name="main" type="462c0819:PsiDirectoryNode" />
336
               <item name="main" type="462c0819:PsiDirectoryNode" />
300
               <item name="java" type="462c0819:PsiDirectoryNode" />
337
               <item name="java" type="462c0819:PsiDirectoryNode" />
301
               <item name="hardware" type="462c0819:PsiDirectoryNode" />
338
               <item name="hardware" type="462c0819:PsiDirectoryNode" />
339
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
302
             </path>
340
             </path>
303
             <path>
341
             <path>
304
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
342
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
343
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
344
+              <item name="src" type="462c0819:PsiDirectoryNode" />
345
+              <item name="main" type="462c0819:PsiDirectoryNode" />
346
+              <item name="java" type="462c0819:PsiDirectoryNode" />
305
               <item name="hardware" type="462c0819:PsiDirectoryNode" />
347
               <item name="hardware" type="462c0819:PsiDirectoryNode" />
348
+              <item name="libs" type="462c0819:PsiDirectoryNode" />
349
+            </path>
350
+            <path>
351
+              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
352
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
306
               <item name="src" type="462c0819:PsiDirectoryNode" />
353
               <item name="src" type="462c0819:PsiDirectoryNode" />
307
               <item name="main" type="462c0819:PsiDirectoryNode" />
354
               <item name="main" type="462c0819:PsiDirectoryNode" />
308
               <item name="java" type="462c0819:PsiDirectoryNode" />
355
               <item name="java" type="462c0819:PsiDirectoryNode" />
345
             </path>
392
             </path>
346
             <path>
393
             <path>
347
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
394
               <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
395
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
396
+              <item name="src" type="462c0819:PsiDirectoryNode" />
397
+              <item name="main" type="462c0819:PsiDirectoryNode" />
398
+              <item name="java" type="462c0819:PsiDirectoryNode" />
348
               <item name="hardware" type="462c0819:PsiDirectoryNode" />
399
               <item name="hardware" type="462c0819:PsiDirectoryNode" />
400
+              <item name="websocket" type="462c0819:PsiDirectoryNode" />
401
+            </path>
402
+            <path>
403
+              <item name="welcome-hardware" type="b2602c69:ProjectViewProjectNode" />
404
+              <item name="hdware-welcome3" type="462c0819:PsiDirectoryNode" />
349
               <item name="src" type="462c0819:PsiDirectoryNode" />
405
               <item name="src" type="462c0819:PsiDirectoryNode" />
350
               <item name="main" type="462c0819:PsiDirectoryNode" />
406
               <item name="main" type="462c0819:PsiDirectoryNode" />
351
               <item name="resources" type="462c0819:PsiDirectoryNode" />
407
               <item name="resources" type="462c0819:PsiDirectoryNode" />
352
-              <item name="libs" type="462c0819:PsiDirectoryNode" />
353
             </path>
408
             </path>
354
           </expand>
409
           </expand>
355
           <select />
410
           <select />
366
     <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://E:/JavaProjects/welcome3.0/hardware/src/main/java/com/huiju/welcome/hardware/service/Monitor.java" />
421
     <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://E:/JavaProjects/welcome3.0/hardware/src/main/java/com/huiju/welcome/hardware/service/Monitor.java" />
367
     <property name="WebServerToolWindowFactoryState" value="false" />
422
     <property name="WebServerToolWindowFactoryState" value="false" />
368
     <property name="aspect.path.notification.shown" value="true" />
423
     <property name="aspect.path.notification.shown" value="true" />
369
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
424
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1561449835132" />
425
+    <property name="go.gopath.indexing.explicitly.defined" value="true" />
426
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../service-welcome3" />
370
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
427
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
371
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
428
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
372
     <property name="project.structure.last.edited" value="Artifacts" />
429
     <property name="project.structure.last.edited" value="Artifacts" />
373
     <property name="project.structure.proportion" value="0.15" />
430
     <property name="project.structure.proportion" value="0.15" />
374
     <property name="project.structure.side.proportion" value="0.34514287" />
431
     <property name="project.structure.side.proportion" value="0.34514287" />
375
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
432
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
433
+    <property name="show.migrate.to.gradle.popup" value="false" />
376
   </component>
434
   </component>
377
   <component name="RecentsManager">
435
   <component name="RecentsManager">
378
     <key name="CopyFile.RECENT_KEYS">
436
     <key name="CopyFile.RECENT_KEYS">
415
           <option name="ENABLED" value="true" />
473
           <option name="ENABLED" value="true" />
416
         </pattern>
474
         </pattern>
417
       </extension>
475
       </extension>
476
+      <method v="2">
477
+        <option name="Make" enabled="true" />
478
+      </method>
418
     </configuration>
479
     </configuration>
419
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
480
     <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
420
       <option name="MAIN_CLASS_NAME" value="Main" />
481
       <option name="MAIN_CLASS_NAME" value="Main" />
421
       <module name="hardware" />
482
       <module name="hardware" />
422
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
483
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
484
+      <method v="2">
485
+        <option name="Make" enabled="true" />
486
+      </method>
423
     </configuration>
487
     </configuration>
424
     <configuration default="true" type="Application" factoryName="Application">
488
     <configuration default="true" type="Application" factoryName="Application">
425
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
489
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
490
+      <method v="2">
491
+        <option name="Make" enabled="true" />
492
+      </method>
426
     </configuration>
493
     </configuration>
427
     <configuration default="true" type="JUnit" factoryName="JUnit">
494
     <configuration default="true" type="JUnit" factoryName="JUnit">
428
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
429
-      <option name="ALTERNATIVE_JRE_PATH" />
430
-      <option name="PACKAGE_NAME" />
431
-      <option name="MAIN_CLASS_NAME" />
432
-      <option name="METHOD_NAME" />
433
-      <option name="TEST_OBJECT" value="class" />
434
-      <option name="VM_PARAMETERS" value="-ea" />
435
-      <option name="PARAMETERS" />
436
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
495
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
437
-      <option name="PASS_PARENT_ENVS" value="true" />
438
-      <option name="TEST_SEARCH_SCOPE">
439
-        <value defaultName="singleModule" />
440
-      </option>
441
-      <patterns />
496
+      <method v="2">
497
+        <option name="Make" enabled="true" />
498
+      </method>
442
     </configuration>
499
     </configuration>
443
     <configuration name="HardwareApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
500
     <configuration name="HardwareApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
444
       <module name="hardware" />
501
       <module name="hardware" />
445
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.huiju.welcome.hardware.HardwareApplication" />
502
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.huiju.welcome.hardware.HardwareApplication" />
503
+      <method v="2">
504
+        <option name="Make" enabled="true" />
505
+      </method>
446
     </configuration>
506
     </configuration>
447
     <configuration default="true" type="TestNG" factoryName="TestNG">
507
     <configuration default="true" type="TestNG" factoryName="TestNG">
448
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
449
-      <option name="ALTERNATIVE_JRE_PATH" />
450
-      <option name="SUITE_NAME" />
451
-      <option name="PACKAGE_NAME" />
452
-      <option name="MAIN_CLASS_NAME" />
453
-      <option name="METHOD_NAME" />
454
-      <option name="GROUP_NAME" />
455
-      <option name="TEST_OBJECT" value="CLASS" />
456
-      <option name="VM_PARAMETERS" value="-ea" />
457
-      <option name="PARAMETERS" />
458
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
508
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
459
-      <option name="OUTPUT_DIRECTORY" />
460
-      <option name="PASS_PARENT_ENVS" value="true" />
461
-      <option name="TEST_SEARCH_SCOPE">
462
-        <value defaultName="singleModule" />
463
-      </option>
464
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
465
-      <option name="PROPERTIES_FILE" />
466
       <properties />
509
       <properties />
467
       <listeners />
510
       <listeners />
511
+      <method v="2">
512
+        <option name="Make" enabled="true" />
513
+      </method>
468
     </configuration>
514
     </configuration>
469
     <list>
515
     <list>
470
       <item itemvalue="Spring Boot.HardwareApplication" />
516
       <item itemvalue="Spring Boot.HardwareApplication" />
515
     <option name="totallyTimeSpent" value="225557000" />
561
     <option name="totallyTimeSpent" value="225557000" />
516
   </component>
562
   </component>
517
   <component name="ToolWindowManager">
563
   <component name="ToolWindowManager">
518
-    <frame x="-8" y="-8" width="1936" height="1015" extended-state="6" />
519
-    <editor active="true" />
564
+    <frame x="-7" y="-7" width="2062" height="1126" extended-state="6" />
520
     <layout>
565
     <layout>
521
-      <window_info anchor="right" id="Palette" order="3" />
522
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
523
-      <window_info anchor="right" id="Maven Projects" order="3" weight="0.04424307" />
524
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
525
-      <window_info id="Capture Tool" order="2" />
526
-      <window_info id="Designer" order="2" />
527
-      <window_info anchor="right" id="Database" order="3" weight="0.3291506" />
566
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49918962" visible="true" weight="0.23353294" />
528
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
567
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
529
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
530
-      <window_info id="UI Designer" order="2" />
531
-      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.36374003" />
532
-      <window_info anchor="bottom" id="TODO" order="6" />
533
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.3295325" />
534
-      <window_info anchor="right" id="Palette&#9;" order="3" />
535
-      <window_info id="Image Layers" order="2" />
536
-      <window_info anchor="bottom" id="Java Enterprise" order="8" />
537
-      <window_info anchor="right" id="Capture Analysis" order="3" />
538
-      <window_info anchor="bottom" id="Version Control" order="7" />
568
+      <window_info id="Designer" order="2" />
569
+      <window_info id="Image Layers" order="3" />
570
+      <window_info id="UI Designer" order="4" />
571
+      <window_info id="Favorites" order="5" side_tool="true" />
572
+      <window_info id="Capture Tool" order="6" />
573
+      <window_info id="Web" order="7" sideWeight="0.5008104" side_tool="true" weight="0.23353294" />
574
+      <window_info anchor="bottom" id="Flutter Performance" side_tool="true" />
575
+      <window_info anchor="bottom" id="Message" order="0" />
576
+      <window_info anchor="bottom" id="Find" order="1" weight="0.3295325" />
539
       <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
577
       <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
540
-      <window_info anchor="bottom" id="Spring" order="8" />
541
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22348917" />
542
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.11727079" />
543
-      <window_info anchor="right" id="Bean Validation" order="4" />
544
-      <window_info id="Web" order="3" side_tool="true" />
545
-      <window_info anchor="right" id="Theme Preview" order="3" />
546
-      <window_info id="Favorites" order="2" side_tool="true" />
578
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.499002" visible="true" weight="0.32920536" />
579
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
547
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
580
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
581
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.32920536" />
582
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22291021" />
583
+      <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.500998" side_tool="true" weight="0.35500515" />
584
+      <window_info anchor="bottom" id="Messages" order="9" sideWeight="0.499501" weight="0.3364293" />
585
+      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
586
+      <window_info anchor="bottom" id="Version Control" order="11" weight="0.32920536" />
587
+      <window_info anchor="bottom" id="Spring" order="12" />
588
+      <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.32920536" />
589
+      <window_info anchor="right" id="Flutter Outline" />
590
+      <window_info anchor="right" id="Flutter Inspector" />
548
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
591
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
549
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
550
-      <window_info anchor="bottom" id="Message" order="0" />
592
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
551
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
593
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
552
-      <window_info anchor="bottom" id="Find" order="1" weight="0.3295325" />
553
-      <window_info anchor="right" id="Coverage" order="4" side_tool="true" weight="0.32995737" />
594
+      <window_info anchor="right" id="Palette" order="3" />
595
+      <window_info anchor="right" id="Capture Analysis" order="4" />
596
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.04424307" />
597
+      <window_info anchor="right" id="Database" order="6" weight="0.3291506" />
598
+      <window_info anchor="right" id="Palette&#9;" order="7" />
599
+      <window_info anchor="right" id="Theme Preview" order="8" />
600
+      <window_info anchor="right" id="Coverage" order="9" side_tool="true" weight="0.32995737" />
601
+      <window_info anchor="right" id="Bean Validation" order="10" />
554
     </layout>
602
     </layout>
555
     <layout-to-restore>
603
     <layout-to-restore>
604
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17377399" />
605
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
556
       <window_info id="Designer" order="2" />
606
       <window_info id="Designer" order="2" />
557
-      <window_info anchor="right" id="Palette" order="3" />
558
-      <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
559
-      <window_info anchor="bottom" id="Spring" order="12" />
560
       <window_info id="Image Layers" order="3" />
607
       <window_info id="Image Layers" order="3" />
561
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32964474" />
562
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
563
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
564
       <window_info id="UI Designer" order="4" />
608
       <window_info id="UI Designer" order="4" />
565
       <window_info id="Favorites" order="5" side_tool="true" />
609
       <window_info id="Favorites" order="5" side_tool="true" />
566
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22348917" />
567
       <window_info id="Capture Tool" order="6" />
610
       <window_info id="Capture Tool" order="6" />
568
-      <window_info anchor="right" id="Capture Analysis" order="4" />
569
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
570
-      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
571
-      <window_info anchor="bottom" id="Messages" order="11" />
611
+      <window_info id="Web" order="7" side_tool="true" />
612
+      <window_info anchor="bottom" id="Message" order="0" />
613
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32964474" />
614
+      <window_info anchor="bottom" id="Run" order="2" weight="0.22234891" />
615
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.41619155" />
616
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
617
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
572
       <window_info anchor="bottom" id="TODO" order="6" />
618
       <window_info anchor="bottom" id="TODO" order="6" />
573
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
574
-      <window_info anchor="bottom" id="Java Enterprise" order="13" />
619
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.22348917" />
620
+      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
575
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
621
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
576
       <window_info anchor="bottom" id="Version Control" order="10" />
622
       <window_info anchor="bottom" id="Version Control" order="10" />
577
-      <window_info anchor="right" id="Maven Projects" order="6" visible="true" weight="0.04424307" />
578
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17377399" />
623
+      <window_info anchor="bottom" id="Messages" order="11" />
624
+      <window_info anchor="bottom" id="Spring" order="12" />
625
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
626
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
627
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
628
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
629
+      <window_info anchor="right" id="Palette" order="3" />
630
+      <window_info anchor="right" id="Capture Analysis" order="4" />
579
       <window_info anchor="right" id="Database" order="5" weight="0.3291506" />
631
       <window_info anchor="right" id="Database" order="5" weight="0.3291506" />
580
-      <window_info anchor="bottom" id="Message" order="0" />
581
-      <window_info id="Web" order="7" side_tool="true" />
632
+      <window_info anchor="right" id="Maven Projects" order="6" visible="true" weight="0.04424307" />
582
       <window_info anchor="right" id="Palette&#9;" order="7" />
633
       <window_info anchor="right" id="Palette&#9;" order="7" />
583
       <window_info anchor="right" id="Theme Preview" order="8" />
634
       <window_info anchor="right" id="Theme Preview" order="8" />
584
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
585
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
586
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.41619155" />
587
       <window_info anchor="right" id="Bean Validation" order="9" />
635
       <window_info anchor="right" id="Bean Validation" order="9" />
588
     </layout-to-restore>
636
     </layout-to-restore>
589
   </component>
637
   </component>
593
   <component name="VcsContentAnnotationSettings">
641
   <component name="VcsContentAnnotationSettings">
594
     <option name="myLimit" value="2678400000" />
642
     <option name="myLimit" value="2678400000" />
595
   </component>
643
   </component>
596
-  <component name="XDebuggerManager">
597
-    <breakpoint-manager>
598
-      <option name="time" value="19" />
599
-    </breakpoint-manager>
600
-  </component>
601
   <component name="antWorkspaceConfiguration">
644
   <component name="antWorkspaceConfiguration">
602
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
645
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
603
     <option name="FILTER_TARGETS" value="false" />
646
     <option name="FILTER_TARGETS" value="false" />
604
   </component>
647
   </component>
605
   <component name="editorHistoryManager">
648
   <component name="editorHistoryManager">
606
-    <entry file="file://$PROJECT_DIR$/src/assembly/myassembly.xml" />
607
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java" />
608
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/MicroServer.java" />
609
-    <entry file="file://$PROJECT_DIR$/setting.conf" />
610
     <entry file="file://$PROJECT_DIR$/bak/pom.xml">
649
     <entry file="file://$PROJECT_DIR$/bak/pom.xml">
611
       <provider selected="true" editor-type-id="text-editor">
650
       <provider selected="true" editor-type-id="text-editor">
612
         <state relative-caret-position="700">
651
         <state relative-caret-position="700">
622
       </provider>
661
       </provider>
623
     </entry>
662
     </entry>
624
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/App.java" />
663
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/App.java" />
625
-    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/Response.class">
626
-      <provider selected="true" editor-type-id="text-editor">
627
-        <state relative-caret-position="125">
628
-          <caret line="117" column="19" selection-start-line="117" selection-start-column="19" selection-end-line="117" selection-end-column="19" />
629
-        </state>
630
-      </provider>
631
-    </entry>
632
-    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/ResponseBody.class">
633
-      <provider selected="true" editor-type-id="text-editor">
634
-        <state relative-caret-position="198">
635
-          <caret line="47" column="17" selection-start-line="47" selection-start-column="17" selection-end-line="47" selection-end-column="17" />
636
-        </state>
637
-      </provider>
638
-    </entry>
639
-    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/lang/ClassLoader.java">
640
-      <provider selected="true" editor-type-id="text-editor">
641
-        <state relative-caret-position="68">
642
-          <caret line="1305" column="23" selection-start-line="1305" selection-start-column="23" selection-end-line="1305" selection-end-column="23" />
643
-        </state>
644
-      </provider>
645
-    </entry>
646
-    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/Headers.class">
647
-      <provider selected="true" editor-type-id="text-editor">
648
-        <state relative-caret-position="-380">
649
-          <caret line="159" column="26" selection-start-line="159" selection-start-column="26" selection-end-line="159" selection-end-column="26" />
650
-        </state>
651
-      </provider>
652
-    </entry>
664
+    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/Response.class" />
665
+    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/ResponseBody.class" />
666
+    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/lang/ClassLoader.java" />
667
+    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/Headers.class" />
653
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/TinyLog.java" />
668
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/TinyLog.java" />
654
-    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/MediaType.class">
655
-      <provider selected="true" editor-type-id="text-editor">
656
-        <state relative-caret-position="19">
657
-          <caret line="32" column="42" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="42" />
658
-        </state>
659
-      </provider>
660
-    </entry>
661
-    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/io/File.java">
662
-      <provider selected="true" editor-type-id="text-editor">
663
-        <state relative-caret-position="268">
664
-          <caret line="453" column="52" lean-forward="true" selection-start-line="453" selection-start-column="52" selection-end-line="453" selection-end-column="52" />
665
-        </state>
666
-      </provider>
667
-    </entry>
668
-    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/MultipartBody.class">
669
-      <provider selected="true" editor-type-id="text-editor">
670
-        <state relative-caret-position="76">
671
-          <caret line="15" column="23" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
672
-        </state>
673
-      </provider>
674
-    </entry>
669
+    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/MediaType.class" />
670
+    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/io/File.java" />
671
+    <entry file="jar://D:/REPO/com/squareup/okhttp3/okhttp/3.14.0/okhttp-3.14.0.jar!/okhttp3/MultipartBody.class" />
675
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/HikConfig.java" />
672
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/HikConfig.java" />
676
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/AppConfig.java" />
673
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/AppConfig.java" />
677
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/DeviceConfig.java" />
674
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/DeviceConfig.java" />
678
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Configer.java">
679
-      <provider selected="true" editor-type-id="text-editor">
680
-        <state relative-caret-position="231">
681
-          <caret line="15" column="5" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="5" />
682
-        </state>
683
-      </provider>
684
-    </entry>
685
-    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/net/URI.java">
686
-      <provider selected="true" editor-type-id="text-editor">
687
-        <state relative-caret-position="514">
688
-          <caret line="1601" column="26" selection-start-line="1601" selection-start-column="18" selection-end-line="1601" selection-end-column="26" />
689
-        </state>
690
-      </provider>
691
-    </entry>
692
-    <entry file="jar://D:/REPO/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/org/slf4j/Logger.class">
693
-      <provider selected="true" editor-type-id="text-editor">
694
-        <state relative-caret-position="284">
695
-          <caret line="40" column="9" selection-start-line="40" selection-start-column="9" selection-end-line="40" selection-end-column="9" />
696
-        </state>
697
-      </provider>
698
-    </entry>
699
-    <entry file="jar://D:/REPO/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/org/slf4j/event/EventRecodingLogger.class">
700
-      <provider selected="true" editor-type-id="text-editor">
701
-        <state relative-caret-position="267">
702
-          <caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
703
-        </state>
704
-      </provider>
705
-    </entry>
675
+    <entry file="jar://D:/Application/jdk1.8.0_161/src.zip!/java/net/URI.java" />
676
+    <entry file="jar://D:/REPO/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/org/slf4j/Logger.class" />
677
+    <entry file="jar://D:/REPO/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/org/slf4j/event/EventRecodingLogger.class" />
706
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/INetSubscriber.java" />
678
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/INetSubscriber.java" />
707
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Server.java" />
679
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/Server.java" />
708
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Rand.java">
680
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Rand.java">
761
         </state>
733
         </state>
762
       </provider>
734
       </provider>
763
     </entry>
735
     </entry>
764
-    <entry file="jar://D:/REPO/org/java-websocket/Java-WebSocket/1.4.0/Java-WebSocket-1.4.0.jar!/org/java_websocket/client/WebSocketClient.class">
765
-      <provider selected="true" editor-type-id="text-editor">
766
-        <state relative-caret-position="241">
767
-          <caret line="339" column="23" selection-start-line="339" selection-start-column="13" selection-end-line="339" selection-end-column="23" />
768
-        </state>
769
-      </provider>
770
-    </entry>
736
+    <entry file="jar://D:/REPO/org/java-websocket/Java-WebSocket/1.4.0/Java-WebSocket-1.4.0.jar!/org/java_websocket/client/WebSocketClient.class" />
771
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSServer.java">
737
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSServer.java">
772
       <provider selected="true" editor-type-id="text-editor">
738
       <provider selected="true" editor-type-id="text-editor">
773
         <state relative-caret-position="2079">
739
         <state relative-caret-position="2079">
795
         </state>
761
         </state>
796
       </provider>
762
       </provider>
797
     </entry>
763
     </entry>
764
+    <entry file="jar://D:/REPO/com/alibaba/fastjson/1.2.56/fastjson-1.2.56.jar!/com/alibaba/fastjson/JSON.class" />
765
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HIKSupplement.java">
766
+      <provider selected="true" editor-type-id="text-editor">
767
+        <state relative-caret-position="147">
768
+          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
769
+          <folding>
770
+            <element signature="imports" expanded="true" />
771
+          </folding>
772
+        </state>
773
+      </provider>
774
+    </entry>
775
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/CarDetect.java">
776
+      <provider selected="true" editor-type-id="text-editor">
777
+        <state relative-caret-position="93">
778
+          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
779
+        </state>
780
+      </provider>
781
+    </entry>
798
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java">
782
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/websocket/WSClient.java">
799
       <provider selected="true" editor-type-id="text-editor">
783
       <provider selected="true" editor-type-id="text-editor">
800
-        <state relative-caret-position="798">
784
+        <state relative-caret-position="474">
801
           <caret line="47" column="53" selection-start-line="47" selection-start-column="53" selection-end-line="47" selection-end-column="53" />
785
           <caret line="47" column="53" selection-start-line="47" selection-start-column="53" selection-end-line="47" selection-end-column="53" />
802
           <folding>
786
           <folding>
803
             <element signature="imports" expanded="true" />
787
             <element signature="imports" expanded="true" />
850
         </state>
834
         </state>
851
       </provider>
835
       </provider>
852
     </entry>
836
     </entry>
853
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java">
837
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/hik/HCNetSDK.java">
838
+      <provider selected="true" editor-type-id="text-editor">
839
+        <state relative-caret-position="77">
840
+          <caret line="3856" column="13" selection-start-line="3856" selection-start-column="13" selection-end-line="3856" selection-end-column="13" />
841
+        </state>
842
+      </provider>
843
+    </entry>
844
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/libs/Ping.java">
845
+      <provider selected="true" editor-type-id="text-editor">
846
+        <state relative-caret-position="108">
847
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
848
+        </state>
849
+      </provider>
850
+    </entry>
851
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huiju/welcome/hardware/config/InitService.java">
854
       <provider selected="true" editor-type-id="text-editor">
852
       <provider selected="true" editor-type-id="text-editor">
855
         <state relative-caret-position="-210">
853
         <state relative-caret-position="-210">
856
           <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
854
           <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
906
         <state relative-caret-position="384">
904
         <state relative-caret-position="384">
907
           <caret line="97" lean-forward="true" selection-start-line="97" selection-end-line="97" />
905
           <caret line="97" lean-forward="true" selection-start-line="97" selection-end-line="97" />
908
           <folding>
906
           <folding>
909
-            <element signature="imports" expanded="true" />
907
+            <element signature="e#1984#1985#0" expanded="true" />
908
+            <element signature="e#2032#2033#0" expanded="true" />
910
           </folding>
909
           </folding>
911
         </state>
910
         </state>
912
       </provider>
911
       </provider>
977
             <option name="proportions">
976
             <option name="proportions">
978
               <list>
977
               <list>
979
                 <option value="0.2" />
978
                 <option value="0.2" />
980
-                <option value="0.6" />
981
               </list>
979
               </list>
982
             </option>
980
             </option>
983
           </splitter-proportions>
981
           </splitter-proportions>
997
       </state>
995
       </state>
998
       <state key="ProjectLibrariesConfigurable.UI">
996
       <state key="ProjectLibrariesConfigurable.UI">
999
         <settings>
997
         <settings>
1000
-          <last-edited>Maven: com.sun.jna:jna:3.0.9</last-edited>
998
+          <last-edited>examples</last-edited>
1001
           <splitter-proportions>
999
           <splitter-proportions>
1002
             <option name="proportions">
1000
             <option name="proportions">
1003
               <list>
1001
               <list>

+ 9
- 7
src/main/java/com/huiju/welcome/hardware/libs/APIUtil.java 查看文件

74
     }
74
     }
75
 
75
 
76
     public static Headers buildHeaders(Map<String, String> headers) {
76
     public static Headers buildHeaders(Map<String, String> headers) {
77
-        if (null == headers) return null;
78
-
79
         Headers.Builder builder = new Headers.Builder();
77
         Headers.Builder builder = new Headers.Builder();
80
-        for (Map.Entry<String, String> entry: headers.entrySet()) {
81
-            builder.add(entry.getKey(), entry.getValue());
78
+        if (null != headers) {
79
+            for (Map.Entry<String, String> entry: headers.entrySet()) {
80
+                builder.add(entry.getKey(), entry.getValue());
81
+            }
82
         }
82
         }
83
         return builder.build();
83
         return builder.build();
84
     }
84
     }
119
                 } else if (fieldValue instanceof FileInputStream) {
119
                 } else if (fieldValue instanceof FileInputStream) {
120
                     buildFileInputStream(builder, (FileInputStream) fieldValue, fieldName);
120
                     buildFileInputStream(builder, (FileInputStream) fieldValue, fieldName);
121
                 } else if (fieldValue instanceof ByteBuffer) {
121
                 } else if (fieldValue instanceof ByteBuffer) {
122
-                    buildFileBytes(builder, ((ByteBuffer) fieldValue).array(), fieldName);
122
+                    byte[] array = new byte[((ByteBuffer) fieldValue).remaining()];
123
+                    ((ByteBuffer) fieldValue).get(array);
124
+                    buildFileBytes(builder, array, fieldName);
123
                 } else if (fieldValue instanceof Array) {
125
                 } else if (fieldValue instanceof Array) {
124
                     for (int i = 0; i < Array.getLength(fieldValue); i ++) {
126
                     for (int i = 0; i < Array.getLength(fieldValue); i ++) {
125
                         Object item = Array.get(fieldValue, i);
127
                         Object item = Array.get(fieldValue, i);
161
 
163
 
162
             MediaType tp = MediaType.get("application/octet-stream");
164
             MediaType tp = MediaType.get("application/octet-stream");
163
             RequestBody body = RequestBody.create(tp, content);
165
             RequestBody body = RequestBody.create(tp, content);
164
-            builder.addFormDataPart(field, "未知文件", body);
166
+            builder.addFormDataPart(field, "未知文件.jpg", body);
165
         } catch (IOException e) {
167
         } catch (IOException e) {
166
             e.printStackTrace();
168
             e.printStackTrace();
167
             log.error("转换 form-data 数据 到 body 失败: " + e.getMessage());
169
             log.error("转换 form-data 数据 到 body 失败: " + e.getMessage());
171
     private static void buildFileBytes(MultipartBody.Builder builder, byte[] content, String field) {
173
     private static void buildFileBytes(MultipartBody.Builder builder, byte[] content, String field) {
172
         MediaType tp = MediaType.get("application/octet-stream");
174
         MediaType tp = MediaType.get("application/octet-stream");
173
         RequestBody body = RequestBody.create(tp, content);
175
         RequestBody body = RequestBody.create(tp, content);
174
-        builder.addFormDataPart(field, "未知文件", body);
176
+        builder.addFormDataPart(field, "未知文件.jpg", body);
175
     }
177
     }
176
 
178
 
177
     private static String getSearchString(Map<String, String> query) {
179
     private static String getSearchString(Map<String, String> query) {

+ 4
- 2
src/main/java/com/huiju/welcome/hardware/service/HikService.java 查看文件

54
     HCNetSDK.FMSGCallBack_V31 fmsgCallBack;
54
     HCNetSDK.FMSGCallBack_V31 fmsgCallBack;
55
 
55
 
56
     public boolean init() {
56
     public boolean init() {
57
-        String deviceIP = Configer.pick("device.id");
57
+        String deviceIP = Configer.pick("device.ip");
58
 
58
 
59
         if (!Ping.attemp(deviceIP)) {
59
         if (!Ping.attemp(deviceIP)) {
60
             log.error("设备未上线...");
60
             log.error("设备未上线...");
65
         if (!setDeviceCallback()) return false;
65
         if (!setDeviceCallback()) return false;
66
         if (!loginDevice()) return false;
66
         if (!loginDevice()) return false;
67
         if (!setDeviceAlarm()) return false;
67
         if (!setDeviceAlarm()) return false;
68
+        if (!setDeviceOnline()) return false;
68
 
69
 
69
         return true;
70
         return true;
70
     }
71
     }
108
         HCNetSDK.NET_DVR_DEVICEINFO_V30 device = new HCNetSDK.NET_DVR_DEVICEINFO_V30();
109
         HCNetSDK.NET_DVR_DEVICEINFO_V30 device = new HCNetSDK.NET_DVR_DEVICEINFO_V30();
109
 
110
 
110
         user = hcNetSDK.NET_DVR_Login_V30(
111
         user = hcNetSDK.NET_DVR_Login_V30(
111
-                Configer.pick("device.id"),
112
+                Configer.pick("device.ip"),
112
                 (short) Integer.valueOf(Configer.pick("device.port")).intValue(),
113
                 (short) Integer.valueOf(Configer.pick("device.port")).intValue(),
113
                 Configer.pick("device.loginUser"),
114
                 Configer.pick("device.loginUser"),
114
                 Configer.pick("device.password"),
115
                 Configer.pick("device.password"),
341
         query.put("port", Configer.pick("device.port"));
342
         query.put("port", Configer.pick("device.port"));
342
         query.put("username", Configer.pick("device.loginUser"));
343
         query.put("username", Configer.pick("device.loginUser"));
343
         query.put("password", Configer.pick("device.password"));
344
         query.put("password", Configer.pick("device.password"));
345
+        query.put("status", "1");
344
         query.put("api", Configer.pick("api.current") + ":" + Configer.pick("server.port"));
346
         query.put("api", Configer.pick("api.current") + ":" + Configer.pick("server.port"));
345
 
347
 
346
         try {
348
         try {

+ 1
- 1
src/main/java/com/huiju/welcome/hardware/service/Monitor.java 查看文件

32
 
32
 
33
             if (!lastResult && netOk) {
33
             if (!lastResult && netOk) {
34
                 while (true) {
34
                 while (true) {
35
-                    boolean success = hikService.initDevice();
35
+                    boolean success = hikService.init();
36
                     if (success) break;
36
                     if (success) break;
37
 
37
 
38
                     try {
38
                     try {

+ 1
- 0
src/main/java/com/huiju/welcome/hardware/service/PersonDetect.java 查看文件

48
     }
48
     }
49
 
49
 
50
     // 海康回调
50
     // 海康回调
51
+    @Override
51
     public boolean invoke(NativeLong lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {
52
     public boolean invoke(NativeLong lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {
52
         // 回调类型
53
         // 回调类型
53
         switch (lCommand.intValue()){
54
         switch (lCommand.intValue()){