整合代码

chenshijun

2019-04-15 db043cb402515837303880cb0948d060e9d76490

 QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp

@@ -32,9 +32,18 @@
        IMPORT_APP_ARGS;
        //nsq   set callback func
        DBG("NsqMsgConsumer Init");
        string pName(argv[0]);
        nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", pName,
                                                           to_string(appPref.getIntData("RpcVTIMPort")));
        DBG("argv[0]:" << argv[0]);
        if(argv[0][0] == '.' && argv[0][1] == '/'){
            string pName(argv[0]+2, argv[0]+strlen(argv[0]));
            DBG("pName:" << pName);
            nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", pName,
                                                               to_string(appPref.getIntData("RpcVTIMPort")));
        }else{
            string pName(argv[0]);
            DBG("pName:" << pName);
            nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", pName,
                                                               to_string(appPref.getIntData("RpcVTIMPort")));
        }
        nsqMsgConsumer->setMessageCallback(std::bind(&OnMsgFunc, std::placeholders::_1, this));
        nsqMsgConsumer->init();
        DBG("NsqMsgConsumer Init END!!");
@@ -92,7 +101,7 @@
        for (auto itor_json = value.begin(); itor_json != itor_json_end; ++itor_json) {
            //#todo 使用策略模式?发送端多个指令累积后发送?
            if (itor_json->isString() && reader.parse(itor_json->asString(), cfg_val)) {
                if (itor_json.name() == "cam_edit") {
                if (itor_json.name() == "cam_edit" || itor_json.name() == "editSdkRule") {
                    string cam_idx = cfg_val["str_cam_dev_id"].asString();
                    if (pthis->controllers.find(cam_idx) != pthis->controllers.end()) {
                        if (pthis->m_GB28181_Enable) {
@@ -245,14 +254,16 @@
        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;
//        if (rule.second.nSdkType == PerStaticSdk || rule.second.nSdkType == PerimeterSdk
//            || rule.second.nSdkType == KeepRightSdk || rule.second.nSdkType == KeepRightSdk) {
            float temp = (float)1 - (float) (rule.second.nThreshold) / 100;
            rule.second.fSensitivity = (temp * 50 + 50) / 100;
//            rule.second.fSensitivity = (temp * 25 + 75) / 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 = (float)1 - (float) (rule.second.nThreshold) / 100;
//            rule.second.fSensitivity = (temp * 90 + 5) / 100;
//        }
        DBG("fSensitivity" << rule.second.fSensitivity);
    }
    appPref.setStringData(t_camIdex + "rtsp", rtsp_url);