From 041ebd8eba1db688de06e91219361b278d02359c Mon Sep 17 00:00:00 2001
From: hehaoyang <1109196436@qq.com>
Date: Mon, 27 Nov 2023 16:42:57 +0800
Subject: [PATCH] 20231127

---
 .gitignore             | 10 ++++++++++
 app/HxDataBase.h       |  1 +
 app/HxTaskDispatch.cpp |  2 +-
 app/HxUtils.h          |  4 +---
 app/app.pro            |  7 ++-----
 app/main.cpp           |  4 ++--
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index da1bdc0..7c74164 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4359,3 +4359,13 @@ build-app-Desktop_Qt_5_15_2_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/x
 build-app-Desktop_Qt_5_15_2_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/xsaveoptintrin.h.E9A8446C9F7D85BF.idx
 build-app-Desktop_Qt_5_15_2_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/xsavesintrin.h.E32BA660F5D9A89C.idx
 build-app-Desktop_Qt_5_15_2_MinGW_64_bit-Debug/.qtc_clangd/.cache/clangd/index/xtestintrin.h.817F09C79BB6B7DE.idx
+app/.qtc_clangd/.cache/clangd/index/HxDataBase.cpp.6E3E2C94CA038395.idx
+app/.qtc_clangd/.cache/clangd/index/HxDataBase.h.99282D53CC2FFB98.idx
+app/.qtc_clangd/.cache/clangd/index/HxTaskDispatch.cpp.73BE7C68D0F31FE0.idx
+app/.qtc_clangd/.cache/clangd/index/HxTaskDispatch.h.62E61EA6D56F4F19.idx
+app/.qtc_clangd/.cache/clangd/index/HxUtils.h.11694824630D2BD6.idx
+app/.qtc_clangd/.cache/clangd/index/HxVideoDecoder.h.14872E693F0208DC.idx
+app/.qtc_clangd/.cache/clangd/index/HxVideoDevice.cpp.DDEC21AB4860EF34.idx
+app/.qtc_clangd/.cache/clangd/index/HxVideoDevice.h.94A0F0FFDB40C259.idx
+app/.qtc_clangd/.cache/clangd/index/main.cpp.1CBBC0B9EFAD5694.idx
+app/.qtc_clangd/.cache/clangd/index/MvObjectEventDetect.h.9FB0DDE0734D0C98.idx
diff --git a/app/HxDataBase.h b/app/HxDataBase.h
index fd4bafb..8376e5b 100644
--- a/app/HxDataBase.h
+++ b/app/HxDataBase.h
@@ -13,6 +13,7 @@
 
 #define BSD_MAX_CHANNEL 6
 
+#define TEMPORARY_LOG_DIRECTORY         "log"
 #define TEMPORARY_VIDEO_DIRECTORY       "temp/video"
 #define TEMPORARY_ALARM_DIRECTORY       "temp/alarm"
 
diff --git a/app/HxTaskDispatch.cpp b/app/HxTaskDispatch.cpp
index 4be2b7a..e0699bd 100644
--- a/app/HxTaskDispatch.cpp
+++ b/app/HxTaskDispatch.cpp
@@ -438,7 +438,7 @@ void HxTaskDispatch::recording_upload_task(void)
                 }
             }
 
-//            QFile::remove(fullpath);
+            QFile::remove(fullpath);
 
             HxLog::append("recording upload task", QString("%1 delete").arg(filename));
         }
diff --git a/app/HxUtils.h b/app/HxUtils.h
index 1920f07..7994d2e 100644
--- a/app/HxUtils.h
+++ b/app/HxUtils.h
@@ -174,9 +174,7 @@ public:
 
         auto current_time = QDateTime::currentDateTime();
 
-        HxDir::mkdir(QString("log/%1").arg(current_time.toString("yyyyMMdd")));
-
-        QFile file(QString("log/%1/%1.txt").arg(current_time.toString("yyyyMMdd")));
+        QFile file(QString("log/%1.log").arg(current_time.toString("yyyyMMdd")));
 
         if (file.open(QIODevice::WriteOnly | QIODevice::Append))
         {
diff --git a/app/app.pro b/app/app.pro
index c4708ea..60aee2b 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -52,14 +52,11 @@ unix {
     }
 
     contains(DEFINES, USE_ALGORITHM) {
+        LIBS += -L$$PWD/external/npu -lrknn_api
         LIBS += -L$$PWD/external/ -lObjectEventDetect
         PRE_TARGETDEPS += $$PWD/external/libObjectEventDetect.a
 
-        LIBS += -L$$PWD/external/npu -lrknn_api
-        
-#        LIBS += /usr/lib/librga.so
-        LIBS += -L/root/works/librga/libs/Linux/gcc-aarch64 -lrga
-        PRE_TARGETDEPS += /root/works/librga/libs/Linux/gcc-aarch64/librga.a
+        LIBS += /usr/lib/librga.so
         LIBS += /usr/local/lib/librockchip_mpp.so
     }
 
diff --git a/app/main.cpp b/app/main.cpp
index 0a6d4f6..6bd3436 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -3,7 +3,6 @@
 #include <HxDataBase.h>
 #include "HxTaskDispatch.h"
 
-
 #include <opencv2/opencv.hpp>
 
 int main(int argc, char *argv[])
@@ -17,7 +16,8 @@ int main(int argc, char *argv[])
     HxLog::append("application", "startup");
 
     /* 创建数据缓存目录 */
-    HxDir::mkdir({{TEMPORARY_VIDEO_DIRECTORY},
+    HxDir::mkdir({{TEMPORARY_LOG_DIRECTORY},
+                  {TEMPORARY_VIDEO_DIRECTORY},
                   {TEMPORARY_ALARM_DIRECTORY}});
 
     /* 设置最大线程个数 */