~admin/c++.git - Gitblit

			@@ -3343,18 +3343,18 @@

			if (reader.parse(content, value)) {
			std::string str_imgName = "";
			std::string rtsp_ip = value["str_ip"].asString();
			// int port= value["n_port"].asInt();
			int port = 554;
			std::string username = value["str_username"].asString();
			std::string pass = value["str_password"].asString();
			std::string brand = value["str_brand"].asString();
			std::string rtsp_url = rtspAddrBuild(rtsp_ip, port, username, pass, brand);

			if (value.isMember("id")) {
			if (value["id"].isNull()) return "{\"ret_status\": \"id内容有误，请检查！\"}";
			str_imgName.append("./").append(value["id"].asString()).append(".jpg");
			} else {
			std::string ip = value["str_ip"].asString();
			// int port= value["n_port"].asInt();
			int port = 554;
			std::string username = value["str_username"].asString();
			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()) {
			return "{\"ret_status\":\"内容有误，请检查！\"}";
			}
			@@ -3373,7 +3373,7 @@
			if (str_imgName.back() != '/') {
			str_imgName.push_back('/');
			}
			str_imgName += ip;
			str_imgName += rtsp_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
			@@ -3406,7 +3406,7 @@
			fdfsClient.rwLock.unlock();
			Json::Value result;
			result["imgUrl"] = strImgUrl;
			db_c.updateCamDevSnapshot(QString::fromStdString(ip), QString::fromStdString(strImgUrl));
			db_c.updateCamDevSnapshot(QString::fromStdString(rtsp_ip), QString::fromStdString(strImgUrl));

			return result.toStyledString();