From 963090c963b367333cd4f1b173cb51ae227551a5 Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期六, 12 一月 2019 18:34:40 +0800
Subject: [PATCH] YOLO修改,行为算法优化,视频编辑接口修改

---
 QiaoJiaSystem/StructureApp/FaceExtractElement.cpp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp b/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
index c1519f2..00f910d 100644
--- a/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
+++ b/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
@@ -11,7 +11,6 @@
 #include <QtCore/QJsonObject>
 #include <uuid/uuid.h>
 #include <jsoncpp/json/json.h>
-
 #define state "state"
 
 void StringReplace(string &strBase, string strSrc, string strDes) {
@@ -110,7 +109,8 @@
                     CvUtil::cvMat2Buffer(faceExtractQueueTmp[i].faceImages[j], buffer);
                     std::string strImgUrlTmp = "";
                     fdfsClient->fastFds->uploadFile(buffer, strImgUrlTmp, "jpg");
-                    strImgUrl.append(fdfsClient->fastFds->getIp() + "/" + strImgUrlTmp);
+                  //  strImgUrl.append(fdfsClient->fastFds->getIp() + "/" + strImgUrlTmp);
+                    DBG("strImgUrlTmp="<<strImgUrlTmp);
                     strImgUrl.clear();
                     strImgUrl = strImgUrlTmp;
 //                    strImgUrl.append("/").append(strImgUrlTmp);
@@ -141,6 +141,7 @@
 
                 t_json["personPicUrl"] = "wait todo";//浜哄憳鍥剧墖 store
                 t_json["picAddress"] = getProperty("str_addr");//鎶撴媿鍦板潃
+                  DBG("picAddress="<< t_json["picAddress"] );
                 t_json["picMaxUrl"] = "wait todo";//澶у浘璺緞
                 t_json["picLocalUrl"] = "wait todo";//鏈湴璺緞
                 t_json["picSmUrl"] = strImgUrl;//浜哄憳鎶撳皬鍥�
@@ -155,6 +156,9 @@
                 t_json["personIsHub"] = "4";//1: 鎶ヨ  2: 鍙枒  3: 瀹夊叏  4: 鏈煡
 
 
+                t_json["cluster_id"] = appPref.getStringData("clusterID");
+                t_json["ack_alarm"] = "0";
+
                 //faceExtractElement.setProperty("dev_id", str_device_id);
                 //faceExtractElement.setProperty("cg_id", str_ch_id);
                 t_json["videoNum"] = getProperty("dev_id");//Video璁惧缂栧彿//getProperty("path");//Vide缂栧彿 澶栭敭

--
Gitblit v1.8.0