|
@@ -28,6 +28,7 @@ public class DahuaDeviceService implements DeviceApi {
|
|
|
* 多个设备的登录句柄
|
|
* 多个设备的登录句柄
|
|
|
*/
|
|
*/
|
|
|
private Map<DeviceId, NativeLong> loginHandles;
|
|
private Map<DeviceId, NativeLong> loginHandles;
|
|
|
|
|
+ private NET_DEVICEINFO_Ex deviceInfo;
|
|
|
private final Logger logger = LoggerFactory.getLogger(DahuaDeviceService.class);
|
|
private final Logger logger = LoggerFactory.getLogger(DahuaDeviceService.class);
|
|
|
private final DahuaDataAnalyzeService dataAnalyzeService;
|
|
private final DahuaDataAnalyzeService dataAnalyzeService;
|
|
|
|
|
|
|
@@ -59,8 +60,9 @@ public class DahuaDeviceService implements DeviceApi {
|
|
|
*/
|
|
*/
|
|
|
private NativeLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) {
|
|
private NativeLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) {
|
|
|
IntByReference nError = new IntByReference(0);
|
|
IntByReference nError = new IntByReference(0);
|
|
|
|
|
+ deviceInfo = new NET_DEVICEINFO_Ex();
|
|
|
NativeLong m_hLoginHandle = sdk.getInstance().CLIENT_LoginEx2(m_strIp, m_nPort, m_strUser, m_strPassword,
|
|
NativeLong m_hLoginHandle = sdk.getInstance().CLIENT_LoginEx2(m_strIp, m_nPort, m_strUser, m_strPassword,
|
|
|
- 0, null, new NET_DEVICEINFO_Ex(), nError);
|
|
|
|
|
|
|
+ EM_LOGIN_SPAC_CAP_TYPE.EM_LOGIN_SPEC_CAP_TCP, null, deviceInfo, nError);
|
|
|
if (m_hLoginHandle.longValue() == 0) {
|
|
if (m_hLoginHandle.longValue() == 0) {
|
|
|
DahuaSdkError error = sdk.getLastError();
|
|
DahuaSdkError error = sdk.getLastError();
|
|
|
logger.error("Device[{}] Port[{}] Login Failed. Last Error[{}]", m_strIp, m_nPort, error);
|
|
logger.error("Device[{}] Port[{}] Login Failed. Last Error[{}]", m_strIp, m_nPort, error);
|