整合c++ver1.3的修改代码进入该分支

chenshijun

2019-04-15 a2ea58c567a078bb97a9e45a56fe50df41438d22

 QiaoJiaSystem/StructureApp/PerimeterElement.cpp

@@ -13,7 +13,7 @@
#include <uuid/uuid.h>
#include <jsoncpp/json/json.h>

#define ALARM_PERCENT (10)  //10%
#define ALARM_PERCENT (25)  //25%
PerimeterElement::PerimeterElement(const SdkRule &rule) :
    m_sdkRule(rule),
    PipeElement(true),
@@ -25,7 +25,7 @@
    m_bIsMask(true),
    m_bSetWH(false),
    pointArray(nullptr),
    m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp")
    m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp")
{

    pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
@@ -124,17 +124,17 @@
            //state = num > 0 ;
            state =( num !=mRealNum);
          //  DBG("num="<<num<< "time="<< picDate);
            INFO("SDK Type: PerimeterSdk");
//            INFO("SDK Type: PerimeterSdk");

            break;
        case CrowdSdk:
            state = num > m_sdkRule.nAlarmNumLowerLimit && num !=mRealNum;
            INFO("SDK Type: CrowdSdk");
//            INFO("SDK Type: CrowdSdk");

            break;
        case PerHubSdk:
            state = num > m_sdkRule.nAlarmNumLowerLimit && num < m_sdkRule.nAlarmNumUpperLimit && num !=mRealNum;
            INFO("SDK Type: PerHubSdk");
//            INFO("SDK Type: PerHubSdk");

//         if(m_sdkRule.nAlarmNumLowerLimit>=0)
//         {
@@ -166,10 +166,10 @@
        default:
            break;
    }
    INFO("State:"<<state<<" Num:"<<num<<" mRealNum:"<<mRealNum<<" LowerLimit :"<<m_sdkRule.nAlarmNumLowerLimit<<" HightLimit: "<<m_sdkRule.nAlarmNumUpperLimit);
//    INFO("State:"<<state<<" Num:"<<num<<" mRealNum:"<<mRealNum<<" LowerLimit :"<<m_sdkRule.nAlarmNumLowerLimit<<" HightLimit: "<<m_sdkRule.nAlarmNumUpperLimit);
    m_triggerElement.setState(state);
    m_triggerElement.triggerOnce();
    if (m_triggerElement.getTriggerState() )
    if (m_triggerElement.getTriggerState())
    {
        if(num > 0) {
            if(pointArray!=nullptr)
@@ -178,7 +178,7 @@

                int npt[]={npts};

                cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0));
                cv::polylines(image, ppt,npt, 1, true,cv::Scalar(255,255,0), 2);
            }

            for(auto rect:m_recVec)
@@ -194,8 +194,12 @@
            std::string imgUrl = uploadImgToFdfs(image);
            saveInfoToEs(imgUrl, picDate,imgKey);
        }
        DBG("num=" << num << " lastnum=" << mRealNum);
//        DBG("num=" << num << " lastnum=" << mRealNum);
        mRealNum = num;

        //todo 重置报警trigger
        m_triggerElement.setState(false);
        m_triggerElement.triggerOnce();
    }

//    if (m_triggerElement.getTriggerState() && num!=mRealNum)
@@ -281,8 +285,8 @@
        {
             mPolygon << (QPoint(x, y));
        }
        DBG("width="<<sizeW);
        DBG("height="<<sizeH);
//        DBG("width="<<sizeW);
//        DBG("height="<<sizeH);


    }
@@ -291,7 +295,7 @@
QJsonArray PerimeterElement::getJsonArrayFromQString(const QString &strJson) {
    QJsonDocument jsonDocument = QJsonDocument::fromJson(strJson.toLocal8Bit());
    if (jsonDocument.isNull()) {
        DBG("please check the string" << strJson.toStdString());
        ERR("please check the string" << strJson.toStdString());
        return QJsonArray();
    }
    QJsonArray jsonArray = jsonDocument.array();