From 7106611f42c54da23d477efb81d66a5e57a38915 Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期五, 18 一月 2019 10:30:04 +0800
Subject: [PATCH]
---
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 9b2ad85..bc54682 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
@@ -395,6 +395,7 @@
/*sdk login*/
ulRet = IMOS_MW_Login(username, passwd, ip, 0, szUserID);
if (ERR_COMMON_SUCCEED != ulRet) {
+ (VOID) IMOS_MW_Cleanup();
printf("Login error ulRet[%lu]", ulRet);
return false;
}
@@ -402,6 +403,8 @@
pstBasicInfo = (IMOS_MW_BASIC_DEVICE_INFO_S *) malloc(sizeof(IMOS_MW_BASIC_DEVICE_INFO_S));
ulRet = IMOS_MW_GetDeviceStatus(szUserID, 0, IMOS_MW_STATUS_BASIC_INFO, (void *) pstBasicInfo);
if (ERR_COMMON_SUCCEED != ulRet) {
+ (VOID) IMOS_MW_Logout(szUserID);
+ (VOID) IMOS_MW_Cleanup();
printf("GetDeviceStatus Error[%lu]\n", ulRet);
return false;
}
@@ -1048,7 +1051,7 @@
{
if(is_exist)
{
- return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
+ return "{\"ret_status\": \"璇峰嬁閲嶅娣诲姞!\"}";
}
else
{
@@ -1087,13 +1090,14 @@
runAllApp();
}
//edit camera's sdks
-// else/* if ((rec_sdk_old.str_sdks != rec_sdk.str_sdks) ||
-// (rec_sdk_old.str_det_thr != rec_sdk.str_det_thr) ||
-// (rec_sdk_old.str_cmp_thr != rec_sdk.str_cmp_thr)) */{
-// killVideoAnalysFromHCApp();
-// sleep(1);
-// runAllApp();
-// }
+ else/* if ((rec_sdk_old.str_sdks != rec_sdk.str_sdks) ||
+ (rec_sdk_old.str_det_thr != rec_sdk.str_det_thr) ||
+ (rec_sdk_old.str_cmp_thr != rec_sdk.str_cmp_thr)) */
+ {
+ killVideoAnalysFromHCApp();
+ sleep(1);
+ runAllApp();
+ }
Json::Value value_out;
value_out["str_cam_dev_id"] = rec.str_cam_dev_id.toStdString();
@@ -3042,13 +3046,27 @@
std::string pass = value["str_password"].asString();
std::string brand = value["str_brand"].asString();
std::string rtsp_url = rtspAddrBuild(ip, port, username, pass, brand);
- if (rtsp_url.empty()) {
+ if (rtsp_url.empty() )
+ {
return "{\"ret_status\":\"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
}
+// unsigned char serialnumber[SERIALNO_LEN] = {0};
+// int ret = getDevSerialNumber(ip.c_str(), port,username.c_str(),pass.c_str(),brand.c_str(),serialnumber);
+
+
+// if ((!ret) || (serialnumber[0] == 0))
+// {
+// return "{\"ret_status\": \"鍐呭鏈夎锛岃妫�鏌ワ紒\"}";
+// }
+
+// std::string str_cam_dev_id = std::string((char *) serialnumber);//鎽勫儚鏈篿d cam_mac
+
std::string str_imgName = appConfig.getStringProperty("cutPath");
if (str_imgName.back() != '/') {
str_imgName.push_back('/');
}
+ str_imgName +=ip;
+ str_imgName +="-";
str_imgName += "snapshot.jpg";
//admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream -r 1/25 -f image2 -s 1920*1080 /home/basic/work_src/a.jpg
std::string cmd("ffmpeg -i " + rtsp_url + " -r 1/25 -f image2 -s 1920*1080 -y " + str_imgName);
--
Gitblit v1.8.0