From bf17db04a093ca277c421ea7d24fe2a050963dca Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 10 六月 2020 18:25:38 +0800
Subject: [PATCH] version 1
---
device/hcnetdisk.c | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/device/hcnetdisk.c b/device/hcnetdisk.c
index 7938a60..b62aecc 100644
--- a/device/hcnetdisk.c
+++ b/device/hcnetdisk.c
@@ -36,8 +36,8 @@
-HCNetdisk::HCNetdisk(const std::string &_devicename):Netdisk(_devicename){
-
+HCNetdisk::HCNetdisk(): Netdisk(){
+ deviceType="HC";
}
int HCNetdisk::_login(Netdisk_LoginInfo &loginInfo) {
@@ -55,6 +55,7 @@
NET_DVR_DEVICEINFO_V40 struDeviceInfo = {0};
//lUserID = 0;
lUserID = NET_DVR_Login_V40(&struLoginInfo, &struDeviceInfo);
+ printf("lUserID = %d\n", lUserID);
if (lUserID < 0)
{
printf("Login error, %d\n", NET_DVR_GetLastError());
@@ -62,7 +63,8 @@
return -1;
}
- printf("lUserID = %ld\n", lUserID);
+
+ loginInfo.userid = std::to_string(lUserID);
userid = lUserID;
username = loginInfo.username;
password = loginInfo.password;
@@ -72,8 +74,6 @@
startChannel = struDeviceInfo.struDeviceV30.byStartDChan;
maxChannels = struDeviceInfo.struDeviceV30.byIPChanNum + struDeviceInfo.struDeviceV30.byHighDChanNum * 256;
-
-
return 0;
}
@@ -81,16 +81,14 @@
int HCNetdisk::login(Netdisk_LoginInfo &loginInfo) {
- //_login(loginInfo);
- Netdisk::addLoginInfo(loginInfo);
+ return _login(loginInfo);
+ //Netdisk::addLoginInfo(loginInfo);
- return 0;
}
int HCNetdisk::logout() {
//娉ㄩ攢鐢ㄦ埛
NET_DVR_Logout(userid);
- userid = -1;
return 0;
}
@@ -99,8 +97,8 @@
char destfile[1024];
int i = 0;
- Netdisk_LoginInfo loginInfo = Netdisk::getLoginInfo(request.loginUUID);
- _login(loginInfo);
+ // Netdisk_LoginInfo loginInfo = Netdisk::getLoginInfo(request.loginUUID);
+ // _login(loginInfo);
start = request.start;
@@ -117,12 +115,12 @@
// printf("end = %s", asctime(&end));
sprintf(destfile, "%s/%s-%d-%ld-%d",
request.destpath.c_str(),
- devicename.c_str(),
+ deviceType.c_str(),
request.channel,
mktime(&start),
i);
// printf("%s\n", destfile);
- downloadByTime_wrapper(userid, request.channel, &start, &end, destfile);
+ // downloadByTime_wrapper(userid, request.channel, &start, &end, destfile);
if(files != NULL) {
files->push_back(destfile);
}
--
Gitblit v1.8.0