feat: 项目代码结构调整

PayloadAPP.pro

@@ -14,59 +14,58 @@ QMAKE_PROJECT_DEPTH = 0
 
 
 SOURCES += \
-    Src/GDDC/gddcCmdDlg.cpp \
-    Src/GDDC/gddcSet.cpp \
-    Src/GDDC/gddcStateInfo.cpp \
-    Src/HomePage/homepagesetingwidget.cpp \
-    cffmpeg_decode.cpp \
-    customwebenginepage.cpp \
-    cwebengineview.cpp \
-    encodemodelcamera.cpp \
-    ffmpegvideodlg.cpp \
-    Src/GDDC/gddcdlg.cpp \
+#    Src/GDDC/gddcCmdDlg.cpp \
+#    Src/GDDC/gddcSet.cpp \
+#    Src/GDDC/gddcStateInfo.cpp \
+#    Src/HomePage/homepagesetingwidget.cpp \
+#    cffmpeg_decode.cpp \
+#    customwebenginepage.cpp \
+#    cwebengineview.cpp \
+#    encodemodelcamera.cpp \
+#    ffmpegvideodlg.cpp \
+#    Src/GDDC/gddcdlg.cpp \
     global.cpp \
-    Src/HomePage/homepagedlg.cpp \
+#    Src/HomePage/homepagedlg.cpp \
     main.cpp \
     mainwindow.cpp \
-    modelcameradlg.cpp \
-    qweb.cpp    \
-    rescueload.cpp \
-    rescueloadwidget.cpp
+#    modelcameradlg.cpp \
+#    qweb.cpp    \
+#    rescueload.cpp \
+#    rescueloadwidget.cpp
 
 HEADERS += \
-    DCFrameCkCmd.h \
-    Src/GDDC/gddcCmdDlg.h \
-    Src/GDDC/gddcSet.h \
-    Src/GDDC/gddcStateInfo.h \
-    Src/GDDC/structDefineMyslef.h \
-    Src/HomePage/homepagesetingwidget.h \
-    cffmpeg_decode.h \
-    customwebenginepage.h \
-    cwebengineview.h \
-    encodemodelcamera.h \
-    ffmpegvideodlg.h \
-    Src/GDDC/gddcdlg.h \
+#    DCFrameCkCmd.h \
+#    Src/GDDC/gddcCmdDlg.h \
+#    Src/GDDC/gddcSet.h \
+#    Src/GDDC/gddcStateInfo.h \
+#    Src/GDDC/structDefineMyslef.h \
+#    Src/HomePage/homepagesetingwidget.h \
+#    cffmpeg_decode.h \
+#    customwebenginepage.h \
+#    cwebengineview.h \
+#    encodemodelcamera.h \
+#    ffmpegvideodlg.h \
+#    Src/GDDC/gddcdlg.h \
     global.h \
-    Src/HomePage/homepagedlg.h \
+#    Src/HomePage/homepagedlg.h \
     mainwindow.h \
-    modelcameradlg.h \
-    qweb.h  \
-    rescueload.h \
-    rescueloadwidget.h
+#    modelcameradlg.h \
+#    qweb.h  \
+#    rescueload.h \
+#    rescueloadwidget.h
 
 FORMS += \
-    Src/GDDC/gddcCmdDlg.ui \
-    Src/GDDC/gddcSet.ui \
-    Src/GDDC/gddcStateInfo.ui \
-    Src/HomePage/homepagesetingwidget.ui \
-    ffmpegvideodlg.ui \
-    Src/GDDC/gddcdlg.ui \
-    Src/HomePage/homepagedlg.ui \
+#    Src/GDDC/gddcCmdDlg.ui \
+#    Src/GDDC/gddcSet.ui \
+#    Src/GDDC/gddcStateInfo.ui \
+#    Src/HomePage/homepagesetingwidget.ui \
+#    ffmpegvideodlg.ui \
+#    Src/GDDC/gddcdlg.ui \
+#    Src/HomePage/homepagedlg.ui \
     mainwindow.ui \
-    modelcameradlg.ui \
-    qweb.ui \
-    rescueloadwidget.ui
-    rescueloadwidget.ui
+#    modelcameradlg.ui \
+#    qweb.ui \
+#    rescueloadwidget.ui
 
 TRANSLATIONS += \
     PayloadAPP_zh_CN.ts
@@ -80,17 +79,23 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 
 RESOURCES += \
     mainwindow.qrc \
-    map/places_map.qrc
+#    map/places_map.qrc
 
 DISTFILES += \
     config.ini \
     res/Qss/qss.qss \
     style.qss
 
-INCLUDEPATH += $$PWD/ffmpeg//include
+INCLUDEPATH += $$PWD/ffmpeg/include \
+                $$PWD/Src/Video/
 
 LIBS += -L$$PWD/ffmpeg/lib  \
         -lavcodec -lavdevice -lavfilter -lavformat -lavutil -lpostproc \
         -lswresample -lswscale
 
-
+include($$PWD/Src/HomePage/HomePage.pri)
+include($$PWD/Src/WebPage/WebPage.pri)
+include($$PWD/Src/ModelCamera/ModelCamera.pri)
+include($$PWD/Src/RescueLoad/RescueLoad.pri)
+include($$PWD/Src/GDDC/GDDC.pri)
+include($$PWD/Src/Video/Video.pri)

Src/GDDC/GDDC.pri

@@ -0,0 +1,20 @@
+SOURCES += \
+        $$PWD/gddcCmdDlg.cpp \
+        $$PWD/gddcdlg.cpp \
+		$$PWD/gddcSet.cpp \
+		$$PWD/gddcStateInfo.cpp \
+	
+HEADERS += \
+        $$PWD/gddcCmdDlg.h \
+        $$PWD/gddcdlg.h \
+        $$PWD/gddcSet.h \
+		$$PWD/gddcStateInfo.h \
+		$$PWD/structDefineMyslef.h \
+		$$PWD/DCFrameCkCmd.h \
+	
+FORMS += \
+        $$PWD/gddcCmdDlg.ui \
+		$$PWD/gddcdlg.ui \
+		$$PWD/gddcSet.ui \
+		$$PWD/gddcStateInfo.ui \
+		

Src/GDDC/gddcdlg.h

@@ -11,7 +11,7 @@
 #include <fstream>
 #include <iostream>
 #include <string>
-#include "cffmpeg_decode.h"
+#include "Src/Video/cffmpeg_decode.h"
 #include "Src/GDDC/gddcSet.h"
 #include <vector>
 #include <QHeaderView>

Src/HomePage/HomePage.pri

@@ -0,0 +1,11 @@
+SOURCES += \
+        $$PWD/homepagesetingwidget.cpp \
+        $$PWD/homepagedlg.cpp
+	
+HEADERS += \
+        $$PWD/homepagesetingwidget.h \
+        $$PWD/homepagedlg.h
+	
+FORMS += \
+        $$PWD/homepagesetingwidget.ui \
+        $$PWD/homepagedlg.ui \

Src/ModelCamera/ModelCamera.pri

@@ -0,0 +1,11 @@
+SOURCES += \
+        $$PWD/encodemodelcamera.cpp \
+        $$PWD/modelcameradlg.cpp \
+	
+HEADERS += \
+        $$PWD/encodemodelcamera.h \
+        $$PWD/modelcameradlg.h \
+	
+FORMS += \
+        $$PWD/modelcameradlg.ui \
+

Src/ModelCamera/modelcameradlg.ui

@@ -634,7 +634,7 @@
   <customwidget>
    <class>ffmpegvideoDlg</class>
    <extends>QWidget</extends>
-   <header>ffmpegvideodlg.h</header>
+   <header location="global">ffmpegvideodlg.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

Src/RescueLoad/RescueLoad.pri

@@ -0,0 +1,13 @@
+SOURCES += \
+        $$PWD/rescueload.cpp \
+        $$PWD/rescueloadwidget.cpp \
+	
+HEADERS += \
+        $$PWD/rescueload.h \
+        $$PWD/rescueloadwidget.h \
+	
+FORMS += \
+        $$PWD/rescueloadwidget.ui \
+		
+RESOURCES += \
+    $$PWD/map/places_map.qrc

Src/Video/Video.pri

@@ -0,0 +1,10 @@
+SOURCES += \
+        $$PWD/cffmpeg_decode.cpp \
+        $$PWD/ffmpegvideodlg.cpp \
+	
+HEADERS += \
+        $$PWD/cffmpeg_decode.h \
+        $$PWD/ffmpegvideodlg.h \
+	
+FORMS += \
+        $$PWD/ffmpegvideodlg.ui \

Src/WebPage/WebPage.pri

@@ -0,0 +1,12 @@
+SOURCES += \
+        $$PWD/customwebenginepage.cpp \
+        $$PWD/cwebengineview.cpp \
+		$$PWD/qweb.cpp
+	
+HEADERS += \
+        $$PWD/customwebenginepage.h \
+        $$PWD/cwebengineview.h \
+        $$PWD/qweb.h
+	
+FORMS += \
+        $$PWD/qweb.ui \

mainwindow.cpp

@@ -1,7 +1,7 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include "CWebEngineView.h"
-#include "CustomWebEnginePage.h"
+#include "Src/WebPage/cwebengineview.h"
+#include "Src/WebPage/CustomWebEnginePage.h"
 #include "global.h"
 #include <QToolBar>
 #include <QFlags>

mainwindow.h

@@ -3,9 +3,9 @@
 
 #include <QMainWindow>
 #include "Src/GDDC/gddcdlg.h"
-#include "modelcameradlg.h"
+#include "Src/ModelCamera/modelcameradlg.h"
 #include "Src/HomePage/homepagedlg.h"
-#include "rescueloadwidget.h"
+#include "Src/RescueLoad/rescueloadwidget.h"
 #include <QPushButton>
 #include <QLabel>
 #include <QAction>