Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-06 866e0bf538d3cf97ff34bd405167538d10503a99

 QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp

@@ -68,8 +68,9 @@
}

void RtspAnalysElement::init() {
    auto lst = m_lDBTool->searchCamDevTableAll();
    Record_Config lst_dev = m_lDBTool->searchConfigTableWithinServerInfo();
#ifndef GB28181
    auto lst = m_lDBTool->searchCamDevTableAll();

    appPref.setIntData("n_cut_max_duration", lst_dev.n_cut_max_duration);
    appPref.setIntData("n_cut_min_duration", lst_dev.n_cut_min_duration);
@@ -79,19 +80,17 @@
        int CamCount = appPref.getIntData("CamStep");
        auto itor = lst.begin();

        if(startCamNO >= lst.size())
        {
        if (startCamNO >= lst.size()) {
            ERR("startCamNO > lst.size()");
            return;
        }

        for(int i=0; i < startCamNO; i++){
        for (int i = 0; i < startCamNO; i++) {
            itor++;
        }

        for (int i = 0; i < CamCount; i++) {
            if (itor == lst.end())
            {
            if (itor == lst.end()) {
                ERR("itor == lst.end()");
                return;
            }
@@ -104,16 +103,13 @@
                rule.second.strAddr = itor->str_addr;
                rule.second.weekRuleVec = m_lDBTool->searchCameraWeekRuleByCamId(itor->str_cam_dev_id, rule.first);

                if(rule.second.nSdkType == PerStaticSdk)
                {
                    float temp=1-(float)(rule.second.nThreshold)/100;
                    rule.second.fSensitivity=(75+25*temp)/100;
                if (rule.second.nSdkType == PerStaticSdk) {
                    float temp = 1 - (float) (rule.second.nThreshold) / 100;
                    rule.second.fSensitivity = (75 + 25 * temp) / 100;

                }
                else if(rule.second.nSdkType != FaceSdk)
                {
                    float temp=1-(float)(rule.second.nThreshold)/100;
                    rule.second.fSensitivity=(5+90*temp)/100;
                } else if (rule.second.nSdkType != FaceSdk) {
                    float temp = 1 - (float) (rule.second.nThreshold) / 100;
                    rule.second.fSensitivity = (5 + 90 * temp) / 100;
                }
//                if (rule.second.nThreshold < 5 )
//                {
@@ -140,7 +136,6 @@
            addCamera(t_camIdex, ruleMap);
            itor++;
        }

//        for (auto item : lst) {
//            std::string t_camIdex = item.str_cam_dev_id.toStdString();
//            std::string rtsp_url = rtspAddrBuild(item.str_ip.toStdString(), 554, item.str_username.toStdString(),
@@ -190,6 +185,49 @@
        ERR("searchCamDevTableAll size is 0");
    }

#else
    auto lst = m_lDBTool->searchCamDevTableByType(1);

    appPref.setIntData("n_cut_max_duration", lst_dev.n_cut_max_duration);
    appPref.setIntData("n_cut_min_duration", lst_dev.n_cut_min_duration);
    if (lst.size() > 0) {
//        Json::Value json;

        for (auto &item : lst) {
            std::string t_camIdex = item.str_cam_dev_id.toStdString();
            std::string rtsp_url = "GB28181";
//            rtspAddrBuild(item.str_ip.toStdString(), 554, item.str_username.toStdString(),
//                                                 item.str_password.toStdString(), item.str_brand.toStdString());
            SdkRuleMap ruleMap = m_lDBTool->searchSdkRuleByCamId(item.str_cam_dev_id);
            for (auto &rule:ruleMap) {

                rule.second.strAddr = item.str_addr;
                rule.second.weekRuleVec = m_lDBTool->searchCameraWeekRuleByCamId(item.str_cam_dev_id, rule.first);

                if (rule.second.nSdkType == PerStaticSdk) {
                    float temp = 1 - (float) (rule.second.nThreshold) / 100;
                    rule.second.fSensitivity = (75 + 25 * temp) / 100;

                } else if (rule.second.nSdkType != FaceSdk) {
                    float temp = 1 - (float) (rule.second.nThreshold) / 100;
                    rule.second.fSensitivity = (5 + 90 * temp) / 100;
                }
                DBG("fSensitivity" << rule.second.fSensitivity);
            }
            appPref.setStringData(t_camIdex + "rtsp", rtsp_url);
            // appPref.setStringData(t_camIdex+"addr", item.str_addr.toStdString());
//            json["rtsp"] = rtsp_url;
            // json["addr"] = item.str_addr.toStdString();

            INFO("cam add is " << item.str_addr.toStdString());

            addCamera(t_camIdex, ruleMap);
        }
    } else {
        ERR("searchCamDevTableAll size is 0");
    }

#endif
}

RtspAnalysElement::~RtspAnalysElement() {