From e867924f5cbc704db00a0ddac383d043fead3632 Mon Sep 17 00:00:00 2001
From: qiuyc <1026314800@qq.com>
Date: Tue, 17 Nov 2020 10:26:20 +0800
Subject: [PATCH] 优化设备sn乱码

---
 cloud/dahua/src/main/java/com/example/dahua/MyTask.java            | 27 +++++++++++++++++++--------
 cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java | 15 ++++++++++++++-
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java
index 650f2f7..0a23098 100644
--- a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java
+++ b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java
@@ -244,16 +244,27 @@ public class MyTask implements ApplicationRunner {
     public synchronized void reloadPic() {
         isHasNewDevice = false;
         if (null != deviceInfoBeans && deviceInfoBeans.size() > 0) {
-            for (DeviceInfoBean dev :
-                    deviceInfoBeans) {
-                if (lLongMap.get(dev.getDevcieId()).intValue() > 0) { NetSDKLib.LLong lLong = GateModule.realLoadPic2(0, analyzerCallback, lLongMap.get(dev.getDevcieId()),dev.getDevcieId());
-//                    System.out.println("监听成功："+dev.getDevcieId());
-//                    if (lLong.intValue() != -1) {
-//                        //deviceInfoBeans.remove(dev);
-//                    }
+            Iterator<DeviceInfoBean> it = deviceInfoBeans.iterator();
+            while (((Iterator) it).hasNext()) {
+                DeviceInfoBean dev = it.next();
+                if (lLongMap.get(dev.getDevcieId()).intValue() > 0) {
+                    NetSDKLib.LLong lLong = GateModule.realLoadPic2(0, analyzerCallback, lLongMap.get(dev.getDevcieId()),dev.getDevcieId());
+                    System.out.println("监听成功："+dev.getDevcieId());
+                    if (lLong.intValue() != -1) {
+                        it.remove();
+                    }
                 }
-
             }
+//            for (DeviceInfoBean dev :
+//                    deviceInfoBeans) {
+//                if (lLongMap.get(dev.getDevcieId()).intValue() > 0) { NetSDKLib.LLong lLong = GateModule.realLoadPic2(0, analyzerCallback, lLongMap.get(dev.getDevcieId()),dev.getDevcieId());
+////                    System.out.println("监听成功："+dev.getDevcieId());
+////                    if (lLong.intValue() != -1) {
+////                        //deviceInfoBeans.remove(dev);
+////                    }
+//                }
+//
+//            }
         }
     }
 
diff --git a/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java b/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java
index f593671..26ccc77 100644
--- a/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java
+++ b/cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java
@@ -1,5 +1,6 @@
 package com.example.dahua.module;
 
+import com.example.dahua.MyTask;
 import com.example.dahua.bean.PermissionBean;
 import com.example.dahua.bean.WeekDay;
 import com.example.dahua.bean.WeekTime;
@@ -30,6 +31,8 @@ public class GateModule {
     // 查询句柄
     private static LLong m_lFindHandle = new LLong(0);
 
+    private final static NetSDKLib.NET_DEVICEINFO_Ex deviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
+
     /**
      * 订阅实时上传智能分析数据
      *
@@ -56,7 +59,17 @@ public class GateModule {
 
     public static LLong realLoadPic2(int ChannelId, NetSDKLib.fAnalyzerDataCallBack m_AnalyzerDataCB, LLong lLong,String devcieId) {
 
-        final NetSDKLib.NET_DEVICEINFO_Ex deviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
+//        final NetSDKLib.NET_DEVICEINFO_Ex deviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
+//
+//        Map<String, NetSDKLib.LLong> lLongMap = new MyTask().lLongMap;
+//        if(lLongMap.isEmpty()){
+//            for (String key :lLongMap.keySet()){
+//                if(key.equals(devcieId)){
+//                    lLongMap.
+//                }
+//            }
+//
+//        };
 
         // 设备ID
         System.arraycopy(devcieId.getBytes(), 0, deviceInfo.sSerialNumber, 0, devcieId.getBytes().length);
--
libgit2 0.21.0