From 72adf535f82d6a6248d2afc954f6dfd190feb34c Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期一, 07 一月 2019 15:34:05 +0800
Subject: [PATCH] 注释DBG
---
QiaoJiaSystem/StructureApp/AppPipeController.cpp | 2 +-
QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp | 12 ++++++------
QiaoJiaSystem/build/DataWebServer | 0
.gitignore | 2 ++
QiaoJiaSystem/DataManagerServer/http_configserver.cpp | 4 ++--
QiaoJiaSystem/build/RapidStructureApp | 0
QiaoJiaSystem/build/VideoAnalysFromHC | 0
QiaoJiaSystem/build/scpToSer.sh | 2 +-
QiaoJiaSystem/StructureApp/NewEncodeVideo.cpp | 3 ++-
QiaoJiaSystem/build/RapidStructureAppRtsp | 0
QiaoJiaSystem/build/StructureApp | 0
11 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index ccb23fd..cc7ee11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@
build-QiaoJiaSystem-unknown-Default/
QiaoJiaSystem/build/glog_dump\.log
+
+QiaoJiaSystem/CMakeLists\.txt\.user
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp b/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
index 6e5fc48..d27d6fd 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.cpp
+++ b/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]),
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index 2d89d86..135ce98 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/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() ||
diff --git a/QiaoJiaSystem/StructureApp/NewEncodeVideo.cpp b/QiaoJiaSystem/StructureApp/NewEncodeVideo.cpp
index 067444f..0cd846f 100644
--- a/QiaoJiaSystem/StructureApp/NewEncodeVideo.cpp
+++ b/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);
}
diff --git a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp b/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
index 280ce50..b9e696c 100644
--- a/QiaoJiaSystem/StructureApp/NewRecordVideoElement.cpp
+++ b/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;
}
diff --git a/QiaoJiaSystem/build/DataWebServer b/QiaoJiaSystem/build/DataWebServer
index d34959e..85c5e9f 100755
--- a/QiaoJiaSystem/build/DataWebServer
+++ b/QiaoJiaSystem/build/DataWebServer
Binary files differ
diff --git a/QiaoJiaSystem/build/RapidStructureApp b/QiaoJiaSystem/build/RapidStructureApp
index a4fd3ca..80f4a38 100755
--- a/QiaoJiaSystem/build/RapidStructureApp
+++ b/QiaoJiaSystem/build/RapidStructureApp
Binary files differ
diff --git a/QiaoJiaSystem/build/RapidStructureAppRtsp b/QiaoJiaSystem/build/RapidStructureAppRtsp
index 4988e29..d0757cf 100755
--- a/QiaoJiaSystem/build/RapidStructureAppRtsp
+++ b/QiaoJiaSystem/build/RapidStructureAppRtsp
Binary files differ
diff --git a/QiaoJiaSystem/build/StructureApp b/QiaoJiaSystem/build/StructureApp
index 005f129..f0d99ff 100755
--- a/QiaoJiaSystem/build/StructureApp
+++ b/QiaoJiaSystem/build/StructureApp
Binary files differ
diff --git a/QiaoJiaSystem/build/VideoAnalysFromHC b/QiaoJiaSystem/build/VideoAnalysFromHC
index 4bc7f6b..5e65833 100755
--- a/QiaoJiaSystem/build/VideoAnalysFromHC
+++ b/QiaoJiaSystem/build/VideoAnalysFromHC
Binary files differ
diff --git a/QiaoJiaSystem/build/scpToSer.sh b/QiaoJiaSystem/build/scpToSer.sh
index 2bc0fcc..1bffb1e 100644
--- a/QiaoJiaSystem/build/scpToSer.sh
+++ b/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
--
Gitblit v1.8.0