YOLO修改，行为算法优化，视频编辑接口修改

zhangjixing

2019-01-12 963090c963b367333cd4f1b173cb51ae227551a5

 QiaoJiaSystem/StructureApp/PerimeterElement.cpp

@@ -18,7 +18,7 @@
    PipeElement(true),
    trackingTrigger(nullptr),
    mRealNum(0),
    m_triggerElement(0, rule.nTriggerDelay * 1000 * 1000),
    m_triggerElement(rule.nTriggerDelay*8,0),
    pManagerEsDB(nullptr),
    npts(0) {

@@ -40,6 +40,7 @@

void PerimeterElement::threadFunc() {

   // ClockTimer ct("PerimeterElement::threadFunc");
    if (!isInWeek(m_sdkRule.weekRuleVec))
        return;
    int num = 0;
@@ -73,16 +74,16 @@

    switch (m_sdkRule.nSdkType) {
        case PerimeterSdk:
            state = num > 0 && num != mRealNum;
            state = num > 0 ;


            break;
        case CrowdSdk:
            state = num > m_sdkRule.nAlarmNumLowerLimit && num != mRealNum;
            state = num > m_sdkRule.nAlarmNumLowerLimit  ;

            break;
        case PerHubSdk:
            state = num > m_sdkRule.nAlarmNumLowerLimit && num < m_sdkRule.nAlarmNumUpperLimit && num != mRealNum;
            state = num > m_sdkRule.nAlarmNumLowerLimit && num < m_sdkRule.nAlarmNumUpperLimit ;
//         if(m_sdkRule.nAlarmNumLowerLimit>0)
//         {
//             if( m_sdkRule.nAlarmNumUpperLimit>m_sdkRule.nAlarmNumLowerLimit+1)
@@ -113,21 +114,25 @@
        default:
            break;
    }
    m_triggerElement.setState(state);

    m_triggerElement.setState(state);
    m_triggerElement.triggerOnce();
    //  DBG("imgUrl="<<imgUrl);
    if (state) {
    if (m_triggerElement.getTriggerState() && num!=mRealNum)
    {
        auto t_image = image(CutMask()).clone();
        std::string imgUrl = uploadImgToFdfs(t_image);
        saveInfoToEs(imgUrl, picDate);
        DBG("num=" << num << " lastnum=" << mRealNum);

    }
    //if(state)
   // DBG("num=" << num <<"m_triggerElement.getTriggerState()="<<m_triggerElement.getTriggerState());


    m_triggerElement.triggerOnce();
   mRealNum = num;

    mRealNum = num;

    // DBG("m_sdkRule.nSdkType="<<m_sdkRule.nSdkType<<" num="<<num);
    fireConnectors();
}
@@ -210,7 +215,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);
@@ -243,13 +248,14 @@
    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();// 抓拍地址
    DBG("picAddress="<<m_sdkRule.strAddr.toStdString());
    t_json["picMaxUrl"] = "wait todo"; // 大图路径


    //   t_json["Age"] ="wait todo";
    t_json["picDate"] = time; // 抓拍时间，必须有
    // DBG("picDate="<<time);
     DBG("picDate="<<time);
    t_json["picLocalUrl"] = "wait todo";  // 本地路径
    t_json["isDelete"] = "1";//默认1 ,0无效 1有效

@@ -267,7 +273,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)