解决nsg消费者的topic名称带有./的bug 注释一些错误打印

chenshijun

2019-04-10 b5ac5f7d1e0f79d332dcddc3dabd8709b1e2a2ea

解决nsg消费者的topic名称带有./的bug
注释一些错误打印

 QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp

@@ -536,7 +536,7 @@
    m_frameIndex++;
    m_packetsVec.push_back({m_frameIndex, newPacket});
    if (newPacket.flags & AV_PKT_FLAG_KEY) {
        DBG("newPacket.flags & AV_PKT_FLAG_KEY   ");
//        DBG("newPacket.flags & AV_PKT_FLAG_KEY   ");
        m_last_I_FrameId = m_frameIndex;
    }
}

 QiaoJiaSystem/StructureApp/AppPipeController.cpp

@@ -286,7 +286,7 @@
                //#todo
                faceRpcElement.setProperty("time", strNewTime);
                faceRpcElement.setProperty("imgKey", imgKey);
                INFO("Write To FaceRPC  ES time:" << strNewTime << "    ImgKey: " << imgKey);
//                INFO("Write To FaceRPC  ES time:" << strNewTime << "    ImgKey: " << imgKey);
                faceRpcElement.setImage(imageTemp);
                faceRpcElement.submit();
            }
@@ -295,7 +295,7 @@
                //#todo
                yoloRpcElement.setProperty("time", strNewTime);
                yoloRpcElement.setProperty("imgKey", imgKey);
                INFO("Write To YoloES time:" << strNewTime << "    ImgKey: " << imgKey);
//                INFO("Write To YoloES time:" << strNewTime << "    ImgKey: " << imgKey);
                yoloRpcElement.setImage(imageTemp);
                yoloRpcElement.submit();
            }

 QiaoJiaSystem/StructureApp/FaceExtractElement.cpp

@@ -61,7 +61,7 @@
}

void FaceExtractElement::timerFunc() {
    INFO("MYH Run Here");
//    INFO("MYH Run Here");
    std::vector<FaceToExtract> faceExtractQueueTmp;
    {
        std::lock_guard<std::mutex> lg(imageQueueMutex);
@@ -78,7 +78,7 @@
        float t_com_sc = m_sdkRule.nThreshold == 0 ? 75 : m_sdkRule.nThreshold;


        DBG(" TESTCODE getValue" << t_camIdex << "  " << t_com_sc << "  " << t_com_sc / 100);
//        DBG(" TESTCODE getValue" << t_camIdex << "  " << t_com_sc << "  " << t_com_sc / 100);

        t_com_sc = t_com_sc / 100;

@@ -118,7 +118,7 @@
//                    cv::imwrite(string1, image);
//                }
                if (feature.empty()) {
                    INFO("No Face Find: " << getProperty("imgKey"));
//                    INFO("No Face Find: " << getProperty("imgKey"));
                    continue;
                }
                features.clear();
@@ -131,7 +131,7 @@
                    std::string strImgUrlTmp = "";
                    fdfsClient->fastFds->uploadFile(buffer, strImgUrlTmp, "jpg");
                    //  strImgUrl.append(fdfsClient->fastFds->getIp() + "/" + strImgUrlTmp);
                    DBG("strImgUrlTmp=" << strImgUrlTmp);
//                    DBG("strImgUrlTmp=" << strImgUrlTmp);
                    strImgUrl.clear();
                    strImgUrl = strImgUrlTmp;
//                    strImgUrl.append("/").append(strImgUrlTmp);

 QiaoJiaSystem/StructureApp/FaceRpcElement.cpp

@@ -82,7 +82,7 @@
}

void FaceRpcElement::threadFunc() {
    INFO("MYH Run Here");
//    INFO("MYH Run Here");
//    ClockTimer ct("FaceRpcElement::threadFunc");
//    {
//
@@ -135,12 +135,12 @@
                    CvUtil::zoomRectEqual(scoredRect.rect, 1.5, 1.5) & cv::Rect(0, 0, image.cols, image.rows)).clone());
                triggerScoredRects.push_back(trackingTrigger->getLastRect());
            } else {
                INFO("No Face Find: " << getProperty("imgKey"));
//                INFO("No Face Find: " << getProperty("imgKey"));
//                DBG("trackingTrigger->triggerOnce(scoredRect) is false  ");
            }
        }
        if (faces.empty()) {
            INFO("No Face Find: " << getProperty("imgKey"));
//            INFO("No Face Find: " << getProperty("imgKey"));
        }
        trackingTrigger->triggerLine();
        //        DBG("faces.size  " << faces.size());

 QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp

@@ -33,8 +33,19 @@
        //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")));
        if(argv[0][0] == '.' && argv[0][1] == '/')
        {
            string pName(argv[0]+2, argv[0]+strlen(argv[0]));
            DBG("pName(argv[0]) :" << pName);
            nsqMsgConsumer = new BasicMsg::Nsq::NsqMsgConsumer("127.0.0.1", "4150", pName,
                                                               to_string(appPref.getIntData("RpcVTIMPort")));
        }else{
            string pName(argv[0]);
            DBG("pName(argv[0]) :" << 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!!");

 QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.cpp

@@ -38,9 +38,19 @@
    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!!");
@@ -59,6 +69,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)) {
                DBG("itor_json.name():" << itor_json.name());
                if (itor_json.name() == "cut_dura_edit") {
                    int cut_max_duration = cfg_val["cut_max_duration"].asInt();
                    int cut_min_duration = cfg_val["cut_min_duration"].asInt();
@@ -83,7 +94,7 @@
                    if (pthis->m_GB28181_Enable) {
                        if (pthis->m_controllers_videoCapElem.find(cam_idx) !=
                            pthis->m_controllers_videoCapElem.end()) {
                            INFO("cam add is " << cfg_val["str_addr"].asString());
                            INFO("cam add is " << cam_idx);
                            pthis->addCamera(cam_idx, "GB28181");
                        }
                    } else {
@@ -100,7 +111,7 @@
                    string cam_idx = cfg_val["str_cam_dev_id"].asString();
                    pthis->removeCamera(cam_idx);
                } else if (itor_json.name() == "cam_startPublish") {
                    string cam_idx = cfg_val["str_cam_dev_id"].asString();
                    string cam_idx = cfg_val["id"].asString();
                    if (pthis->m_GB28181_Enable) {
                        if (pthis->m_controllers_videoCapElem.find(cam_idx) !=
                            pthis->m_controllers_videoCapElem.end()) {
@@ -114,7 +125,7 @@
                        }
                    }
                } else if (itor_json.name() == "cam_stopPublish") {
                    string cam_idx = cfg_val["str_cam_dev_id"].asString();
                    string cam_idx = cfg_val["id"].asString();
                    if (pthis->m_GB28181_Enable) {
                        if (pthis->m_controllers_videoCapElem.find(cam_idx) !=
                            pthis->m_controllers_videoCapElem.end()) {

 QiaoJiaSystem/VideoToImageMulth/RtspAnalysManager.h

@@ -35,9 +35,19 @@
        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!!");