Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

pansen

2019-01-10 4f70d72daca6818a8a7ba36d794b0cd7f985cbcc

Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

 .gitignore

@@ -29,3 +29,5 @@
build-QiaoJiaSystem-unknown-Default/

QiaoJiaSystem/build/glog_dump\.log

QiaoJiaSystem/CMakeLists\.txt\.user

 QiaoJiaSystem/DataManagerServer/http_configserver.cpp

@@ -2559,8 +2559,8 @@
    qint64 t = dt.toMSecsSinceEpoch();
    std::vector<std::string> vec = forEachFile(t_FilePath);
    std::sort(vec.begin(), vec.end());
    DBG("t_FilePath" << t_FilePath);
    DBG("vec.size()" << vec.size());
//    DBG("t_FilePath" << t_FilePath);
//    DBG("vec.size()" << vec.size());
    int size = vec.size();
    for (int i = 0; i < size; ++i) {
        qint64 t1 = QDateTime::fromString(QString::fromStdString(vec[i]),

 QiaoJiaSystem/StructureApp/AppPipeController.cpp

@@ -167,7 +167,7 @@


            if (bRecordVideoEnable) {
                DBG("strNewTime="<<strNewTime<<" camId="<<m_camId);
//                DBG("strNewTime="<<strNewTime<<" camId="<<m_camId);
                newRecordVideoElement.pushImgBuf(strNewTime, imageTemp);
                newRecordVideoElement.setSdkTrigger(faceRpcElement.getTriggerState() ||//TODO
                                                    yoloRpcElement.getTrigger() ||

 QiaoJiaSystem/StructureApp/NewEncodeVideo.cpp

@@ -19,7 +19,7 @@
        return ;
    }
    int size=m_hiredisTool.getSize(src_path);
    DBG("buf_size="<<size<<"  file_name="<<src_path);
  //  DBG("buf_size="<<size<<"  file_name="<<src_path);
    bool fileCreate = false;
    for(int i=0;i<size;++i)
    {
@@ -30,6 +30,7 @@
        if(!fileCreate)
        {
            fileCreate = true;
            DBG("fileCreate buf_size="<<size<<"  file_name="<<src_path);
             videoEncoderElement.threadInitial(getProperty("src_path"),img);

        }

 QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp

@@ -38,10 +38,10 @@

    ImgInfo info;
    getImg(info);
    DBG("m_filename: " << m_filename);
    DBG("recordDelay:" << recordDelay);
    DBG("videoLength:" << videoLength);
    DBG("sdkTrigger:" << sdkTrigger);
//    DBG("m_filename: " << m_filename);
//    DBG("recordDelay:" << recordDelay);
//    DBG("videoLength:" << videoLength);
//    DBG("sdkTrigger:" << sdkTrigger);
    m_hiredisTool.pushImageBuf(m_filename,info.img);
    m_hiredisTool.addFileInfo(m_filename,RECORD_ENDING);
}
@@ -105,7 +105,7 @@
 {
        info=m_imgBufQue.front();
        int size=m_imgBufQue.size();
        DBG("m_imgBufQue size="<<size<<" camId="<<camID<<" fileMin="<<fileMin/2);
//        DBG("m_imgBufQue size="<<size<<" camId="<<camID<<" fileMin="<<fileMin/2);
        if(size>fileMin/2)
        {
             m_imgBufQue.pop();
@@ -195,7 +195,7 @@
 void NewRecordVideoElement::setSdkTrigger(bool isTrigger) {
     if(isTrigger)
     {
         DBG("setSdkTrigger time=" << AppUtil::getTimeUSecString());
//         DBG("setSdkTrigger time=" << AppUtil::getTimeUSecString());
         triggerDelay = 0;
         sdkTrigger = true;
     }

 QiaoJiaSystem/build/DataWebServer

Binary files differ

 QiaoJiaSystem/build/RapidStructureApp

Binary files differ

 QiaoJiaSystem/build/RapidStructureAppRtsp

Binary files differ

 QiaoJiaSystem/build/StructureApp

Binary files differ

 QiaoJiaSystem/build/VideoAnalysFromHC

Binary files differ

 QiaoJiaSystem/build/scpToSer.sh

@@ -9,7 +9,7 @@
    echo $1
    des_pass=123
    expect -c "
    spawn scp ${CUR_PATH}"/"$1 basic@192.168.1.156:/home/basic/Apps/QiaoJiaSystem/build
    spawn scp -P44100 ${CUR_PATH}"/"$1 dell@58.118.225.79:/home/dell/Apps/QiaoJiaSystem/build 
    expect \"password:\"
    send \"${des_pass}\r\"
    expect eof