Merge svn 3352

pansen

2019-01-10 ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6

 QiaoJiaSystem/StructureApp/FaceExtractElement.cpp

@@ -25,7 +25,7 @@
    }
}

FaceExtractElement::FaceExtractElement(std::string shareMemoryName) :
FaceExtractElement::FaceExtractElement(std::string shareMemoryName, const SdkRule &rule) :
    TimerElement(1000), sharedMemory(nullptr), fdfsClient(nullptr),
    //#todo appPref.setStringData
    faceExtractRpcClient(appPref.getStringData("faceExte.proxy"), appPref.getStringData("faceExte.ip"),
@@ -33,9 +33,9 @@
//    faceExtractRpcClient(/*appPref.getStringData("face.extract.proxy")*/
//        "faceExtractServer", "", 10008, "tcp"),//人脸特征提取 修改成点对点通讯
    faceSearchRpcClient(appPref.getStringData("faceSear.proxy"), appPref.getStringData("faceSear.ip"),
                        appPref.getIntData("faceSear.port"), "tcp")
                        appPref.getIntData("faceSear.port"), "tcp"),
//    faceSearchRpcClient("faceCmServer", "", 10004, "tcp")
{
    m_sdkRule(rule) {
    sharedMemory = new QSharedMemory(QString(shareMemoryName.c_str()));
    if (!sharedMemory->create(4608 * 2592 * 4)) {
        sharedMemory->attach();
@@ -68,8 +68,8 @@
    try {

        string t_camIdex = getProperty("dev_id") + getProperty("ch_id");
        float t_com_sc =
            appPref.getFloatData(t_camIdex + "face.cmp") == -1 ? 75 : appPref.getFloatData(t_camIdex + "face.cmp");
        float t_com_sc = m_sdkRule.nThreshold == 0 ? 75 : m_sdkRule.nThreshold;


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

@@ -146,6 +146,7 @@
                t_json["picSmUrl"] = strImgUrl;//人员抓小图
                //#todo
                t_json["picDate"] = faceExtractQueueTmp[i].scoredRects[j].properties["time"];
                DBG("picDate=" << t_json["picDate"].asString());
//                DBG("timeC ::::B" << t_json["picDate"].asString());
//                t_json["picDate"] = AppUtil::getTimeSecString();