From 4920f3a1290f2061f7b81db78ce0dab7b6ae8fc2 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 08 八月 2023 09:02:32 +0800
Subject: [PATCH] 优化
---
src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java b/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java
index 6f52be7..5f8b731 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java
@@ -1,7 +1,9 @@
package com.ard.utils.hiksdk.service.impl;
import com.ard.alarm.camera.domain.ArdCameras;
+import com.ard.alarm.camera.domain.CameraCmd;
import com.ard.utils.hiksdk.common.GlobalVariable;
+import com.ard.utils.hiksdk.domain.DeviceInfo;
import com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;
@@ -16,27 +18,22 @@
@Slf4j(topic = "hikSdk")
public class LoginResultCallBack implements HCNetSDK.FLoginResultCallBack {
- private ArdCameras camera;
- public LoginResultCallBack(ArdCameras camera) {
- this.camera = camera;
+ private DeviceInfo deviceInfo;
+
+ public LoginResultCallBack(DeviceInfo deviceInfo) {
+ this.deviceInfo = deviceInfo;
}
@Override
public int invoke(int lUserID, int dwResult, HCNetSDK.NET_DVR_DEVICEINFO_V30 lpDeviceinfo, Pointer pUser) {
- if (GlobalVariable.loginMap.containsKey(camera.getId())) {
- GlobalVariable.loginMap.remove(camera.getId());
- }
+ String deviceIpPort = deviceInfo.getIp() + ":" + deviceInfo.getPort();
if (dwResult == 1) {
- GlobalVariable.loginMap.put(camera.getId(), lUserID);
- log.info(camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛");
- camera.setLoginId(lUserID);
- camera.setChannel((int) lpDeviceinfo.byChanNum);
+ GlobalVariable.loginMap.put(deviceInfo.getDeviceId(), lUserID);
+ log.info("璁惧銆�" + deviceIpPort + "銆戠櫥褰曟垚鍔�");
// 璁剧疆鎶ヨ鍥炶皟鍑芥暟锛屽缓绔嬫姤璀︿笂浼犻�氶亾锛堝惎鐢ㄥ竷闃诧級
- HikClientUtil.setupAlarmChan(lUserID, -1);
+ HikClientUtil.setupAlarmChan(deviceIpPort, lUserID, -1);
} else {
- log.info(camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触");
- camera.setChannel(0);
- camera.setLoginId(-1);
+ log.info("璁惧銆�" + deviceIpPort + "銆戠櫥褰曞け璐�");
}
return 1;
}
--
Gitblit v1.9.3