From abd9036f024a77d22b47a108bc88b27b9732e3c5 Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期二, 15 一月 2019 17:27:27 +0800
Subject: [PATCH]
---
QiaoJiaSystem/StructureApp/PerStaticElement.cpp | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/PerStaticElement.cpp b/QiaoJiaSystem/StructureApp/PerStaticElement.cpp
index 4dbcf92..4877fbe 100644
--- a/QiaoJiaSystem/StructureApp/PerStaticElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerStaticElement.cpp
@@ -16,7 +16,8 @@
m_sdkRule(rule),
m_triggerElement(0,0),
m_lTime(AppUtil::getCurrentUs()),
-pManagerEsDB(nullptr)
+pManagerEsDB(nullptr),
+m_bIsMask(true)
{
pManagerEsDB=new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
@@ -54,7 +55,7 @@
QRect rect(obj.rect.x,obj.rect.y,obj.rect.width,obj.rect.height);
QPoint center = rect.center();
- if(mPolygon.containsPoint(center,Qt::OddEvenFill))
+ if(mPolygon.containsPoint(center,Qt::OddEvenFill) || !m_bIsMask)
{
for(auto score:m_lastScoreRect)
{
@@ -102,9 +103,10 @@
//do temp memery
}
- m_lastScoreRect = mObjs;
+ // m_lastScoreRect = mObjs;
m_lTime =AppUtil::getCurrentUs();
}
+
m_lastScoreRect=mObjs;
m_triggerElement.triggerOnce();
@@ -144,6 +146,7 @@
QJsonArray arrayAreas = getJsonArrayFromQString(QString::fromStdString(mask));
if(arrayAreas.isEmpty())
{
+ m_bIsMask=false;
return;//do not detect
}
for(int i = 0;i < arrayAreas.size();++i)
@@ -213,7 +216,7 @@
t_json["personPicUrl"] = "";// 浜哄憳 鍦板簱鍥剧墖
t_json["ChannlId"] = getProperty("ch_id"); // 閫氶亾id
t_json["likeDate"] =AppUtil::getTimeSecString(); // 姣斿鏃堕棿
- t_json["picAddress"] =getProperty("str_addr");// 鎶撴媿鍦板潃
+ t_json["picAddress"] =m_sdkRule.strAddr.toStdString();// 鎶撴媿鍦板潃
t_json["picMaxUrl"] = "wait todo"; // 澶у浘璺緞
@@ -236,7 +239,7 @@
t_json["personIsHub"] = m_triggerElement.getTriggerState()?"1":"4"; //1: 鎶ヨ 2: 鍙枒 3: 瀹夊叏 4: 鏈煡
t_json["videoIp"] = m_sdkRule.strAddr.toStdString(); // 璁惧ip
t_json["ack_alarm"]=m_triggerElement.getTriggerState()?"0":""; // que ren shi fou bao jing
- t_json["cluster_id"]="wait todo"; // ji qun id
+ t_json["cluster_id"]=appPref.getStringData("clusterID");; // ji qun id
bool retface = false;
if(pManagerEsDB)
--
Gitblit v1.8.0