Merge pull request 'WuChengBo' (#5) from WuChengBo into main

Reviewed-on: CaoYuhui/PayloadAPP#5

PayloadAPP.pro

@@ -14,6 +14,18 @@ QMAKE_PROJECT_DEPTH = 0
 
 
 SOURCES += \
+<<<<<<< HEAD
+#    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 \
+=======
     SDFPDlg.cpp \
     Src/GDDC/gddcCmdDlg.cpp \
     Src/GDDC/gddcSet.cpp \
@@ -24,15 +36,31 @@ SOURCES += \
     cwebengineview.cpp \
     ffmpegvideodlg.cpp \
     Src/GDDC/gddcdlg.cpp \
+>>>>>>> 9cb45d43939c192a61d4fe2800b69ee9f4dd63d9
     global.cpp \
-    Src/HomePage/homepagedlg.cpp \
+#    Src/HomePage/homepagedlg.cpp \
     main.cpp \
     mainwindow.cpp \
-    qweb.cpp \
+#    modelcameradlg.cpp \
-    rescueload.cpp \
+#    qweb.cpp    \
-    rescueloadwidget.cpp
+#    rescueload.cpp \
+#    rescueloadwidget.cpp
 
 HEADERS += \
+<<<<<<< HEAD
+#    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 \
     SDFPDlg.h \
     Src/GDDC/gddcCmdDlg.h \
@@ -45,14 +73,25 @@ HEADERS += \
     cwebengineview.h \
     ffmpegvideodlg.h \
     Src/GDDC/gddcdlg.h \
+>>>>>>> 9cb45d43939c192a61d4fe2800b69ee9f4dd63d9
     global.h \
-    Src/HomePage/homepagedlg.h \
+#    Src/HomePage/homepagedlg.h \
     mainwindow.h \
-    qweb.h \
+#    modelcameradlg.h \
-    rescueload.h \
+#    qweb.h  \
-    rescueloadwidget.h
+#    rescueload.h \
+#    rescueloadwidget.h
 
 FORMS += \
+<<<<<<< HEAD
+#    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 \
+=======
     SDFPDlg.ui \
     Src/GDDC/gddcCmdDlg.ui \
     Src/GDDC/gddcSet.ui \
@@ -61,9 +100,11 @@ FORMS += \
     ffmpegvideodlg.ui \
     Src/GDDC/gddcdlg.ui \
     Src/HomePage/homepagedlg.ui \
+>>>>>>> 9cb45d43939c192a61d4fe2800b69ee9f4dd63d9
     mainwindow.ui \
-    qweb.ui \
+#    modelcameradlg.ui \
-    rescueloadwidget.ui
+#    qweb.ui \
+#    rescueloadwidget.ui
 
 TRANSLATIONS += \
     PayloadAPP_zh_CN.ts
@@ -77,17 +118,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)

PayloadAPP.pro.autosave

@@ -0,0 +1,104 @@
+QT       += core gui webenginewidgets
+QT       += network
+QT       += quickwidgets qml
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+CONFIG += c++17
+# CONFIG += console
+QMAKE_PROJECT_DEPTH = 0
+# You can make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.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 \
+    SDFPDlg.cpp \
+    global.cpp \
+#    Src/HomePage/homepagedlg.cpp \
+    main.cpp \
+    mainwindow.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 \
+    SDFPDlg.h \
+    global.h \
+#    Src/HomePage/homepagedlg.h \
+    mainwindow.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 \
+    SDFPDlg.ui \
+    mainwindow.ui \
+#    modelcameradlg.ui \
+#    qweb.ui \
+#    rescueloadwidget.ui
+
+TRANSLATIONS += \
+    PayloadAPP_zh_CN.ts
+CONFIG += lrelease
+CONFIG += embed_translations
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /opt/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target
+
+RESOURCES += \
+    mainwindow.qrc \
+#    map/places_map.qrc
+
+DISTFILES += \
+    config.ini \
+    res/Qss/qss.qss \
+    style.qss
+
+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/encodemodelcamera.cpp

@@ -0,0 +1,34 @@
+#include "encodemodelcamera.h"
+
+EncodeModelCamera::EncodeModelCamera(QObject *parent)
+    : QObject{parent}
+{
+    cameraUDP = new QUdpSocket(this);
+    //cameraUDP->bind(QHostAddress("198.18.0.1"),8080);
+
+    cmdArray.insert(0,0xFA);
+    cmdArray.insert(1,0xFA);
+}
+
+/**
+ * @brief 发送三维建模相机指令
+ * @param cmdDataArray 指令ID与负载数据
+ */
+void EncodeModelCamera::SendCMD(QByteArray cmdDataArray)
+{
+    cmdArray.clear();
+    cmdArray.insert(0,0xFA);
+    cmdArray.insert(1,0xFA);
+
+    cmdArray.append(cmdDataArray);
+    uint8_t* data = reinterpret_cast<uint8_t*>(cmdArray.data());
+    uint16_t crc16 = calCRC16(data,cmdArray.size());
+
+    QByteArray byteArray;
+    QDataStream stream(&byteArray, QIODevice::WriteOnly);
+    stream.setByteOrder(QDataStream::BigEndian);
+    stream << crc16;
+    cmdArray.append(byteArray);
+
+    cameraUDP->writeDatagram(cmdArray,QHostAddress("127.0.0.1"),8080);
+}

Src/ModelCamera/encodemodelcamera.h

@@ -0,0 +1,24 @@
+#ifndef ENCODEMODELCAMERA_H
+#define ENCODEMODELCAMERA_H
+
+#include <QObject>
+#include <QUdpSocket>
+#include <QByteArray>
+#include <QDataStream>
+#include "global.h"
+
+class EncodeModelCamera : public QObject
+{
+    Q_OBJECT
+public:
+    explicit EncodeModelCamera(QObject *parent = nullptr);
+private:
+    QByteArray cmdArray;
+    QUdpSocket* cameraUDP;
+public slots:
+    void SendCMD(QByteArray cmdDataArray);
+
+signals:
+};
+
+#endif // ENCODEMODELCAMERA_H

Src/ModelCamera/modelcameradlg.cpp

@@ -0,0 +1,250 @@
+#include "modelcameradlg.h"
+#include "ui_modelcameradlg.h"
+
+ModelCameraDlg::ModelCameraDlg(QWidget *parent)
+    : QDialog(parent)
+    , ui(new Ui::ModelCameraDlg)
+{
+    ui->setupUi(this);
+
+    InitialComboBox();
+
+    cameraCMDThread = new QThread(this);
+    encodeModelCamera = new EncodeModelCamera(this);
+    encodeModelCamera->moveToThread(cameraCMDThread);
+    cameraCMDThread->start();
+    connect(this,&ModelCameraDlg::on_sendCmdData_signal,encodeModelCamera,&EncodeModelCamera::SendCMD);
+}
+
+ModelCameraDlg::~ModelCameraDlg()
+{
+    delete ui;
+    if(encodeModelCamera!=nullptr) delete encodeModelCamera;
+    if(cameraCMDThread!=nullptr)
+    {
+        cameraCMDThread->quit();
+        cameraCMDThread->wait();
+    }
+}
+
+void ModelCameraDlg::InitialComboBox()
+{
+    ui->photoTimeDbSpinBox->setSuffix("s");
+
+    //快门速度
+    ui->SSComboBox->insertItem(0,"1/100");
+    ui->SSComboBox->insertItem(1,"1/125");
+    ui->SSComboBox->insertItem(2,"1/160");
+    ui->SSComboBox->insertItem(3,"1/200");
+    ui->SSComboBox->insertItem(4,"1/250");
+    ui->SSComboBox->insertItem(5,"1/320");
+    ui->SSComboBox->insertItem(6,"1/400");
+    ui->SSComboBox->insertItem(7,"1/500");
+    ui->SSComboBox->insertItem(8,"1/640");
+    ui->SSComboBox->insertItem(9,"1/800");
+    ui->SSComboBox->insertItem(10,"1/1000");
+    ui->SSComboBox->insertItem(11,"1/1250");
+    ui->SSComboBox->insertItem(12,"1/1600");
+    ui->SSComboBox->insertItem(13,"1/2000");
+
+    //ISO
+    ui->ISOComboBox->insertItem(0,"50~800");
+    ui->ISOComboBox->insertItem(1,"50~1600");
+    ui->ISOComboBox->insertItem(2,"50");
+    ui->ISOComboBox->insertItem(3,"100");
+    ui->ISOComboBox->insertItem(4,"125");
+    ui->ISOComboBox->insertItem(5,"160");
+    ui->ISOComboBox->insertItem(6,"200");
+    ui->ISOComboBox->insertItem(7,"250");
+    ui->ISOComboBox->insertItem(8,"320");
+    ui->ISOComboBox->insertItem(9,"400");
+    ui->ISOComboBox->insertItem(10,"500");
+    ui->ISOComboBox->insertItem(11,"640");
+    ui->ISOComboBox->insertItem(12,"800");
+    ui->ISOComboBox->insertItem(13,"1000");
+    ui->ISOComboBox->insertItem(14,"1250");
+    ui->ISOComboBox->insertItem(15,"1600");
+
+    //AWB
+    ui->AWBComboBox->insertItem(0,"自动");
+    ui->AWBComboBox->insertItem(1,"日光");
+
+    //相机模式
+    ui->cameraModelComboBox->insertItem(0,"拍照模式");
+    ui->cameraModelComboBox->insertItem(1,"录像模式");
+
+    //色彩模式
+    ui->ColorModelComboBox->insertItem(0,"艳丽");
+    ui->ColorModelComboBox->insertItem(1,"标准");
+}
+
+//开始拍照点击事件
+void ModelCameraDlg::on_startPhotoBtn_clicked()
+{
+    quint8 photoTime = ui->photoTimeDbSpinBox->value() * 10;
+
+    cmdDataArray.clear();
+    cmdDataArray.insert(0,0x02);
+    cmdDataArray.insert(1,0xA1);
+    cmdDataArray.insert(2,0x03);
+    cmdDataArray.insert(3,0x01);
+    cmdDataArray.insert(4,photoTime);
+    emit on_sendCmdData_signal(cmdDataArray);
+}
+
+//停止拍照
+void ModelCameraDlg::on_stopPhotoBtn_clicked()
+{
+    cmdDataArray.clear();
+    cmdDataArray.insert(0,0x01);
+    cmdDataArray.insert(1,0xA1);
+    cmdDataArray.insert(2,0x03);
+    cmdDataArray.insert(3,QByteArray(1, char(0x00)));
+    emit on_sendCmdData_signal(cmdDataArray);
+}
+
+//开机
+void ModelCameraDlg::on_ONBtn_clicked()
+{
+    cmdDataArray.clear();
+    cmdDataArray.insert(0,0x01);
+    cmdDataArray.insert(1,0xA1);
+    cmdDataArray.insert(2,0x01);
+    cmdDataArray.insert(3,0x01);
+    emit on_sendCmdData_signal(cmdDataArray);
+}
+
+//关机
+void ModelCameraDlg::on_OFFBtn_clicked()
+{
+    cmdDataArray.clear();
+    cmdDataArray.insert(0,0x01);
+    cmdDataArray.insert(1,0xA1);
+    cmdDataArray.insert(2,0x01);
+    cmdDataArray.insert(3,QByteArray(1, char(0x00)));
+    emit on_sendCmdData_signal(cmdDataArray);
+}
+
+//播放视频
+void ModelCameraDlg::on_pushButton_5_clicked()
+{
+    QString str = ui->pushButton_5->text();
+    if(str == "播放视频")
+    {
+        QString ip = ui->videoIPLineEdit->text();
+        ui->cameraVideoWidget->play();
+        ui->cameraVideoWidget->setUrl(ip);
+        ui->pushButton_5->setText("暂停播放");
+    }
+    else
+    {
+        ui->cameraVideoWidget->stop();
+        ui->pushButton_5->setText("播放视频");
+    }
+}
+
+//快门速度
+void ModelCameraDlg::on_SSComboBox_activated(int index)
+{
+    QString tmp = ui->SSComboBox->itemText(index);
+    QString strSS = tmp.right(tmp.length()-2);
+    qint16 hexValue = strSS.toShort();//
+
+    cmdDataArray.clear();
+    cmdDataArray.insert(0,0x04);
+    cmdDataArray.insert(1,0xA2);
+    cmdDataArray.insert(2,0x01);
+    cmdDataArray.insert(3,0x01);
+
+    QByteArray byteArray;
+    byteArray.resize(2);
+    qToBigEndian(hexValue, (char*)byteArray.data());
+
+    cmdDataArray.append(byteArray);
+    cmdDataArray.insert(6,0xFF);
+    emit on_sendCmdData_signal(cmdDataArray);
+}
+
+//ISO
+void ModelCameraDlg::on_ISOComboBox_activated(int index)
+{
+    QString strSS = ui->ISOComboBox->itemText(index);
+    if(index == 0) strSS = "-2";
+    else if(index == 1) strSS = "-1";
+    qint16 hexValue = strSS.toShort();//
+
+    cmdDataArray.clear();
+    cmdDataArray.insert(0,0x04);
+    cmdDataArray.insert(1,0xA2);
+    cmdDataArray.insert(2,0x02);
+    cmdDataArray.insert(3,0x01);
+
+    QByteArray byteArray;
+    byteArray.resize(2);
+    qToBigEndian(hexValue, (char*)byteArray.data());
+
+    cmdDataArray.append(byteArray);
+    cmdDataArray.insert(6,0xFF);
+
+    emit on_sendCmdData_signal(cmdDataArray);
+}
+
+//AWB
+void ModelCameraDlg::on_AWBComboBox_activated(int index)
+{
+    quint16 hexValue = index + 1;//
+
+    cmdDataArray.clear();
+    cmdDataArray.insert(0,0x04);
+    cmdDataArray.insert(1,0xA2);
+    cmdDataArray.insert(2,0x06);
+    cmdDataArray.insert(3,0x01);
+
+    QByteArray byteArray;
+    byteArray.resize(2);
+    qToBigEndian(hexValue, (uchar*)byteArray.data());
+
+    cmdDataArray.append(byteArray);
+    cmdDataArray.insert(6,0xFF);
+
+    emit on_sendCmdData_signal(cmdDataArray);
+}
+
+//相机模式
+void ModelCameraDlg::on_cameraModelComboBox_activated(int index)
+{
+    quint16 hexValue = index + 1;//
+
+    cmdDataArray.clear();
+    cmdDataArray.insert(0,0x01);
+    cmdDataArray.insert(1,0xA1);
+    cmdDataArray.insert(2,0x02);
+    if(index == 0)
+        cmdDataArray.insert(3,QByteArray(1, char(0x00)));
+    else if(index == 1)
+        cmdDataArray.insert(3,0x01);
+
+    emit on_sendCmdData_signal(cmdDataArray);
+}
+
+//色彩模式
+void ModelCameraDlg::on_ColorModelComboBox_activated(int index)
+{
+    quint16 hexValue = index + 1;//
+
+    cmdDataArray.clear();
+    cmdDataArray.insert(0,0x04);
+    cmdDataArray.insert(1,0xA2);
+    cmdDataArray.insert(2,0x08);
+    cmdDataArray.insert(3,0x01);
+
+    QByteArray byteArray;
+    byteArray.resize(2);
+    qToBigEndian(hexValue, (uchar*)byteArray.data());
+
+    cmdDataArray.append(byteArray);
+    cmdDataArray.insert(6,0xFF);
+
+    emit on_sendCmdData_signal(cmdDataArray);
+}
+

Src/ModelCamera/modelcameradlg.h

@@ -0,0 +1,53 @@
+#ifndef MODELCAMERADLG_H
+#define MODELCAMERADLG_H
+
+#include <QDialog>
+#include <QByteArray>
+#include <QThread>
+#include "encodemodelcamera.h"
+#include <qendian.h>
+
+namespace Ui {
+class ModelCameraDlg;
+}
+
+class ModelCameraDlg : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit ModelCameraDlg(QWidget *parent = nullptr);
+    ~ModelCameraDlg();
+signals:
+    void on_sendCmdData_signal(QByteArray cmdDataArray);
+private slots:
+    void on_startPhotoBtn_clicked();
+
+    void on_stopPhotoBtn_clicked();
+
+    void on_ONBtn_clicked();
+
+    void on_OFFBtn_clicked();
+
+    void on_pushButton_5_clicked();
+
+    void on_SSComboBox_activated(int index);
+
+    void on_ISOComboBox_activated(int index);
+
+    void on_AWBComboBox_activated(int index);
+
+    void on_cameraModelComboBox_activated(int index);
+
+    void on_ColorModelComboBox_activated(int index);
+
+private:
+    void InitialComboBox();
+private:
+    Ui::ModelCameraDlg *ui;
+    QThread* cameraCMDThread;
+    QByteArray cmdDataArray;
+    EncodeModelCamera* encodeModelCamera;
+};
+
+#endif // MODELCAMERADLG_H

Src/ModelCamera/modelcameradlg.ui

@@ -0,0 +1,643 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ModelCameraDlg</class>
+ <widget class="QDialog" name="ModelCameraDlg">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>907</width>
+    <height>917</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="7,3">
+   <property name="spacing">
+    <number>2</number>
+   </property>
+   <property name="leftMargin">
+    <number>4</number>
+   </property>
+   <property name="topMargin">
+    <number>4</number>
+   </property>
+   <property name="rightMargin">
+    <number>4</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::Shape::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Shadow::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>2</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="ffmpegvideoDlg" name="cameraVideoWidget" native="true">
+        <property name="minimumSize">
+         <size>
+          <width>600</width>
+          <height>400</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="frame_2">
+     <property name="frameShape">
+      <enum>QFrame::Shape::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Shadow::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="2,2,5">
+      <property name="spacing">
+       <number>2</number>
+      </property>
+      <property name="leftMargin">
+       <number>2</number>
+      </property>
+      <property name="topMargin">
+       <number>2</number>
+      </property>
+      <property name="rightMargin">
+       <number>2</number>
+      </property>
+      <property name="bottomMargin">
+       <number>2</number>
+      </property>
+      <item>
+       <widget class="QGroupBox" name="groupBox">
+        <property name="title">
+         <string>拍照指令</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignCenter</set>
+        </property>
+        <property name="flat">
+         <bool>false</bool>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_3" stretch="2,1">
+         <property name="spacing">
+          <number>4</number>
+         </property>
+         <property name="leftMargin">
+          <number>4</number>
+         </property>
+         <property name="topMargin">
+          <number>4</number>
+         </property>
+         <property name="rightMargin">
+          <number>4</number>
+         </property>
+         <property name="bottomMargin">
+          <number>4</number>
+         </property>
+         <item>
+          <layout class="QGridLayout" name="gridLayout_2">
+           <property name="topMargin">
+            <number>4</number>
+           </property>
+           <property name="horizontalSpacing">
+            <number>11</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>12</number>
+           </property>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>拍照间隔：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QDoubleSpinBox" name="photoTimeDbSpinBox">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="buttonSymbols">
+              <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
+             </property>
+             <property name="decimals">
+              <number>1</number>
+             </property>
+             <property name="minimum">
+              <double>0.800000000000000</double>
+             </property>
+             <property name="stepType">
+              <enum>QAbstractSpinBox::StepType::DefaultStepType</enum>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QPushButton" name="startPhotoBtn">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>开始拍照</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QPushButton" name="stopPhotoBtn">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>停止拍照</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QPushButton" name="ONBtn">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>开机</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QPushButton" name="OFFBtn">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>关机</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout_2">
+           <property name="spacing">
+            <number>9</number>
+           </property>
+           <item>
+            <widget class="QLabel" name="label_21">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>拉流地址：</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="videoIPLineEdit"/>
+           </item>
+           <item>
+            <widget class="QPushButton" name="pushButton_5">
+             <property name="text">
+              <string>播放视频</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="groupBox_2">
+        <property name="title">
+         <string>设置相机参数</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignCenter</set>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <property name="spacing">
+          <number>4</number>
+         </property>
+         <property name="leftMargin">
+          <number>4</number>
+         </property>
+         <property name="topMargin">
+          <number>4</number>
+         </property>
+         <property name="rightMargin">
+          <number>4</number>
+         </property>
+         <property name="bottomMargin">
+          <number>4</number>
+         </property>
+         <item>
+          <layout class="QFormLayout" name="formLayout">
+           <property name="horizontalSpacing">
+            <number>8</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>16</number>
+           </property>
+           <property name="topMargin">
+            <number>4</number>
+           </property>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_10">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>快门速度：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QComboBox" name="SSComboBox"/>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_16">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>ISO：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QComboBox" name="ISOComboBox"/>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_17">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>AWB模式：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QComboBox" name="AWBComboBox"/>
+           </item>
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_18">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>相机模式：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <widget class="QComboBox" name="cameraModelComboBox"/>
+           </item>
+           <item row="4" column="0">
+            <widget class="QLabel" name="label_19">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>色彩模式：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QComboBox" name="ColorModelComboBox"/>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="groupBox_3">
+        <property name="title">
+         <string>相机状态</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignCenter</set>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <property name="spacing">
+          <number>4</number>
+         </property>
+         <property name="leftMargin">
+          <number>4</number>
+         </property>
+         <property name="topMargin">
+          <number>4</number>
+         </property>
+         <property name="rightMargin">
+          <number>4</number>
+         </property>
+         <property name="bottomMargin">
+          <number>4</number>
+         </property>
+         <item>
+          <layout class="QGridLayout" name="gridLayout" columnstretch="2,3,2,3">
+           <property name="sizeConstraint">
+            <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
+           </property>
+           <property name="topMargin">
+            <number>4</number>
+           </property>
+           <property name="horizontalSpacing">
+            <number>8</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>4</number>
+           </property>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_2">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>开关机状态：</string>
+             </property>
+             <property name="indent">
+              <number>2</number>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="lineEdit"/>
+           </item>
+           <item row="0" column="2">
+            <widget class="QLabel" name="label_11">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>温度：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="3">
+            <widget class="QLineEdit" name="lineEdit_11"/>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_15">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>图传状态：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="lineEdit_13"/>
+           </item>
+           <item row="1" column="2">
+            <widget class="QLabel" name="label_3">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>相片总数：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="3">
+            <widget class="QLineEdit" name="lineEdit_2"/>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_9">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>快门速度：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QLineEdit" name="lineEdit_10"/>
+           </item>
+           <item row="2" column="2">
+            <widget class="QLabel" name="label_4">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>A照片数：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="3">
+            <widget class="QLineEdit" name="lineEdit_3"/>
+           </item>
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_14">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>ISO范围值：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <widget class="QLineEdit" name="lineEdit_14"/>
+           </item>
+           <item row="3" column="2">
+            <widget class="QLabel" name="label_7">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>D照片数：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="3">
+            <widget class="QLineEdit" name="lineEdit_6"/>
+           </item>
+           <item row="4" column="0">
+            <widget class="QLabel" name="label_12">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>AWB：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QLineEdit" name="lineEdit_9"/>
+           </item>
+           <item row="4" column="2">
+            <widget class="QLabel" name="label_5">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>S照片数：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="3">
+            <widget class="QLineEdit" name="lineEdit_4"/>
+           </item>
+           <item row="5" column="0">
+            <widget class="QLabel" name="label_20">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>相机模式：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="1">
+            <widget class="QLineEdit" name="lineEdit_15"/>
+           </item>
+           <item row="5" column="2">
+            <widget class="QLabel" name="label_6">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>W照片数：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="3">
+            <widget class="QLineEdit" name="lineEdit_5"/>
+           </item>
+           <item row="6" column="0">
+            <widget class="QLabel" name="label_13">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>色彩模式：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="1">
+            <widget class="QLineEdit" name="lineEdit_12"/>
+           </item>
+           <item row="6" column="2">
+            <widget class="QLabel" name="label_8">
+             <property name="font">
+              <font>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>X照片数：</string>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="3">
+            <widget class="QLineEdit" name="lineEdit_7"/>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ffmpegvideoDlg</class>
+   <extends>QWidget</extends>
+   <header location="global">ffmpegvideodlg.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

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/RescueLoad/rescueloadwidget.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1106</width>
-    <height>684</height>
+    <height>689</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -299,7 +299,7 @@ background-color:transparent;
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -315,7 +315,7 @@ background-color:transparent;
            <string>载荷IP:</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignCenter</set>
+           <set>Qt::AlignmentFlag::AlignCenter</set>
           </property>
           <property name="wordWrap">
            <bool>false</bool>
@@ -341,7 +341,7 @@ background-color:transparent;
            <string>端口:</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignCenter</set>
+           <set>Qt::AlignmentFlag::AlignCenter</set>
           </property>
           <property name="wordWrap">
            <bool>false</bool>
@@ -383,7 +383,7 @@ background-color:transparent;
         <item>
          <spacer name="horizontalSpacer_8">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -400,7 +400,7 @@ background-color:transparent;
         <item row="0" column="0">
          <spacer name="horizontalSpacer_2">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -441,7 +441,7 @@ background-color:transparent;
         <item row="0" column="2">
          <spacer name="horizontalSpacer_5">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -467,7 +467,7 @@ background-color:transparent;
         <item row="0" column="4">
          <spacer name="horizontalSpacer_3">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -480,7 +480,7 @@ background-color:transparent;
         <item row="1" column="0">
          <spacer name="horizontalSpacer_4">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -512,7 +512,7 @@ background-color:transparent;
         <item row="1" column="2">
          <spacer name="horizontalSpacer_7">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -538,7 +538,7 @@ background-color:transparent;
         <item row="1" column="4">
          <spacer name="horizontalSpacer_6">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -582,7 +582,7 @@ background-color:transparent;
         <item>
          <spacer name="verticalSpacer_3">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -603,11 +603,11 @@ background-color:transparent;
            <string>名单配置模式</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignCenter</set>
+           <set>Qt::AlignmentFlag::AlignCenter</set>
           </property>
          </widget>
         </item>
-        <item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
+        <item alignment="Qt::AlignmentFlag::AlignHCenter|Qt::AlignmentFlag::AlignVCenter">
          <widget class="QComboBox" name="namelistConfigType">
           <property name="minimumSize">
            <size>
@@ -635,7 +635,7 @@ background-color:transparent;
         <item>
          <spacer name="verticalSpacer">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -684,7 +684,7 @@ background-color:transparent;
         <item>
          <spacer name="verticalSpacer_2">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>

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/Video/ffmpegvideodlg.ui

@@ -23,7 +23,7 @@
    <string>Form</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
  </widget>
  <resources/>

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 \

global.cpp

@@ -135,4 +135,24 @@ QString g_ToolBtnSelStyle =   /**选中情况下样式**/
     "border-color: #dcdde1;"
     "}";
 
+/**
+ * @brief calCRC16
+ * @param cpu8Data
+ * @param u16Len
+ * @return
+ */
+uint16_t calCRC16(const uint8_t *cpu8Data, uint16_t u16Len)
+{
+    uint8_t u8X;
+    uint16_t u16CRC = 0X8848;
+
+    while (u16Len--)
+    {
+        u8X = u16CRC >> 8 ^ *cpu8Data++;
+        u8X ^= u8X >> 4;
+        u16CRC = (u16CRC << 8) ^ ((uint16_t)(u8X << 12)) ^ ((uint16_t)(u8X << 5)) ^ ((uint16_t)u8X);
+    }
+    return u16CRC;
+}
+
 global::global() {}

global.h

@@ -12,6 +12,13 @@ extern QString g_ToolBtnStyle;
 extern QString g_ToolBtnSelStyle;
 /*******************系统颜色***************************************/
 
+/**
+ * @brief calCRC16
+ * @param cpu8Data
+ * @param u16Len
+ * @return
+ */
+extern uint16_t calCRC16(const uint8_t *cpu8Data, uint16_t u16Len);
 
 class global
 {

mainwindow.cpp

@@ -1,7 +1,7 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include "CWebEngineView.h"
+#include "Src/WebPage/cwebengineview.h"
-#include "CustomWebEnginePage.h"
+#include "Src/WebPage/CustomWebEnginePage.h"
 #include "global.h"
 #include <QToolBar>
 #include <QFlags>
@@ -54,7 +54,7 @@ MainWindow::~MainWindow()
     delete mWeb;
     delete process;
     delete ui;
-
+    if(m_ModelCameraDlg!=nullptr) delete m_ModelCameraDlg;
 }
 /**
  * @brief MainWindow::initFile 初始化配置文件 .ini
@@ -83,6 +83,8 @@ void MainWindow::initWindow()
     m_SDFPDlg       = new SDFPDlg(this);
     m_GDDCdlg       = new GDDCdlg(this);
     m_HomePagedlg   = new HomePageDlg(this);
+
+    m_ModelCameraDlg = new ModelCameraDlg(this);
     m_rescueLoadWidget = new RescueLoadWidget(this);
 
     //使用信号槽函数获取配置文件中的IP
@@ -148,7 +150,7 @@ void MainWindow::initWindow()
     ui->stackedWidget->addWidget(adHocNetworkWeb);
     ui->stackedWidget->addWidget(satelliteCommWeb);
     ui->stackedWidget->addWidget(m_rescueLoadWidget);
-
+    ui->stackedWidget->addWidget(m_ModelCameraDlg);
     // 初始栈窗口显示主页
     ui->stackedWidget->setCurrentWidget(m_SDFPDlg);
 
@@ -317,7 +319,8 @@ void MainWindow::toolButton_2_clicked()
 {
     changeBtnColor(2);
     //m_GDDCdlg->move(130,80);
-    m_GDDCdlg->show();  //显示窗口
+    //m_GDDCdlg->show();  //显示窗口
+
     ui->stackedWidget->setCurrentWidget(m_GDDCdlg);
 }
 
@@ -333,6 +336,7 @@ void MainWindow::toolButton_3_clicked()
 void MainWindow::toolButton_4_clicked()
 {
     changeBtnColor(4);
+
     // mWeb->load(QUrl("http://192.168.1.10"));
     // mWeb->show();
     ui->stackedWidget->setCurrentWidget(adHocNetworkWeb);
@@ -362,6 +366,7 @@ void MainWindow::toolButton_6_clicked()
 void MainWindow::toolButton_7_clicked()
 {
     changeBtnColor(7);
+
     ui->stackedWidget->setCurrentWidget(m_rescueLoadWidget);
 }
 
@@ -369,7 +374,12 @@ void MainWindow::toolButton_7_clicked()
 void MainWindow::toolButton_8_clicked()
 {
     changeBtnColor(8);
-    ui->stackedWidget->setCurrentWidget(mWeb);
+    ui->stackedWidget->setCurrentWidget(m_ModelCameraDlg);
+
+    //ui->stackedWidget->setCurrentWidget(mWeb);
+    //process->setWorkingDirectory("D:/QTdemo/playerApp/app"); // 设置工作目录
+    //process->start("D:/QTdemo/playerApp/app/XCOM V2.0.exe"); // 启动exe并传递参数
+
     //process->setWorkingDirectory("D:/Software/TCPUDPDbg"); // 设置工作目录
     //process->start("D:/Software/TCPUDPDbg/TCPUDPDbg.exe"); // 启动exe并传递参数
 }

mainwindow.h

@@ -3,9 +3,10 @@
 
 #include <QMainWindow>
 #include "Src/GDDC/gddcdlg.h"
+#include "Src/ModelCamera/modelcameradlg.h"
 #include "Src/HomePage/homepagedlg.h"
+#include "Src/RescueLoad/rescueloadwidget.h"
 #include "SDFPDlg.h"
-#include "rescueloadwidget.h"
 #include <QPushButton>
 #include <QLabel>
 #include <QAction>
@@ -58,10 +59,10 @@ public:
     SDFPDlg *m_SDFPDlg;
     //QWeb *m_qWeb;
     QWebEngineView *mWeb;
+    ModelCameraDlg* m_ModelCameraDlg;
     QWebEngineView *lLinkWeb;//L链
     QWebEngineView *adHocNetworkWeb;//自组网
     QWebEngineView *satelliteCommWeb;//卫通
-
 private:
     QProcess *process;
     QString exeDirPathName = "";