GB28181集成完成。录像bug暂未解决，已注释

pansen

2019-03-07 979bc003bce710bf300bc2bd87a8278585678763

 QiaoJiaSystem/StructureApp/PerimeterElement.cpp

@@ -13,17 +13,19 @@
#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),
    trackingTrigger(nullptr),
    mRealNum(0),
    m_triggerElement(rule.nTriggerDelay*8,0),
    //每秒几张,就乘以几
    m_triggerElement(rule.nTriggerDelay*3,0),
    pManagerEsDB(nullptr),
    m_bIsMask(true),
    m_bSetWH(false),
    pointArray(nullptr)
    pointArray(nullptr),
    m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp")
{

    pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));
@@ -117,22 +119,22 @@

    }


    switch (m_sdkRule.nSdkType) {
        case PerimeterSdk:
            //state = num > 0 ;
            state =( num !=mRealNum);
          //  DBG("num="<<num<< "time="<< picDate);

            INFO("SDK Type: PerimeterSdk");

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

            break;
        case PerHubSdk:
            state = num > m_sdkRule.nAlarmNumLowerLimit && num < m_sdkRule.nAlarmNumUpperLimit && num !=mRealNum;

            INFO("SDK Type: PerHubSdk");

//         if(m_sdkRule.nAlarmNumLowerLimit>=0)
//         {
@@ -164,10 +166,10 @@
        default:
            break;
    }

    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)
@@ -176,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,6 +196,10 @@
        }
        DBG("num=" << num << " lastnum=" << mRealNum);
        mRealNum = num;

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

//    if (m_triggerElement.getTriggerState() && num!=mRealNum)
@@ -381,6 +387,21 @@
    t_json["ack_alarm"] = m_triggerElement.getTriggerState() ? "0" : "";  //  que ren shi fou bao jing
    t_json["cluster_id"] = appPref.getStringData("clusterID");; // ji qun id
    t_json["imgKey"] = imgKey;
    try {
        auto server = m_rpcClient.getServer();
        if (!server)
        {
            ERR("server is null");
            //return false;
        }
        INFO("Record Video "<<imgKey);
        server->recordVideo(imgKey);
    }
    catch (std::exception &e)
    {
        ERR("Record Video Err: "<<imgKey <<"   Message: "<<e.what());
        //return false;
    }
    INFO("SaveImgKeyToES: "<<imgKey);
    bool retface = false;
    if (pManagerEsDB)