From 2a9d202a06befdc24569e70c9e643711f2d16e8a Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 19 十二月 2016 15:42:59 +0800
Subject: [PATCH] add config for hcnetsdk
---
ProxyConsole/proxyconsole-hc.cpp | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ProxyConsole/proxyconsole-hc.cpp b/ProxyConsole/proxyconsole-hc.cpp
index fa10555..992de13 100644
--- a/ProxyConsole/proxyconsole-hc.cpp
+++ b/ProxyConsole/proxyconsole-hc.cpp
@@ -58,6 +58,16 @@
ET__LAST
};
+struct HCNetSDKConfig
+{
+ std::string serverIP;
+ int serverport;
+ std::string username;
+ std::string passwd;
+};
+
+HCNetSDKConfig g_hcnetsdkconfig;
+
struct HCNetCameraConfig
{
int lUserID;
@@ -432,14 +442,15 @@
LONG lUserID;
NET_DVR_DEVICEINFO_V30 struDeviceInfo;
- lUserID = NET_DVR_Login_V30("192.168.1.101", 8000, "admin", "a1234567", &struDeviceInfo);
+ lUserID = NET_DVR_Login_V30((char*)g_hcnetsdkconfig.serverIP.c_str(), g_hcnetsdkconfig.serverport,
+ (char*)g_hcnetsdkconfig.username.c_str(), (char*)g_hcnetsdkconfig.passwd.c_str(), &struDeviceInfo);
if (lUserID < 0) {
printf("NET_DVR_Login_V30 failed, err: %d\n", NET_DVR_GetLastError());
NET_DVR_Cleanup();
return -1;
}
- g_hcnetsdk_user.insert(std::make_pair("192.168.1.101", int(lUserID)));
+ g_hcnetsdk_user.insert(std::make_pair(g_hcnetsdkconfig.serverIP, int(lUserID)));
return lUserID;
}
@@ -785,6 +796,13 @@
std::cout << "open config.json error" << std::endl;
exit(EXIT_FAILURE);
}
+
+ //HCNetSDKConfig
+ Json::Value jsonHcsdk = root["hcsdk"];
+ g_hcnetsdkconfig.serverIP = jsonHcsdk["serverIP"].asString();
+ g_hcnetsdkconfig.serverport = jsonHcsdk["serverport"].asInt();
+ g_hcnetsdkconfig.username = jsonHcsdk["username"].asString();
+ g_hcnetsdkconfig.passwd = jsonHcsdk["passwd"].asString();
Json::Value jsonEquipments = root["equipments"];
for (int i = 0; i < jsonEquipments.size() && i < sizeof(equipments) / sizeof(sockinfo); i++)
--
Gitblit v1.8.0