zhangjixing

2019-01-18 9f08028f23d9e5cbfa159bec1e07d63b141a6809

 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)
                {
@@ -79,7 +80,7 @@
            {
                if(ele.id==obj.id)
                {
                    if((obj.rect&ele.rect).area()>ele.rect.area()*0.8)
                    if((obj.rect&ele.rect).area()>ele.rect.area()*m_sdkRule.fSensitivity)
                    {
                        //not moving
                        obj.isMove = true;
@@ -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)
@@ -180,7 +183,7 @@
        CvUtil::cvMat2Buffer(image, 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;
//                    strImgUrl.append("/").append(strImgUrlTmp);
@@ -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)