From f676f7af18163b4532b6b982bbe1dc57b32e96dd Mon Sep 17 00:00:00 2001 From: zhangjixing <775834166@qq.com> Date: 星期四, 24 一月 2019 15:38:22 +0800 Subject: [PATCH] --- QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp index bc399be..6bdf1ac 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 { @@ -3043,16 +3046,31 @@ 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); + std::string cmd("ffmpeg -i " + rtsp_url + " -vf select='eq(pict_type\\,I)',setpts='N/(25*TB)' -f image2 -s 1920*1080 -y " + str_imgName); +// std::string cmd("ffmpeg -i " + rtsp_url + " -r 1/25 -f image2 -s 1920*1080 -y " + str_imgName); DBG(cmd); system(cmd.c_str()); @@ -3069,13 +3087,14 @@ CvUtil::cvMat2Buffer(img, buffer); std::string strImgUrlTmp = ""; fdfsClient.fastFds->uploadFile(buffer, strImgUrlTmp, "jpg"); - strImgUrl.append(fdfsClient.fastFds->getIp() + "/" + strImgUrlTmp); + // strImgUrl.append(fdfsClient.fastFds->getIp() + "/" + strImgUrlTmp); strImgUrl.clear(); strImgUrl = strImgUrlTmp; } fdfsClient.rwLock.unlock(); Json::Value result; result["imgUrl"] = strImgUrl; + db_c.updateCamDevSnapshot(QString::fromStdString(ip),QString::fromStdString(strImgUrl)); return result.toStyledString(); -- Gitblit v1.8.0