Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2

pansen

2019-02-28 fd6b130ed52e1412ccb1ff8bf7891a90a6f96d31

Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -1062,6 +1062,7 @@
        rec.str_username = QString::fromStdString(value["str_username"].asString());
        rec.str_password = QString::fromStdString(value["str_password"].asString());
        rec.str_brand = QString::fromStdString(value["str_brand"].asString());
        rec.str_reserved = QString::fromStdString(value["str_reserved"].asString());
        type = value["n_type"].asInt();
//        rec_sdk_old = db_c.searchCamSdkTableByCamId(rec.str_cam_dev_id);


 QiaoJiaSystem/VideoToImageMulth/RtspCaptureElement.h

@@ -41,7 +41,7 @@
        std::string m_path;

        // Redis的工具类
        HiredisTool m_redisTool;
//        HiredisTool m_redisTool;

        //对保存到Redis的图片进行计数
        std::atomic<int> m_picCount{0};

 QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.h

@@ -47,7 +47,7 @@
    std::string m_camId;

    //每台摄像机保存到Redis的图片数量的最大值
    const int M_CAM_PIC_MAX_COUNT = 25;
    const int M_CAM_PIC_MAX_COUNT = 3;
};

#endif // VIDEOCAPTUREELEMENT_H