From 8a87e4226aa802d6a0e3566c66824fedf68e77da Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/MEDIAFILE_FACERECOGNITION_INFO.java |  140 +++++++++++++++++++++++-----------------------
 1 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/MEDIAFILE_FACERECOGNITION_INFO.java b/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/MEDIAFILE_FACERECOGNITION_INFO.java
index 4ad0950..2cf3ec7 100644
--- a/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/MEDIAFILE_FACERECOGNITION_INFO.java
+++ b/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/MEDIAFILE_FACERECOGNITION_INFO.java
@@ -1,70 +1,70 @@
-package com.netsdk.lib.structure.customize;
-
-import com.ruoyi.device.dhsdk.lib.NetSDKLib;
-import com.ruoyi.device.dhsdk.lib.Utils;
-import com.ruoyi.device.dhsdk.lib.structure.NET_TIME;
-
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author 47081
- * @version 1.0
- * @description ERR210301049涓诲姩娉ㄥ唽閲嶆柊瀹氬悜, 缁撴瀯浣�, 鏃ュ父浣跨敤浠tructure鍖呭拰NetSDKLib涓嬬殑鍚屽悕缁撴瀯浣撲负涓�
- * @date 2021/3/17
- */
-public class MEDIAFILE_FACERECOGNITION_INFO extends NetSDKLib.SdkStructure {
-  /** 缁撴瀯浣撳ぇ灏� */
-  public int dwSize;
-  /** 鎶ヨ鍙戠敓鏃堕棿 */
-  public NET_TIME stTime;
-  /** 鎶ヨ鍙戠敓鍦扮偣 */
-  public byte[] szAddress = new byte[260];
-  /** 閫氶亾鍙� */
-  public int nChannelId;
-  /** 褰撳墠浜鸿劯鍖归厤鍒扮殑鍊欓�夊璞�(鎵╁睍缁撴瀯浣�) 鏁伴噺 */
-  public int nCandidateExNum;
-  /** 褰撳墠浜鸿劯鍖归厤鍒扮殑鍊欓�夊璞′俊鎭�, 瀹為檯杩斿洖涓暟鍚宯CandidateNum */
- // public CANDIDATE_INFO_CEX[] stuCandidatesEx = (CANDIDATE_INFO_CEX[]) new CANDIDATE_INFO_CEX().toArray(50);
-  public CANDIDATE_INFO_CEX[] stuCandidatesEx = new CANDIDATE_INFO_CEX[50];
-
-  public MEDIAFILE_FACERECOGNITION_INFO() {
-
-    for(int i=0;i<stuCandidatesEx.length;i++){
-      stuCandidatesEx[i]=new CANDIDATE_INFO_CEX();
-    }
-
-    this.dwSize = this.size();
-  }
-
-  public void setAddress(String address) {
-    byte[] data = address.getBytes(Charset.forName(Utils.getPlatformEncode()));
-    System.arraycopy(data, 0, szAddress, 0, data.length);
-  }
-
-  public String getAddress() {
-    return new String(szAddress, Charset.forName(Utils.getPlatformEncode())).trim();
-  }
-
-  public List<CANDIDATE_INFO_CEX> getCandidateInfos() {
-    return new ArrayList<>(Arrays.asList(stuCandidatesEx).subList(0, nCandidateExNum));
-  }
-
-  @Override
-  public String toString() {
-    return "MEDIAFILE_FACERECOGNITION_INFO{"
-        + "stTime="
-        + stTime.toStringTime()
-        + ", szAddress="
-        + getAddress()
-        + ", nChannelId="
-        + nChannelId
-        + ", nCandidateExNum="
-        + nCandidateExNum
-        + ", stuCandidatesEx="
-        + getCandidateInfos().toString()
-        + '}';
-  }
-}
+package com.ruoyi.device.dhsdk.lib.structure.customize;
+
+import com.ruoyi.device.dhsdk.lib.NetSDKLib;
+import com.ruoyi.device.dhsdk.lib.Utils;
+import com.ruoyi.device.dhsdk.lib.structure.NET_TIME;
+
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author 47081
+ * @version 1.0
+ * @description ERR210301049涓诲姩娉ㄥ唽閲嶆柊瀹氬悜, 缁撴瀯浣�, 鏃ュ父浣跨敤浠tructure鍖呭拰NetSDKLib涓嬬殑鍚屽悕缁撴瀯浣撲负涓�
+ * @date 2021/3/17
+ */
+public class MEDIAFILE_FACERECOGNITION_INFO extends NetSDKLib.SdkStructure {
+  /** 缁撴瀯浣撳ぇ灏� */
+  public int dwSize;
+  /** 鎶ヨ鍙戠敓鏃堕棿 */
+  public NET_TIME stTime;
+  /** 鎶ヨ鍙戠敓鍦扮偣 */
+  public byte[] szAddress = new byte[260];
+  /** 閫氶亾鍙� */
+  public int nChannelId;
+  /** 褰撳墠浜鸿劯鍖归厤鍒扮殑鍊欓�夊璞�(鎵╁睍缁撴瀯浣�) 鏁伴噺 */
+  public int nCandidateExNum;
+  /** 褰撳墠浜鸿劯鍖归厤鍒扮殑鍊欓�夊璞′俊鎭�, 瀹為檯杩斿洖涓暟鍚宯CandidateNum */
+ // public CANDIDATE_INFO_CEX[] stuCandidatesEx = (CANDIDATE_INFO_CEX[]) new CANDIDATE_INFO_CEX().toArray(50);
+  public CANDIDATE_INFO_CEX[] stuCandidatesEx = new CANDIDATE_INFO_CEX[50];
+
+  public MEDIAFILE_FACERECOGNITION_INFO() {
+
+    for(int i=0;i<stuCandidatesEx.length;i++){
+      stuCandidatesEx[i]=new CANDIDATE_INFO_CEX();
+    }
+
+    this.dwSize = this.size();
+  }
+
+  public void setAddress(String address) {
+    byte[] data = address.getBytes(Charset.forName(Utils.getPlatformEncode()));
+    System.arraycopy(data, 0, szAddress, 0, data.length);
+  }
+
+  public String getAddress() {
+    return new String(szAddress, Charset.forName(Utils.getPlatformEncode())).trim();
+  }
+
+  public List<CANDIDATE_INFO_CEX> getCandidateInfos() {
+    return new ArrayList<>(Arrays.asList(stuCandidatesEx).subList(0, nCandidateExNum));
+  }
+
+  @Override
+  public String toString() {
+    return "MEDIAFILE_FACERECOGNITION_INFO{"
+        + "stTime="
+        + stTime.toStringTime()
+        + ", szAddress="
+        + getAddress()
+        + ", nChannelId="
+        + nChannelId
+        + ", nCandidateExNum="
+        + nCandidateExNum
+        + ", stuCandidatesEx="
+        + getCandidateInfos().toString()
+        + '}';
+  }
+}

--
Gitblit v1.9.3