CMakeLists.txt

@@ -13,7 +13,7 @@ set(CMAKE_AUTORCC ON)
 # set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
 # include(QWindowKit)
 
-find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets WebEngineWidgets OpenGLWidgets Network SerialPort)
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets OpenGLWidgets Network SerialPort)
 
 qt_standard_project_setup()
 

src/CMakeLists.txt

@@ -12,8 +12,6 @@ qt_add_executable(VideoClient
     streamaddrsettingsdlg.h streamaddrsettingsdlg.cpp streamaddrsettingsdlg.ui
     videoControl.h videoControl.ui videoControl.cpp
     wprogressbar.h wprogressbar.cpp
-    webmapwidget.h webmapwidget.cpp
-
 )
 
 qt6_add_resources(VideoClient "resources"
@@ -38,7 +36,6 @@ target_link_libraries(VideoClient
         Qt6::OpenGLWidgets
         Qt6::Network
         Qt6::SerialPort
-        Qt6::WebEngineWidgets
         video
         # QWindowKit::Widgets
         # WidgetFrame

src/commandwidget.cpp

@@ -6,142 +6,254 @@ CommandWidget::CommandWidget(QWidget *parent)
     : QWidget(parent), ui(new Ui::CommandWidget) {
     ui->setupUi(this);
 
-    m_commandUdpSocket = new QUdpSocket(this);
+    udpSocket = new QUdpSocket(this);
-    // 将套接字绑定到指定端口
+
-    if (m_commandUdpSocket->bind(QHostAddress::Any, 1200)) {
+    ui->videoLayout1TBtn->setIcon(QIcon(":/images/videolayout1.png"));
-        qDebug() << "UDP 套接字已绑定到端口 1200";
+    ui->videoLayout4TBtn->setIcon(QIcon(":/images/videolayout4.png"));
-    } else {
-        qDebug() << "绑定 UDP 套接字失败";
-    }
 }
 
 CommandWidget::~CommandWidget() {
     delete ui;
-    if (m_commandUdpSocket) m_commandUdpSocket->deleteLater();
+    if (udpSocket) udpSocket->deleteLater();
 }
 
+// 连接
+void CommandWidget::on_startConnectionToolBtn_clicked() {
+    ui->startConnectionToolBtn->setDisabled(true);
+
+    if (!g_networkSettingInfo) {
+        qWarning() << "Network settings are not initialized!";
+        return;
+    }
+
+    int dataSourceType = g_networkSettingInfo->value("DataSource").toInt();
+    QString groupName = "";
+
+    switch (dataSourceType) {
+    case 0:
+        groupName = "LLink";
+        break;
+    case 1:
+        groupName = "SATCOM1";
+        break;
+    case 2:
+        groupName = "SATCOM2";
+        break;
+    default:
+        qWarning() << "Unknown data source type:" << dataSourceType;
+        return;
+    }
+
+    m_remoteIP = g_networkSettingInfo->value(groupName + "/remoteIP").toString();
+    m_remotePort = g_networkSettingInfo->value(groupName + "/remotePort").toInt();
+    int localPort = g_networkSettingInfo->value(groupName + "/localPort").toInt();
+    QString localIP = g_networkSettingInfo->value(groupName + "/localIP").toString();
+
+    // 校验 IP 和端口
+    if (m_remoteIP.isEmpty() || m_remotePort <= 0 || localIP.isEmpty() || localPort <= 0) {
+        qWarning() << "Invalid IP or port configuration!";
+        return;
+    }
+
+    if (dataSourceType == 0) {  // 组播
+        qDebug() << "Starting multicast connection to" << m_remoteIP << ":" << m_remotePort;
+        emit startConnectionSignal(m_remoteIP, m_remotePort);
+    } else {  // 单播
+        qDebug() << "Starting unicast connection on" << localIP << ":" << localPort;
+        emit startConnectionSignal(localIP, localPort);
+    }
+
+
+}
+
+
 void CommandWidget::receiveMessageSlots(QString message, int type) {
     emit sendErrorMessage(message, type);
 }
 
-unsigned char CommandWidget::getCrc(quint8 *data, quint8 length) {
+
+
+
+unsigned char CommandWidget::getCrc(quint8* data, quint8 length)
+{
     quint16 crc = 0;
-    int i = 0;
+    int i=0;
-    while (length-- > 0) {
+    while (length-- > 0)
-        crc = CRC8TAB[crc ^ (data[i] & 0x00FF)];
+    {
+        crc = CRC8TAB[crc ^ (data[i]&0x00FF)];
 
         i++;
     }
 
-    return crc & 0x00ff;
+    return crc&0x00ff;
+
 }
 
-ProtocalKB CommandWidget::EncodeCommandCmd(quint8 cmd) {
+ProtocalKB CommandWidget::EncodeCommandCmd(quint8 cmd)
+{
     std::unique_ptr<ProtocalKB> pBuff = std::make_unique<ProtocalKB>();
-    pBuff->head[0] = PROTOCOL_HEAD_0;
+    pBuff->head[0]   = PROTOCOL_HEAD_0;
-    pBuff->head[1] = PROTOCOL_HEAD_1;
+    pBuff->head[1]   = PROTOCOL_HEAD_1;
-    pBuff->reserved = PROTOCOL_RESERVED;
+    pBuff->reserved  = PROTOCOL_RESERVED;
     pBuff->data[0] = cmd;
     pBuff->data[1] = cmd;
     pBuff->data[2] = cmd;
-    pBuff->curPage = PROTOCOL_CUR_PAGE;
+    pBuff->curPage  = PROTOCOL_CUR_PAGE;
-    quint8 *ptr = reinterpret_cast<quint8 *>(&pBuff);
+    quint8 *ptr = reinterpret_cast<quint8*>(&pBuff);
     pBuff->CHKSUM = getCrc(ptr, sizeof(pBuff) - sizeof(pBuff->CHKSUM));
 
     return *pBuff;
 }
 
-bool CommandWidget::writeBufferToClient(const QByteArray &data) {
+
+
+
+
+bool CommandWidget::writeBufferToClient(const QByteArray &data)
+{
     // 目标地址和端口
-    QHostAddress destination("172.10.1.216");  // 目标 IP 地址
+    QHostAddress destination("172.10.1.216"); // 目标 IP 地址
     quint16 port = 9003;                       // 目标端口
 
     // 发送数据
-    qint64 bytesSent =
+    qint64 bytesSent = g_CommandudpSocket->writeDatagram(data, destination, port);
-        m_commandUdpSocket->writeDatagram(data, destination, port);
     if (bytesSent == -1) {
-        qDebug() << "发送失败：" << m_commandUdpSocket->errorString();
+        qDebug() << "发送失败：" << g_CommandudpSocket->errorString();
         return false;
     } else {
         qDebug() << "发送成功，字节数:" << bytesSent;
         return true;
     }
+
+
 }
 
-void CommandWidget::buttonResponse(quint8 cmd) {
+void CommandWidget::buttonResponse(quint8 cmd)
+{
+
     ProtocalKB packet = EncodeCommandCmd(cmd);
     // 将 ProtocalKB 结构体转换为 QByteArray
     QByteArray data;
-    data.append(reinterpret_cast<const char *>(&packet), sizeof(ProtocalKB));
+    data.append(reinterpret_cast<const char*>(&packet), sizeof(ProtocalKB));
-    for (int i = 0; i < 3; i++) {
+    for(int i=0;i<3;i++)
+    {
         writeBufferToClient(data);
     }
+
 }
 
-void CommandWidget::on_pushButton_clicked() {
+void CommandWidget::on_pushButton_clicked()
+{
     buttonResponse(0x75);
+
 }
 
-void CommandWidget::on_pushButton_2_clicked() {
+
+void CommandWidget::on_pushButton_2_clicked()
+{
     buttonResponse(0x76);
 }
 
-void CommandWidget::on_pushButton_5_clicked() {
+
-    buttonResponse(0x7D);
+void CommandWidget::on_pushButton_5_clicked()
+{
+   buttonResponse(0x7D);
 }
 
-void CommandWidget::on_pushButton_6_clicked() {
+
-    buttonResponse(0x7C);
+void CommandWidget::on_pushButton_6_clicked()
+{
+   buttonResponse(0x7C);
 }
 
-void CommandWidget::on_pushButton_10_clicked() {
+
-    buttonResponse(0x69);
+void CommandWidget::on_pushButton_10_clicked()
+{
+   buttonResponse(0x69);
 }
 
-void CommandWidget::on_pushButton_9_clicked() {
+
+void CommandWidget::on_pushButton_9_clicked()
+{
     buttonResponse(0x6A);
 }
 
-void CommandWidget::on_pushButton_4_clicked() {
+
+void CommandWidget::on_pushButton_4_clicked()
+{
     buttonResponse(0x77);
 }
 
-void CommandWidget::on_pushButton_3_clicked() {
+
-    buttonResponse(0x78);
+void CommandWidget::on_pushButton_3_clicked()
+{
+     buttonResponse(0x78);
 }
 
-void CommandWidget::on_pushButton_14_clicked() {
+
+void CommandWidget::on_pushButton_14_clicked()
+{
     buttonResponse(0x79);
 }
 
-void CommandWidget::on_pushButton_13_clicked() {
+
+void CommandWidget::on_pushButton_13_clicked()
+{
     buttonResponse(0xC6);
 }
 
-void CommandWidget::on_pushButton_17_clicked() {
+
+void CommandWidget::on_pushButton_17_clicked()
+{
     buttonResponse(0x66);
 }
 
-void CommandWidget::on_pushButton_8_clicked() {
+
+void CommandWidget::on_pushButton_8_clicked()
+{
     buttonResponse(0x67);
 }
 
-void CommandWidget::on_pushButton_7_clicked() {
+
+void CommandWidget::on_pushButton_7_clicked()
+{
     buttonResponse(0x68);
 }
 
-void CommandWidget::on_pushButton_12_clicked() {
+
+void CommandWidget::on_pushButton_12_clicked()
+{
     buttonResponse(0x7B);
 }
 
-void CommandWidget::on_pushButton_11_clicked() {
+
+void CommandWidget::on_pushButton_11_clicked()
+{
     buttonResponse(0x7A);
 }
 
-void CommandWidget::on_pushButton_16_clicked() {
+
+void CommandWidget::on_pushButton_16_clicked()
+{
     buttonResponse(0xC8);
 }
 
-void CommandWidget::on_pushButton_15_clicked() {
+
+void CommandWidget::on_pushButton_15_clicked()
+{
     buttonResponse(0xC9);
 }
+
+
+void CommandWidget::on_videoLayout1TBtn_clicked() {
+    ui->videoLayout1TBtn->setDisabled(true);
+    emit changeVideoLayout(0);
+    ui->videoLayout1TBtn->setDisabled(false);
+}
+
+void CommandWidget::on_videoLayout4TBtn_clicked() {
+    ui->videoLayout4TBtn->setDisabled(true);
+    emit changeVideoLayout(1);
+    ui->videoLayout4TBtn->setDisabled(false);
+}
+

src/commandwidget.h

@@ -3,17 +3,17 @@
 
 #include <QUdpSocket>
 #include <QWidget>
+#include "global.h"
 
 #include "communicationsettingdlg.h"
-#include "global.h"
 
 typedef struct struProtocalKB {
-    quint8 head[2];   // 帧头0x
+    quint8  head[2];								//帧头0x
-    quint8 reserved;  // 预留
+    quint8  reserved;   							//预留
-    quint8 data[3];   // 开关指令
+    quint8  data[3];								//开关指令
-    quint8 curPage;   // 指令页
+    quint8  curPage;									//指令页
-    quint8 CHKSUM;    // 校验字节
+    quint8  CHKSUM;   							//校验字节
-} ProtocalKB;
+}ProtocalKB;
 
 // 定义常量
 const unsigned char PROTOCOL_HEAD_0 = 0xEB;
@@ -21,55 +21,62 @@ const unsigned char PROTOCOL_HEAD_1 = 0x98;
 const unsigned char PROTOCOL_RESERVED = 0x00;
 const unsigned char PROTOCOL_CUR_PAGE = 0x01;
 
-const quint16 CRC8TAB[256] = {
+const quint16  CRC8TAB[256] =
-    // 0
+    {
-    0x0000, 0x0031, 0x0062, 0x0053, 0x00C4, 0x00F5, 0x00A6, 0x0097, 0x00B9,
+        //0
-    0x0088, 0x00DB, 0x00EA, 0x007D, 0x004C, 0x001F, 0x002E,
+        0x0000, 0x0031, 0x0062, 0x0053, 0x00C4, 0x00F5, 0x00A6, 0x0097,
-    // 1
+        0x00B9, 0x0088, 0x00DB, 0x00EA, 0x007D, 0x004C, 0x001F, 0x002E,
-    0x0043, 0x0072, 0x0021, 0x0010, 0x0087, 0x00B6, 0x00E5, 0x00D4, 0x00FA,
+        //1
-    0x00CB, 0x0098, 0x00A9, 0x003E, 0x000F, 0x005C, 0x006D,
+        0x0043, 0x0072, 0x0021, 0x0010, 0x0087, 0x00B6, 0x00E5, 0x00D4,
-    // 2
+        0x00FA, 0x00CB, 0x0098, 0x00A9, 0x003E, 0x000F, 0x005C, 0x006D,
-    0x0086, 0x00B7, 0x00E4, 0x00D5, 0x0042, 0x0073, 0x0020, 0x0011, 0x003F,
+        //2
-    0x000E, 0x005D, 0x006C, 0x00FB, 0x00CA, 0x0099, 0x00A8,
+        0x0086, 0x00B7, 0x00E4, 0x00D5, 0x0042, 0x0073, 0x0020, 0x0011,
-    // 3
+        0x003F, 0x000E, 0x005D, 0x006C, 0x00FB, 0x00CA, 0x0099, 0x00A8,
-    0x00C5, 0x00F4, 0x00A7, 0x0096, 0x0001, 0x0030, 0x0063, 0x0052, 0x007C,
+        //3
-    0x004D, 0x001E, 0x002F, 0x00B8, 0x0089, 0x00DA, 0x00EB,
+        0x00C5, 0x00F4, 0x00A7, 0x0096, 0x0001, 0x0030, 0x0063, 0x0052,
-    // 4
+        0x007C, 0x004D, 0x001E, 0x002F, 0x00B8, 0x0089, 0x00DA, 0x00EB,
-    0x003D, 0x000C, 0x005F, 0x006E, 0x00F9, 0x00C8, 0x009B, 0x00AA, 0x0084,
+        //4
-    0x00B5, 0x00E6, 0x00D7, 0x0040, 0x0071, 0x0022, 0x0013,
+        0x003D, 0x000C, 0x005F, 0x006E, 0x00F9, 0x00C8, 0x009B, 0x00AA,
-    // 5
+        0x0084, 0x00B5, 0x00E6, 0x00D7, 0x0040, 0x0071, 0x0022, 0x0013,
-    0x007E, 0x004F, 0x001C, 0x002D, 0x00BA, 0x008B, 0x00D8, 0x00E9, 0x00C7,
+        //5
-    0x00F6, 0x00A5, 0x0094, 0x0003, 0x0032, 0x0061, 0x0050,
+        0x007E, 0x004F, 0x001C, 0x002D, 0x00BA, 0x008B, 0x00D8, 0x00E9,
-    // 6
+        0x00C7, 0x00F6, 0x00A5, 0x0094, 0x0003, 0x0032, 0x0061, 0x0050,
-    0x00BB, 0x008A, 0x00D9, 0x00E8, 0x007F, 0x004E, 0x001D, 0x002C, 0x0002,
+        //6
-    0x0033, 0x0060, 0x0051, 0x00C6, 0x00F7, 0x00A4, 0x0095,
+        0x00BB, 0x008A, 0x00D9, 0x00E8, 0x007F, 0x004E, 0x001D, 0x002C,
-    // 7
+        0x0002, 0x0033, 0x0060, 0x0051, 0x00C6, 0x00F7, 0x00A4, 0x0095,
-    0x00F8, 0x00C9, 0x009A, 0x00AB, 0x003C, 0x000D, 0x005E, 0x006F, 0x0041,
+        //7
-    0x0070, 0x0023, 0x0012, 0x0085, 0x00B4, 0x00E7, 0x00D6,
+        0x00F8, 0x00C9, 0x009A, 0x00AB, 0x003C, 0x000D, 0x005E, 0x006F,
-    // 8
+        0x0041, 0x0070, 0x0023, 0x0012, 0x0085, 0x00B4, 0x00E7, 0x00D6,
-    0x007A, 0x004B, 0x0018, 0x0029, 0x00BE, 0x008F, 0x00DC, 0x00ED, 0x00C3,
+        //8
-    0x00F2, 0x00A1, 0x0090, 0x0007, 0x0036, 0x0065, 0x0054,
+        0x007A, 0x004B, 0x0018, 0x0029, 0x00BE, 0x008F, 0x00DC, 0x00ED,
-    // 9
+        0x00C3, 0x00F2, 0x00A1, 0x0090, 0x0007, 0x0036, 0x0065, 0x0054,
-    0x0039, 0x0008, 0x005B, 0x006A, 0x00FD, 0x00CC, 0x009F, 0x00AE, 0x0080,
+        //9
-    0x00B1, 0x00E2, 0x00D3, 0x0044, 0x0075, 0x0026, 0x0017,
+        0x0039, 0x0008, 0x005B, 0x006A, 0x00FD, 0x00CC, 0x009F, 0x00AE,
-    // A
+        0x0080, 0x00B1, 0x00E2, 0x00D3, 0x0044, 0x0075, 0x0026, 0x0017,
-    0x00FC, 0x00CD, 0x009E, 0x00AF, 0x0038, 0x0009, 0x005A, 0x006B, 0x0045,
+        //A
-    0x0074, 0x0027, 0x0016, 0x0081, 0x00B0, 0x00E3, 0x00D2,
+        0x00FC, 0x00CD, 0x009E, 0x00AF, 0x0038, 0x0009, 0x005A, 0x006B,
-    // B
+        0x0045, 0x0074, 0x0027, 0x0016, 0x0081, 0x00B0, 0x00E3, 0x00D2,
-    0x00BF, 0x008E, 0x00DD, 0x00EC, 0x007B, 0x004A, 0x0019, 0x0028, 0x0006,
+        //B
-    0x0037, 0x0064, 0x0055, 0x00C2, 0x00F3, 0x00A0, 0x0091,
+        0x00BF, 0x008E, 0x00DD, 0x00EC, 0x007B, 0x004A, 0x0019, 0x0028,
-    // C
+        0x0006, 0x0037, 0x0064, 0x0055, 0x00C2, 0x00F3, 0x00A0, 0x0091,
-    0x0047, 0x0076, 0x0025, 0x0014, 0x0083, 0x00B2, 0x00E1, 0x00D0, 0x00FE,
+        //C
-    0x00CF, 0x009C, 0x00AD, 0x003A, 0x000B, 0x0058, 0x0069,
+        0x0047, 0x0076, 0x0025, 0x0014, 0x0083, 0x00B2, 0x00E1, 0x00D0,
-    // D
+        0x00FE, 0x00CF, 0x009C, 0x00AD, 0x003A, 0x000B, 0x0058, 0x0069,
-    0x0004, 0x0035, 0x0066, 0x0057, 0x00C0, 0x00F1, 0x00A2, 0x0093, 0x00BD,
+        //D
-    0x008C, 0x00DF, 0x00FE, 0x0079, 0x0048, 0x001B, 0x002A,
+        0x0004, 0x0035, 0x0066, 0x0057, 0x00C0, 0x00F1, 0x00A2, 0x0093,
-    // E
+        0x00BD, 0x008C, 0x00DF, 0x00FE, 0x0079, 0x0048, 0x001B, 0x002A,
-    0x00C1, 0x00F0, 0x00A3, 0x0092, 0x0005, 0x0034, 0x0067, 0x0056, 0x0078,
+        //E
-    0x0049, 0x001A, 0x002B, 0x00BC, 0x008D, 0x00DE, 0x00EF,
+        0x00C1, 0x00F0, 0x00A3, 0x0092, 0x0005, 0x0034, 0x0067, 0x0056,
-    // F
+        0x0078, 0x0049, 0x001A, 0x002B, 0x00BC, 0x008D, 0x00DE, 0x00EF,
-    0x0082, 0x00B3, 0x00E0, 0x00D1, 0x0046, 0x0077, 0x0024, 0x0015, 0x003B,
+        //F
-    0x000A, 0x0059, 0x0068, 0x00FF, 0x00CE, 0x009D, 0x00AC};
+        0x0082, 0x00B3, 0x00E0, 0x00D1, 0x0046, 0x0077, 0x0024, 0x0015,
+        0x003B, 0x000A, 0x0059, 0x0068, 0x00FF, 0x00CE, 0x009D, 0x00AC
+};
+
+
+
+
+
 
 namespace Ui {
 class CommandWidget;
@@ -82,12 +89,19 @@ public:
     explicit CommandWidget(QWidget *parent = nullptr);
     ~CommandWidget();
 
+    QUdpSocket *udpSocket = nullptr;
 signals:
+    void startConnectionSignal(QString ip, int port);
+    void stopConnectionSignal();
     void sendErrorMessage(QString message, int type);
-
+    void changeVideoLayout(int index);
 private slots:
+
+    void on_startConnectionToolBtn_clicked();
+
     void receiveMessageSlots(QString message, int type);
 
+
     void on_pushButton_clicked();
 
     void on_pushButton_2_clicked();
@@ -122,18 +136,25 @@ private slots:
 
     void on_pushButton_15_clicked();
 
+    void on_videoLayout1TBtn_clicked();
+
+    void on_videoLayout4TBtn_clicked();
+
+
 private:
     Ui::CommandWidget *ui;
-    QUdpSocket *m_commandUdpSocket = nullptr;
 
     QString m_remoteIP;
     int m_remotePort;
 
-    unsigned char getCrc(quint8 *data, quint8 length);
+    unsigned char getCrc(quint8* data, quint8 length);
     ProtocalKB EncodeCommandCmd(quint8 cmd);
     bool writeBufferToClient(const QByteArray &data);
 
     void buttonResponse(quint8 cmd);
+
+
+
 };
 
 #endif  // COMMANDWIDGET_H

src/commandwidget.ui

@@ -21,13 +21,13 @@
     <number>4</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>4</number>
    </property>
    <property name="rightMargin">
-    <number>2</number>
+    <number>4</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>4</number>
    </property>
    <item>
     <widget class="QFrame" name="frame">
@@ -61,137 +61,171 @@
         <property name="leftMargin">
          <number>6</number>
         </property>
-        <property name="topMargin">
-         <number>8</number>
-        </property>
         <property name="rightMargin">
          <number>6</number>
         </property>
-        <property name="bottomMargin">
-         <number>6</number>
-        </property>
         <property name="spacing">
          <number>14</number>
         </property>
-        <item row="4" column="0">
+        <item row="1" column="0">
-         <widget class="QPushButton" name="pushButton_10">
+         <widget class="QPushButton" name="pushButton">
           <property name="text">
-           <string>红外小</string>
+           <string>方位+</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="2">
+        <item row="1" column="1">
-         <widget class="QPushButton" name="pushButton_8">
+         <widget class="QPushButton" name="pushButton_4">
           <property name="text">
-           <string>画中画开</string>
+           <string>俯仰+</string>
           </property>
          </widget>
         </item>
         <item row="1" column="2">
-         <widget class="QPushButton" name="pushButton_7">
+         <widget class="QPushButton" name="pushButton_8">
           <property name="text">
-           <string>画中画关</string>
+           <string>画中画开</string>
           </property>
          </widget>
         </item>
-        <item row="5" column="2">
+        <item row="2" column="0">
-         <widget class="QPushButton" name="pushButton_15">
+         <widget class="QPushButton" name="pushButton_2">
           <property name="text">
-           <string>4-6图拼接</string>
+           <string>方位-</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="1">
+        <item row="2" column="1">
-         <widget class="QPushButton" name="pushButton_17">
+         <widget class="QPushButton" name="pushButton_3">
           <property name="text">
-           <string>图像切换</string>
+           <string>俯仰-</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
+        <item row="2" column="2">
-         <widget class="QPushButton" name="pushButton_5">
+         <widget class="QPushButton" name="pushButton_7">
           <property name="text">
-           <string>变焦推远</string>
+           <string>画中画关</string>
           </property>
          </widget>
         </item>
         <item row="3" column="0">
-         <widget class="QPushButton" name="pushButton_6">
+         <widget class="QPushButton" name="pushButton_5">
           <property name="text">
-           <string>变焦拉近</string>
+           <string>变焦推远</string>
           </property>
          </widget>
         </item>
         <item row="3" column="1">
-         <widget class="QPushButton" name="pushButton_13">
+         <widget class="QPushButton" name="pushButton_14">
           <property name="text">
-           <string>吊舱</string>
+           <string>扫描</string>
           </property>
          </widget>
         </item>
-        <item row="5" column="0">
+        <item row="3" column="2">
-         <widget class="QPushButton" name="pushButton_9">
+         <widget class="QPushButton" name="pushButton_12">
           <property name="text">
-           <string>红外大</string>
+           <string>复位</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="2">
+        <item row="4" column="0">
-         <widget class="QPushButton" name="pushButton_12">
+         <widget class="QPushButton" name="pushButton_6">
           <property name="text">
-           <string>复位</string>
+           <string>变焦拉近</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
+        <item row="4" column="1">
-         <widget class="QPushButton" name="pushButton_14">
+         <widget class="QPushButton" name="pushButton_13">
           <property name="text">
-           <string>扫描</string>
+           <string>吊舱</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="2">
+        <item row="4" column="2">
          <widget class="QPushButton" name="pushButton_11">
           <property name="text">
            <string>锁定</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
+        <item row="5" column="0">
-         <widget class="QPushButton" name="pushButton_4">
+         <widget class="QPushButton" name="pushButton_10">
           <property name="text">
-           <string>俯仰+</string>
+           <string>红外小</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="0">
+        <item row="5" column="1">
-         <widget class="QPushButton" name="pushButton">
+         <widget class="QPushButton" name="pushButton_17">
           <property name="text">
-           <string>方位+</string>
+           <string>图像切换</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
+        <item row="5" column="2">
-         <widget class="QPushButton" name="pushButton_2">
+         <widget class="QPushButton" name="pushButton_16">
           <property name="text">
-           <string>方位-</string>
+           <string>0-3图拼接</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
+        <item row="6" column="0">
-         <widget class="QPushButton" name="pushButton_3">
+         <widget class="QPushButton" name="pushButton_9">
           <property name="text">
-           <string>俯仰-</string>
+           <string>红外大</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="2">
+        <item row="6" column="2">
-         <widget class="QPushButton" name="pushButton_16">
+         <widget class="QPushButton" name="pushButton_15">
           <property name="text">
-           <string>0-3图拼接</string>
+           <string>4-6图拼接</string>
           </property>
          </widget>
         </item>
+        <item row="0" column="0">
+         <widget class="QToolButton" name="startConnectionToolBtn">
+          <property name="text">
+           <string>连接</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" colspan="2">
+         <widget class="QWidget" name="widget" native="true">
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <widget class="QToolButton" name="videoLayout1TBtn">
+             <property name="text">
+              <string>...</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QToolButton" name="videoLayout4TBtn">
+             <property name="text">
+              <string>...</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Orientation::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
        </layout>
       </item>
       <item>

src/communicationsettingdlg.ui

@@ -50,7 +50,7 @@
        <number>2</number>
       </property>
       <item>
-       <layout class="QGridLayout" name="gridLayout" columnstretch="1,2">
+       <layout class="QGridLayout" name="gridLayout" columnstretch="1,0">
         <property name="leftMargin">
          <number>4</number>
         </property>
@@ -115,7 +115,7 @@
         <item row="3" column="1">
          <widget class="QSpinBox" name="remotePort">
           <property name="buttonSymbols">
-           <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
+           <enum>QAbstractSpinBox::NoButtons</enum>
           </property>
           <property name="maximum">
            <number>65534</number>
@@ -137,7 +137,7 @@
         <item row="4" column="1">
          <widget class="QSpinBox" name="localPort">
           <property name="buttonSymbols">
-           <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
+           <enum>QAbstractSpinBox::NoButtons</enum>
           </property>
           <property name="maximum">
            <number>65534</number>
@@ -154,7 +154,7 @@
      <item>
       <spacer name="horizontalSpacer_3">
        <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -179,7 +179,7 @@
      <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>

src/global.cpp

@@ -1,12 +1,10 @@
 #include "global.h"
 
-// bool g_videoPlayStatus[5];
 
-QSettings* g_networkSettingInfo;
 
-PullStreamInfoStruct g_pullStreamInfoStruct;
+QSettings* g_networkSettingInfo;
+QUdpSocket* g_CommandudpSocket;
 
-PushStreamInfoStruct g_pushStreamInfoStruct;
 
 void getLocalIP(QStringList& localIPList) {
     QHostInfo hostInfo = QHostInfo::fromName(QHostInfo::localHostName());
@@ -88,8 +86,8 @@ QString calculateMD5(const QString& str) {
  * @param expireTime: 过期时间（单位是秒），默认1h。
  * @return 返回推流地址
  */
-QString generatePushURL(int uavID, QString uavName, QString appName,
+QString generatePushURL(int uavID, QString appName, QString pushKey,
-                        QString pushKey, int clientID, QString pushDomain,
+                        QString uavName, int clientID, QString pushDomain,
                         long expireTime) {
     QString clientName = "";
     if (0 == clientID) {
@@ -128,8 +126,8 @@ std::map<int, std::string> g_mapAppName;
  * @param pullKey: 拉流域名配置的鉴权Key
  * @return 返回拉流地址
  */
-QString generatePullURL(int uavID, QString uavName, QString appName,
+QString generatePullURL(int uavID, QString appName, QString pullKey,
-                        QString pullKey, int clientID, QString pullDomain,
+                        QString uavName, int clientID, QString pullDomain,
                         long expireTime) {
     QString rtmpUrl = "";
     QString clientName = "";
@@ -162,7 +160,7 @@ QString generatePullURL(int uavID, QString uavName, QString appName,
  * @param uavName:飞机型号，默认981cs
  * @return
  */
-QString generatePushURL2(int uavID, QString uavName, QString appName,
+QString generatePushURL2(int uavID, QString appName, QString uavName,
                          int clientID, QString pushDomain) {
     QString rtmpUrl = "";
     QString clientName = "";
@@ -186,7 +184,7 @@ QString generatePushURL2(int uavID, QString uavName, QString appName,
  * @param pullDomain: 拉流域名
  * @return 返回拉流地址
  */
-QString generatePullURL2(int uavID, QString uavName, QString appName,
+QString generatePullURL2(int uavID, QString appName, QString uavName,
                          int clientID, QString pullDomain) {
     QString clientName = "";
     if (0 == clientID) {

src/global.h

@@ -11,36 +11,8 @@
 #include <QSettings>
 #include <QStringList>
 #include <QUdpSocket>
-
-struct NetworkIPStruct {
-    QString localIP;
-    QString remoteIP;
-    uint localPort;
-    uint remotePort;
-};
-
-struct PullStreamInfoStruct {
-    QString podPullIP;
-    QString pullIP1;
-    QString pullIP2;
-    QString pullIP3;
-    QString pullIP4;
-};
-
-struct PushStreamInfoStruct {
-    QString uavType;
-    int uavID;
-    int pushType;
-    QString pushStreamIP;
-};
-
-// extern bool g_videoPlayStatus[5];
-
 extern QSettings* g_networkSettingInfo;
-
+extern QUdpSocket* g_CommandudpSocket;
-extern PullStreamInfoStruct g_pullStreamInfoStruct;
-
-extern PushStreamInfoStruct g_pushStreamInfoStruct;
 
 extern void getLocalIP(QStringList& localIPList);
 
@@ -50,7 +22,19 @@ extern bool isValidIPAddress(const QString& ip);
 
 extern bool isMulticastAddress(const QString& ip);
 
-enum NotifyType { INFORMATION = 0, SUCCESS = 1, ERROR = 2, WARNING = 3 };
+struct NetworkIPStruct {
+    QString localIP;
+    QString remoteIP;
+    uint localPort;
+    uint remotePort;
+};
+
+// enum NotificationType {
+//     NOTIFICATION_INFORMATION = 0,
+//     NOTIFICATION_SUCCESS = 1,
+//     NOTIFICATION_ERROR = 2,
+//     NOTIFICATION_WARNING = 3
+// };
 
 /**
  * @brief calCRC16
@@ -70,7 +54,7 @@ extern QString calculateMD5(const QString& str);
 /**
  * @brief 生成推流地址
  * @param uavID: 飞控ID
- * @param uavName: 飞机型号，默认98
+ * @param uavName: 飞机型号，默认981cs
  * @param clientID: 客户端ID，0为地面端，1为载荷端。
  * @param pushDomain: 推流域名
  * @param appName
@@ -78,10 +62,9 @@ extern QString calculateMD5(const QString& str);
  * @param pushKey: 推流域名配置的鉴权Key
  * @return 返回推流地址
  */
-extern QString generatePushURL(int uavID, QString uavName = "fp98",
+extern QString generatePushURL(int uavID, QString appName = "nmyj",
-                               QString appName = "videoclient",
                                QString pushKey = "ZRjGVcPYGhKib0rdgH",
-                               int clientID = 0,
+                               QString uavName = "981cs", int clientID = 0,
                                QString pushDomain = "push.uavideo.cn",
                                long expireTime = 6 * 3600);
 
@@ -90,30 +73,28 @@ extern QString generatePushURL(int uavID, QString uavName = "fp98",
  * @param uavID:飞控ID
  * @param clientID: 客户端ID，0为地面端，1为载荷端。
  * @param appName:
- * @param uavName:飞机型号，默认98
+ * @param uavName:飞机型号，默认981cs
  * @param pushDomain: 推流地址
  * @return
  */
-extern QString generatePushURL2(int uavID, QString uavName = "fp98",
+extern QString generatePushURL2(int uavID, QString appName = "nmyj",
-                                QString appName = "videoclient",
+                                QString uavName = "981cs", int clientID = 0,
-                                int clientID = 0,
                                 QString pushDomain = "182.92.130.23");
 
 /**
  * @brief 生成拉流地址
  * @param uavID: 飞控ID
  * @param appName: app名称
- * @param uavName: 飞机型号，默认98
+ * @param uavName: 飞机型号，默认981cs
  * @param clientID: 数据推流端ID，0为地面端，1为载荷端。
  * @param pullDomain: 拉流域名
  * @param expireTime: 过期时间（单位是秒），默认1h。
  * @param pullKey: 拉流域名配置的鉴权Key
  * @return 返回拉流地址
  */
-extern QString generatePullURL(int uavID, QString uavName = "fp98",
+extern QString generatePullURL(int uavID, QString appName = "nmyj",
-                               QString appName = "videoclient",
                                QString pullKey = "HDaMVkLnIcr0mGhV8d",
-                               int clientID = 0,
+                               QString uavName = "981cs", int clientID = 0,
                                QString pullDomain = "play.uavideo.cn",
                                long expireTime = 6 * 3600);
 
@@ -121,14 +102,13 @@ extern QString generatePullURL(int uavID, QString uavName = "fp98",
  * @brief 生成拉流地址，应急厅铁塔平台
  * @param uavID: 飞控ID
  * @param appName: app名称
- * @param uavName: 飞机型号，默认98
+ * @param uavName: 飞机型号，默认981cs
  * @param clientID: 数据推流端ID，0为地面端，1为载荷端。
  * @param pullDomain: 拉流域名
  * @return 返回拉流地址
  */
-extern QString generatePullURL2(int uavID, QString uavName = "fp98",
+extern QString generatePullURL2(int uavID, QString appName = "nmyj",
-                                QString appName = "videoclient",
+                                QString uavName = "981cs", int clientID = 0,
-                                int clientID = 0,
                                 QString pullDomain = "182.92.130.23");
 
 class Global {

src/main.cpp

@@ -1,14 +1,9 @@
 #include <QApplication>
-// #include <QWebEngineView>
 
 #include "mainwindow.h"
 
 int main(int argc, char *argv[]) {
     QGuiApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
-    QApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
-    // QApplication::setAttribute(Qt::AA_UseOpenGLES);
-    // QApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
-
     QApplication a(argc, argv);
 
     MainWindow w;

src/mainwindow.cpp

@@ -56,6 +56,8 @@ MainWindow::MainWindow(QWidget *parent)
     initNotifyManager();
     initNotifyMessageConnection();
 
+    initCommunitions();
+
     initChangeVideoLayoutConnection();
 
     initHideButton();
@@ -66,6 +68,7 @@ MainWindow::MainWindow(QWidget *parent)
     // ui->videoWidget2->play(list.at(0));
     // ui->videoWidget3->play(list.at(0));
     // ui->videoWidget4->play(list.at(0));
+
 }
 
 MainWindow::~MainWindow() {
@@ -96,51 +99,33 @@ void MainWindow::paintEvent(QPaintEvent *ev) {
 
     hideCommandWidgetBtn->move(ui->stackedWidget->width() - offset,
                                ui->commandWidget->height() / 2);
-}
+    int i = 0;
-
-void MainWindow::closeEvent(QCloseEvent *event) {
-    if (m_mapWidget) {
-        m_mapWidget->close();
-        delete m_mapWidget;
-    }
-    // QMainWindow::close();
 }
 
 void MainWindow::initSignalConnection() {
-    connect(ui->videoControlWidget, &VideoControl::startConnectionSignal,
+    connect(ui->commandWidget, &CommandWidget::startConnectionSignal,
             ui->videoWidget, &VideoWidget::udpPlay, Qt::UniqueConnection);
 
-    connect(ui->videoControlWidget, &VideoControl::stopConnectionSignal,
+    connect(ui->commandWidget, &CommandWidget::stopConnectionSignal,
             ui->videoWidget, &VideoWidget::stopPlay, Qt::UniqueConnection);
-
-    connect(&streamAddrSettingsDlg,
-            &StreamAddrSettingsDlg::startPullStreamSignal, this,
-            &MainWindow::pullStreamSlot);
-
-    connect(&streamAddrSettingsDlg,
-            &StreamAddrSettingsDlg::startPushStreamSignal, this,
-            &MainWindow::pushStreamSlot);
-
-    connect(ui->videoControlWidget, &VideoControl::stopVideoSignal, this,
-            &MainWindow::closeVideoSlot);
 }
 
 void MainWindow::initNotifyMessageConnection() {
-    connect(this, &MainWindow::sendErrorMessage, this,
-            &MainWindow::showMessageSlots);
     connect(ui->videoWidget, &VideoWidget::sendErrorMessageSignal, this,
             &MainWindow::showMessageSlots);
     connect(ui->commandWidget, &CommandWidget::sendErrorMessage, this,
             &MainWindow::showMessageSlots);
 }
 
+
 void MainWindow::initChangeVideoLayoutConnection() {
-    connect(ui->videoControlWidget, &VideoControl::changeVideoLayout, this,
+    connect(ui->commandWidget, &CommandWidget::changeVideoLayout, this,
             [=](int index) {
                 ui->stackedWidget->setCurrentIndex(index);
             });
 }
 
+
 void MainWindow::initNotifyManager() {
     m_notifyManager = new NotifyManager(this, this);
     m_notifyManager->setMaxCount(5);
@@ -148,6 +133,21 @@ void MainWindow::initNotifyManager() {
     m_notifyManager->setNotifyWndSize(400, 60);
 }
 
+void MainWindow::initCommunitions()
+{
+
+    g_CommandudpSocket = new QUdpSocket(this);
+    // 将套接字绑定到指定端口
+    if (g_CommandudpSocket->bind(QHostAddress::Any, 1200)) {
+        qDebug() << "UDP 套接字已绑定到端口 1200";
+    } else {
+        qDebug() << "绑定 UDP 套接字失败";
+    }
+
+
+}
+
+
 void MainWindow::showMessageSlots(QString message, int type) {
     if (m_notifyManager) {
         m_notifyManager->notify(message, "", type, 3000);
@@ -184,13 +184,6 @@ void MainWindow::installWindowAgent() {
     connect(pushStreamAction, &QAction::triggered, this,
             &MainWindow::showStreamSettingsDlgSlot);
 
-    QAction *showMap3DAction = new QAction(this);
-    showMap3DAction->setIcon(QIcon(":/images/map3D.png"));
-    showMap3DAction->setIconText("推流");
-    menuBar->addAction(showMap3DAction);
-    connect(showMap3DAction, &QAction::triggered, this,
-            &MainWindow::showMap3DSlot);
-
     menuBar->setObjectName(QStringLiteral("win-menu-bar"));
 
     auto titleLabel = new QLabel();
@@ -338,171 +331,6 @@ void MainWindow::hideCommandWidgetSlot() {
 }
 
 void MainWindow::openSavedVideoDirSlot() {
-    // QDesktopServices::openUrl(
+    QDesktopServices::openUrl(
-    //     QUrl(QApplication::applicationDirPath() + "/video"));
+        QUrl(QApplication::applicationDirPath() + "/video"));
-
-    // QFileDialog::Options options = QFileDialog::DontUseNativeDialog;
-    QString videoDirPath = QApplication::applicationDirPath() + "/video/";
-    QString filePath = QFileDialog::getOpenFileName(
-        this, "选择文件", videoDirPath, "*.ts", nullptr);
-    if (!filePath.isEmpty()) {
-        QString fileName = filePath;
-        qDebug() << fileName;
-        if (ui->videoWidget->play(filePath, false)) {
-            int duration = ui->videoWidget->getVideoDuration();
-            if (duration > 0) {
-                ui->videoControlWidget->updateVideoDuration(duration);
-                connect(ui->videoWidget,
-                        &VideoWidget::updateVideoCurrentTimeSignal, this,
-                        [=](int currentTime, int duration) {
-                            ui->videoControlWidget->updateVideoSlider(
-                                currentTime, duration);
-                        });
-
-                connect(ui->videoControlWidget,
-                        &VideoControl::seekToVideoSignal, ui->videoWidget,
-                        &VideoWidget::seekToVideo, Qt::UniqueConnection);
-
-                connect(ui->videoControlWidget,
-                        &VideoControl::changePlaySpeedSignal, ui->videoWidget,
-                        &VideoWidget::setPlaySpeed, Qt::UniqueConnection);
-            }
-        }
-    }
-}
-
-// 拉流
-void MainWindow::pullStreamSlot(bool bPull) {
-    if (!g_networkSettingInfo) return;
-    if (bPull) {
-        // QString podPullStreamIP =
-        //     g_networkSettingInfo->value("NetworkStreamSettings/podPullAddress")
-        //         .toString();
-        // QString pullStreamIP1 =
-        //     g_networkSettingInfo->value("NetworkStreamSettings/pullAddress1")
-        //         .toString();
-        // QString pullStreamIP2 =
-        //     g_networkSettingInfo->value("NetworkStreamSettings/pullAddress2")
-        //         .toString();
-        // QString pullStreamIP3 =
-        //     g_networkSettingInfo->value("NetworkStreamSettings/pullAddress3")
-        //         .toString();
-        // QString pullStreamIP4 =
-        //     g_networkSettingInfo->value("NetworkStreamSettings/pullAddress4")
-        //         .toString();
-
-        if (!ui->videoWidget->getPlayStatus()) {
-            ui->videoWidget->play(g_pullStreamInfoStruct.podPullIP);
-        } else {
-            emit sendErrorMessage("吊舱视频正在播放，请先暂停!",
-                                  NotifyType::WARNING);
-        }
-
-        if (!ui->videoWidget1->getPlayStatus()) {
-            ui->videoWidget1->play(g_pullStreamInfoStruct.pullIP1);
-        } else {
-            emit sendErrorMessage("备用视频1正在播放，请先暂停!",
-                                  NotifyType::WARNING);
-        }
-
-        if (!ui->videoWidget2->getPlayStatus()) {
-            ui->videoWidget2->play(g_pullStreamInfoStruct.pullIP2);
-        } else {
-            emit sendErrorMessage("备用视频2正在播放，请先暂停!",
-                                  NotifyType::WARNING);
-        }
-
-        if (!ui->videoWidget3->getPlayStatus()) {
-            ui->videoWidget3->play(g_pullStreamInfoStruct.pullIP3);
-        } else {
-            emit sendErrorMessage("备用视频3正在播放，请先暂停!",
-                                  NotifyType::WARNING);
-        }
-
-        if (!ui->videoWidget4->getPlayStatus()) {
-            ui->videoWidget4->play(g_pullStreamInfoStruct.pullIP4);
-        } else {
-            emit sendErrorMessage("备用视频4正在播放，请先暂停!",
-                                  NotifyType::WARNING);
-        }
-
-    } else {
-        ui->videoWidget->stopPlay();
-        ui->videoWidget1->stopPlay();
-        ui->videoWidget2->stopPlay();
-        ui->videoWidget3->stopPlay();
-        ui->videoWidget4->stopPlay();
-    }
-}
-
-// 推流
-void MainWindow::pushStreamSlot(bool bPush) {
-    if (!g_networkSettingInfo) return;
-    if (bPush) {
-        // int uavType =
-        //     g_networkSettingInfo->value("NetworkStreamSettings/uavType")
-        //         .toInt();
-        // int uavID =
-        //     g_networkSettingInfo->value("NetworkStreamSettings/uavID").toInt();
-
-        // int pushStreamIndex =
-        //     g_networkSettingInfo->value("NetworkStreamSettings/pushStreamType")
-        //         .toInt();
-
-        // if (2 == pushStreamIndex) {
-        //     QString pushStreamIP =
-        //         g_networkSettingInfo
-        //             ->value("NetworkStreamSettings/pushStreamAddress")
-        //             .toString();
-        // }
-        int pushStreamType = g_pushStreamInfoStruct.pushType;
-        QString pushStreamIP;
-        if (pushStreamType == 0) {  // 公司服务器
-            pushStreamIP = generatePushURL2(g_pushStreamInfoStruct.uavID,
-                                            g_pushStreamInfoStruct.uavType);
-            qDebug() << pushStreamIP;
-        } else if (pushStreamType == 1) {  // 阿里云服务器
-            pushStreamIP = generatePushURL(g_pushStreamInfoStruct.uavID,
-                                           g_pushStreamInfoStruct.uavType);
-            qDebug() << pushStreamIP;
-        } else {
-            pushStreamIP = g_pushStreamInfoStruct.pushStreamIP;
-        }
-        ui->videoWidget->pushStream(pushStreamIP);
-    } else {
-        ui->videoWidget->stopPushStream();
-        // ui->videoWidget1->stopPushStream();
-        // ui->videoWidget2->stopPushStream();
-        // ui->videoWidget3->stopPushStream();
-        // ui->videoWidget4->stopPushStream();
-    }
-}
-
-void MainWindow::closeVideoSlot() {
-    ui->videoWidget->stopPlay();
-    ui->videoWidget1->stopPlay();
-    ui->videoWidget2->stopPlay();
-    ui->videoWidget3->stopPlay();
-    ui->videoWidget4->stopPlay();
-
-    ui->videoControlWidget->resetVideoSlider();
-
-    emit sendErrorMessage("视频流已关闭!", NotifyType::SUCCESS);
-}
-
-void MainWindow::showMap3DSlot() {
-    if (m_mapWidget == nullptr) {
-        m_mapWidget = new WebMapWidget();
-
-        // m_mapWidget->setRenderHint(QPainter::Antialiasing, true);
-        // m_mapWidget->setRenderHint(QPainter::SmoothPixmapTransform, true);
-        // m_mapWidget->setRenderHint(QPainter::TextAntialiasing, true);
-
-        m_mapWidget->load(QUrl("http://127.0.0.1:80"));
-        m_mapWidget->resize(1024, 750);
-    }
-
-    if (!m_mapWidget->isVisible()) {
-        m_mapWidget->show();
-    }
 }

src/mainwindow.h

@@ -3,7 +3,6 @@
 
 #include <QDebug>
 #include <QDesktopServices>
-#include <QFileDialog>
 #include <QMainWindow>
 #include <QToolButton>
 #include <QWindow>
@@ -13,9 +12,7 @@
 #include "communicationsettingdlg.h"
 #include "global.h"
 #include "streamaddrsettingsdlg.h"
-#include "videoControl.h"
 #include "videowidget.h"
-#include "webmapwidget.h"
 
 #ifdef Q_OS_WIN
 #include "windows.h"
@@ -50,10 +47,8 @@ protected:
     bool nativeEvent(const QByteArray &eventType, void *message,
                      qintptr *result) override;
     void paintEvent(QPaintEvent *ev) override;
-    void closeEvent(QCloseEvent *event) override;
 signals:
     void themeChanged();
-    void sendErrorMessage(QString message, int type);
 
 private:
     void initSignalConnection();
@@ -62,35 +57,27 @@ private:
     void initNotifyManager();
 
     void showMessageSlots(QString message, int type);
+    void initCommunitions();
 
     void installWindowAgent();
     void loadStyleSheet(Theme theme);
     void setSavedVideoDir();
 
     void initHideButton();
-
 private slots:
     void showSettingDlgSlot();
     void showStreamSettingsDlgSlot();
     void hideCommandWidgetSlot();
     void openSavedVideoDirSlot();
 
-    void pullStreamSlot(bool bPull);
-    void pushStreamSlot(bool bPush);
-
-    void closeVideoSlot();
-    void showMap3DSlot();
-
 private:
     Ui::MainWindow *ui;
-    // VideoWidget *videoWidget1 = nullptr;
+    VideoWidget *videoWidget1 = nullptr;
     CommunicationSettingDlg settingDlg;
     StreamAddrSettingsDlg streamAddrSettingsDlg;
     QWK::WidgetWindowAgent *windowAgent;
     Theme currentTheme{};
     NotifyManager *m_notifyManager = nullptr;
     QToolButton *hideCommandWidgetBtn = nullptr;
-
-    WebMapWidget *m_mapWidget = nullptr;
 };
 #endif  // MAINWINDOW_H

src/mainwindow.ui

@@ -19,19 +19,19 @@
      <number>4</number>
     </property>
     <property name="leftMargin">
-     <number>0</number>
+     <number>2</number>
     </property>
     <property name="topMargin">
-     <number>0</number>
+     <number>2</number>
     </property>
     <property name="rightMargin">
      <number>2</number>
     </property>
     <property name="bottomMargin">
-     <number>0</number>
+     <number>2</number>
     </property>
     <item>
-     <layout class="QVBoxLayout" name="verticalLayout" stretch="15,1">
+     <layout class="QVBoxLayout" name="verticalLayout">
       <property name="spacing">
        <number>4</number>
       </property>
@@ -46,16 +46,16 @@
         <widget class="QWidget" name="page_3">
          <layout class="QHBoxLayout" name="horizontalLayout_7">
           <property name="leftMargin">
-           <number>0</number>
+           <number>2</number>
           </property>
           <property name="topMargin">
-           <number>0</number>
+           <number>2</number>
           </property>
           <property name="rightMargin">
            <number>2</number>
           </property>
           <property name="bottomMargin">
-           <number>0</number>
+           <number>2</number>
           </property>
           <item>
            <widget class="VideoWidget" name="videoWidget"/>
@@ -65,16 +65,16 @@
         <widget class="QWidget" name="page_4">
          <layout class="QHBoxLayout" name="horizontalLayout_4">
           <property name="leftMargin">
-           <number>0</number>
+           <number>2</number>
           </property>
           <property name="topMargin">
-           <number>0</number>
+           <number>2</number>
           </property>
           <property name="rightMargin">
            <number>2</number>
           </property>
           <property name="bottomMargin">
-           <number>0</number>
+           <number>2</number>
           </property>
           <item>
            <layout class="QGridLayout" name="gridLayout">
@@ -100,7 +100,81 @@
        </widget>
       </item>
       <item>
-       <widget class="VideoControl" name="videoControlWidget" native="true"/>
+       <widget class="QWidget" name="widget_3" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <property name="spacing">
+          <number>4</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>
+          <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,10,1">
+           <property name="verticalSpacing">
+            <number>4</number>
+           </property>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label">
+             <property name="text">
+              <string>00:00:00</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="WProgressBar" name="widget_2" native="true"/>
+           </item>
+           <item row="0" column="2">
+            <widget class="QLabel" name="label_2">
+             <property name="text">
+              <string>00:00:00</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <spacer name="horizontalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Orientation::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>37</width>
+               <height>17</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="1" column="1">
+            <widget class="VideoControl" name="widget" native="true"/>
+           </item>
+           <item row="1" column="2">
+            <spacer name="horizontalSpacer_3">
+             <property name="orientation">
+              <enum>Qt::Orientation::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
       </item>
      </layout>
     </item>
@@ -138,6 +212,12 @@
    <header>videoControl.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>WProgressBar</class>
+   <extends>QWidget</extends>
+   <header>wprogressbar.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

src/resources/Qss/dark-style.qss

@@ -157,4 +157,4 @@ QWidget#clock-widget {
     color: #FEFEFE;
     font-weight: bold;
     background-color: transparent;
-}
+}

src/resources/nginx/conf/fastcgi.conf

@@ -1,26 +0,0 @@
-
-fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
-fastcgi_param  QUERY_STRING       $query_string;
-fastcgi_param  REQUEST_METHOD     $request_method;
-fastcgi_param  CONTENT_TYPE       $content_type;
-fastcgi_param  CONTENT_LENGTH     $content_length;
-
-fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
-fastcgi_param  REQUEST_URI        $request_uri;
-fastcgi_param  DOCUMENT_URI       $document_uri;
-fastcgi_param  DOCUMENT_ROOT      $document_root;
-fastcgi_param  SERVER_PROTOCOL    $server_protocol;
-fastcgi_param  REQUEST_SCHEME     $scheme;
-fastcgi_param  HTTPS              $https if_not_empty;
-
-fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
-fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
-
-fastcgi_param  REMOTE_ADDR        $remote_addr;
-fastcgi_param  REMOTE_PORT        $remote_port;
-fastcgi_param  SERVER_ADDR        $server_addr;
-fastcgi_param  SERVER_PORT        $server_port;
-fastcgi_param  SERVER_NAME        $server_name;
-
-# PHP only, required if PHP was built with --enable-force-cgi-redirect
-fastcgi_param  REDIRECT_STATUS    200;

src/resources/nginx/conf/fastcgi_params

@@ -1,25 +0,0 @@
-
-fastcgi_param  QUERY_STRING       $query_string;
-fastcgi_param  REQUEST_METHOD     $request_method;
-fastcgi_param  CONTENT_TYPE       $content_type;
-fastcgi_param  CONTENT_LENGTH     $content_length;
-
-fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
-fastcgi_param  REQUEST_URI        $request_uri;
-fastcgi_param  DOCUMENT_URI       $document_uri;
-fastcgi_param  DOCUMENT_ROOT      $document_root;
-fastcgi_param  SERVER_PROTOCOL    $server_protocol;
-fastcgi_param  REQUEST_SCHEME     $scheme;
-fastcgi_param  HTTPS              $https if_not_empty;
-
-fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
-fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
-
-fastcgi_param  REMOTE_ADDR        $remote_addr;
-fastcgi_param  REMOTE_PORT        $remote_port;
-fastcgi_param  SERVER_ADDR        $server_addr;
-fastcgi_param  SERVER_PORT        $server_port;
-fastcgi_param  SERVER_NAME        $server_name;
-
-# PHP only, required if PHP was built with --enable-force-cgi-redirect
-fastcgi_param  REDIRECT_STATUS    200;

src/resources/nginx/conf/koi-utf

@@ -1,109 +0,0 @@
-
-# This map is not a full koi8-r <> utf8 map: it does not contain
-# box-drawing and some other characters.  Besides this map contains
-# several koi8-u and Byelorussian letters which are not in koi8-r.
-# If you need a full and standard map, use contrib/unicode2nginx/koi-utf
-# map instead.
-
-charset_map  koi8-r  utf-8 {
-
-    80  E282AC ; # euro
-
-    95  E280A2 ; # bullet
-
-    9A  C2A0 ;   # &nbsp;
-
-    9E  C2B7 ;   # &middot;
-
-    A3  D191 ;   # small yo
-    A4  D194 ;   # small Ukrainian ye
-
-    A6  D196 ;   # small Ukrainian i
-    A7  D197 ;   # small Ukrainian yi
-
-    AD  D291 ;   # small Ukrainian soft g
-    AE  D19E ;   # small Byelorussian short u
-
-    B0  C2B0 ;   # &deg;
-
-    B3  D081 ;   # capital YO
-    B4  D084 ;   # capital Ukrainian YE
-
-    B6  D086 ;   # capital Ukrainian I
-    B7  D087 ;   # capital Ukrainian YI
-
-    B9  E28496 ; # numero sign
-
-    BD  D290 ;   # capital Ukrainian soft G
-    BE  D18E ;   # capital Byelorussian short U
-
-    BF  C2A9 ;   # (C)
-
-    C0  D18E ;   # small yu
-    C1  D0B0 ;   # small a
-    C2  D0B1 ;   # small b
-    C3  D186 ;   # small ts
-    C4  D0B4 ;   # small d
-    C5  D0B5 ;   # small ye
-    C6  D184 ;   # small f
-    C7  D0B3 ;   # small g
-    C8  D185 ;   # small kh
-    C9  D0B8 ;   # small i
-    CA  D0B9 ;   # small j
-    CB  D0BA ;   # small k
-    CC  D0BB ;   # small l
-    CD  D0BC ;   # small m
-    CE  D0BD ;   # small n
-    CF  D0BE ;   # small o
-
-    D0  D0BF ;   # small p
-    D1  D18F ;   # small ya
-    D2  D180 ;   # small r
-    D3  D181 ;   # small s
-    D4  D182 ;   # small t
-    D5  D183 ;   # small u
-    D6  D0B6 ;   # small zh
-    D7  D0B2 ;   # small v
-    D8  D18C ;   # small soft sign
-    D9  D18B ;   # small y
-    DA  D0B7 ;   # small z
-    DB  D188 ;   # small sh
-    DC  D18D ;   # small e
-    DD  D189 ;   # small shch
-    DE  D187 ;   # small ch
-    DF  D18A ;   # small hard sign
-
-    E0  D0AE ;   # capital YU
-    E1  D090 ;   # capital A
-    E2  D091 ;   # capital B
-    E3  D0A6 ;   # capital TS
-    E4  D094 ;   # capital D
-    E5  D095 ;   # capital YE
-    E6  D0A4 ;   # capital F
-    E7  D093 ;   # capital G
-    E8  D0A5 ;   # capital KH
-    E9  D098 ;   # capital I
-    EA  D099 ;   # capital J
-    EB  D09A ;   # capital K
-    EC  D09B ;   # capital L
-    ED  D09C ;   # capital M
-    EE  D09D ;   # capital N
-    EF  D09E ;   # capital O
-
-    F0  D09F ;   # capital P
-    F1  D0AF ;   # capital YA
-    F2  D0A0 ;   # capital R
-    F3  D0A1 ;   # capital S
-    F4  D0A2 ;   # capital T
-    F5  D0A3 ;   # capital U
-    F6  D096 ;   # capital ZH
-    F7  D092 ;   # capital V
-    F8  D0AC ;   # capital soft sign
-    F9  D0AB ;   # capital Y
-    FA  D097 ;   # capital Z
-    FB  D0A8 ;   # capital SH
-    FC  D0AD ;   # capital E
-    FD  D0A9 ;   # capital SHCH
-    FE  D0A7 ;   # capital CH
-    FF  D0AA ;   # capital hard sign
-}

src/resources/nginx/conf/koi-win

@@ -1,103 +0,0 @@
-
-charset_map  koi8-r  windows-1251 {
-
-    80  88 ; # euro
-
-    95  95 ; # bullet
-
-    9A  A0 ; #  
-
-    9E  B7 ; # ·
-
-    A3  B8 ; # small yo
-    A4  BA ; # small Ukrainian ye
-
-    A6  B3 ; # small Ukrainian i
-    A7  BF ; # small Ukrainian yi
-
-    AD  B4 ; # small Ukrainian soft g
-    AE  A2 ; # small Byelorussian short u
-
-    B0  B0 ; # °
-
-    B3  A8 ; # capital YO
-    B4  AA ; # capital Ukrainian YE
-
-    B6  B2 ; # capital Ukrainian I
-    B7  AF ; # capital Ukrainian YI
-
-    B9  B9 ; # numero sign
-
-    BD  A5 ; # capital Ukrainian soft G
-    BE  A1 ; # capital Byelorussian short U
-
-    BF  A9 ; # (C)
-
-    C0  FE ; # small yu
-    C1  E0 ; # small a
-    C2  E1 ; # small b
-    C3  F6 ; # small ts
-    C4  E4 ; # small d
-    C5  E5 ; # small ye
-    C6  F4 ; # small f
-    C7  E3 ; # small g
-    C8  F5 ; # small kh
-    C9  E8 ; # small i
-    CA  E9 ; # small j
-    CB  EA ; # small k
-    CC  EB ; # small l
-    CD  EC ; # small m
-    CE  ED ; # small n
-    CF  EE ; # small o
-
-    D0  EF ; # small p
-    D1  FF ; # small ya
-    D2  F0 ; # small r
-    D3  F1 ; # small s
-    D4  F2 ; # small t
-    D5  F3 ; # small u
-    D6  E6 ; # small zh
-    D7  E2 ; # small v
-    D8  FC ; # small soft sign
-    D9  FB ; # small y
-    DA  E7 ; # small z
-    DB  F8 ; # small sh
-    DC  FD ; # small e
-    DD  F9 ; # small shch
-    DE  F7 ; # small ch
-    DF  FA ; # small hard sign
-
-    E0  DE ; # capital YU
-    E1  C0 ; # capital A
-    E2  C1 ; # capital B
-    E3  D6 ; # capital TS
-    E4  C4 ; # capital D
-    E5  C5 ; # capital YE
-    E6  D4 ; # capital F
-    E7  C3 ; # capital G
-    E8  D5 ; # capital KH
-    E9  C8 ; # capital I
-    EA  C9 ; # capital J
-    EB  CA ; # capital K
-    EC  CB ; # capital L
-    ED  CC ; # capital M
-    EE  CD ; # capital N
-    EF  CE ; # capital O
-
-    F0  CF ; # capital P
-    F1  DF ; # capital YA
-    F2  D0 ; # capital R
-    F3  D1 ; # capital S
-    F4  D2 ; # capital T
-    F5  D3 ; # capital U
-    F6  C6 ; # capital ZH
-    F7  C2 ; # capital V
-    F8  DC ; # capital soft sign
-    F9  DB ; # capital Y
-    FA  C7 ; # capital Z
-    FB  D8 ; # capital SH
-    FC  DD ; # capital E
-    FD  D9 ; # capital SHCH
-    FE  D7 ; # capital CH
-    FF  DA ; # capital hard sign
-}

src/resources/nginx/conf/mime.types

@@ -1,99 +0,0 @@
-
-types {
-    text/html                                        html htm shtml;
-    text/css                                         css;
-    text/xml                                         xml;
-    image/gif                                        gif;
-    image/jpeg                                       jpeg jpg;
-    application/javascript                           js;
-    application/atom+xml                             atom;
-    application/rss+xml                              rss;
-
-    text/mathml                                      mml;
-    text/plain                                       txt;
-    text/vnd.sun.j2me.app-descriptor                 jad;
-    text/vnd.wap.wml                                 wml;
-    text/x-component                                 htc;
-
-    image/avif                                       avif;
-    image/png                                        png;
-    image/svg+xml                                    svg svgz;
-    image/tiff                                       tif tiff;
-    image/vnd.wap.wbmp                               wbmp;
-    image/webp                                       webp;
-    image/x-icon                                     ico;
-    image/x-jng                                      jng;
-    image/x-ms-bmp                                   bmp;
-
-    font/woff                                        woff;
-    font/woff2                                       woff2;
-
-    application/java-archive                         jar war ear;
-    application/json                                 json;
-    application/mac-binhex40                         hqx;
-    application/msword                               doc;
-    application/pdf                                  pdf;
-    application/postscript                           ps eps ai;
-    application/rtf                                  rtf;
-    application/vnd.apple.mpegurl                    m3u8;
-    application/vnd.google-earth.kml+xml             kml;
-    application/vnd.google-earth.kmz                 kmz;
-    application/vnd.ms-excel                         xls;
-    application/vnd.ms-fontobject                    eot;
-    application/vnd.ms-powerpoint                    ppt;
-    application/vnd.oasis.opendocument.graphics      odg;
-    application/vnd.oasis.opendocument.presentation  odp;
-    application/vnd.oasis.opendocument.spreadsheet   ods;
-    application/vnd.oasis.opendocument.text          odt;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation
-                                                     pptx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-                                                     xlsx;
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document
-                                                     docx;
-    application/vnd.wap.wmlc                         wmlc;
-    application/wasm                                 wasm;
-    application/x-7z-compressed                      7z;
-    application/x-cocoa                              cco;
-    application/x-java-archive-diff                  jardiff;
-    application/x-java-jnlp-file                     jnlp;
-    application/x-makeself                           run;
-    application/x-perl                               pl pm;
-    application/x-pilot                              prc pdb;
-    application/x-rar-compressed                     rar;
-    application/x-redhat-package-manager             rpm;
-    application/x-sea                                sea;
-    application/x-shockwave-flash                    swf;
-    application/x-stuffit                            sit;
-    application/x-tcl                                tcl tk;
-    application/x-x509-ca-cert                       der pem crt;
-    application/x-xpinstall                          xpi;
-    application/xhtml+xml                            xhtml;
-    application/xspf+xml                             xspf;
-    application/zip                                  zip;
-
-    application/octet-stream                         bin exe dll;
-    application/octet-stream                         deb;
-    application/octet-stream                         dmg;
-    application/octet-stream                         iso img;
-    application/octet-stream                         msi msp msm;
-
-    audio/midi                                       mid midi kar;
-    audio/mpeg                                       mp3;
-    audio/ogg                                        ogg;
-    audio/x-m4a                                      m4a;
-    audio/x-realaudio                                ra;
-
-    video/3gpp                                       3gpp 3gp;
-    video/mp2t                                       ts;
-    video/mp4                                        mp4;
-    video/mpeg                                       mpeg mpg;
-    video/quicktime                                  mov;
-    video/webm                                       webm;
-    video/x-flv                                      flv;
-    video/x-m4v                                      m4v;
-    video/x-mng                                      mng;
-    video/x-ms-asf                                   asx asf;
-    video/x-ms-wmv                                   wmv;
-    video/x-msvideo                                  avi;
-}

src/resources/nginx/conf/nginx.conf

@@ -1,61 +0,0 @@
-#user  nobody;
-worker_processes  1;
-
-#error_log  logs/error.log;
-#error_log  logs/error.log  notice;
-#error_log  logs/error.log  info;
-
-#pid        logs/nginx.pid;
-
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-
-    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-    #                  '$status $body_bytes_sent "$http_referer" '
-    #                  '"$http_user_agent" "$http_x_forwarded_for"';
-
-    #access_log  logs/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    #keepalive_timeout  0;
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-        #charset koi8-r;
-
-        #access_log  logs/host.access.log  main;
-
-        location / {
-            root   html/dist;
-            index  index.html index.htm;
-        }
-
-        location /onlinetest/ {
-            rewrite ^/onlinetest/(.*)$ /$1 break;
-            proxy_pass http://123.57.54.1:8048;
-        }
-
-        #error_page  404              /404.html;
-
-        # redirect server error pages to the static page /50x.html
-        #
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-    }
-}

src/resources/nginx/conf/scgi_params

@@ -1,17 +0,0 @@
-
-scgi_param  REQUEST_METHOD     $request_method;
-scgi_param  REQUEST_URI        $request_uri;
-scgi_param  QUERY_STRING       $query_string;
-scgi_param  CONTENT_TYPE       $content_type;
-
-scgi_param  DOCUMENT_URI       $document_uri;
-scgi_param  DOCUMENT_ROOT      $document_root;
-scgi_param  SCGI               1;
-scgi_param  SERVER_PROTOCOL    $server_protocol;
-scgi_param  REQUEST_SCHEME     $scheme;
-scgi_param  HTTPS              $https if_not_empty;
-
-scgi_param  REMOTE_ADDR        $remote_addr;
-scgi_param  REMOTE_PORT        $remote_port;
-scgi_param  SERVER_PORT        $server_port;
-scgi_param  SERVER_NAME        $server_name;

src/resources/nginx/conf/uwsgi_params

@@ -1,17 +0,0 @@
-
-uwsgi_param  QUERY_STRING       $query_string;
-uwsgi_param  REQUEST_METHOD     $request_method;
-uwsgi_param  CONTENT_TYPE       $content_type;
-uwsgi_param  CONTENT_LENGTH     $content_length;
-
-uwsgi_param  REQUEST_URI        $request_uri;
-uwsgi_param  PATH_INFO          $document_uri;
-uwsgi_param  DOCUMENT_ROOT      $document_root;
-uwsgi_param  SERVER_PROTOCOL    $server_protocol;
-uwsgi_param  REQUEST_SCHEME     $scheme;
-uwsgi_param  HTTPS              $https if_not_empty;
-
-uwsgi_param  REMOTE_ADDR        $remote_addr;
-uwsgi_param  REMOTE_PORT        $remote_port;
-uwsgi_param  SERVER_PORT        $server_port;
-uwsgi_param  SERVER_NAME        $server_name;

src/resources/nginx/conf/win-utf

@@ -1,126 +0,0 @@
-
-# This map is not a full windows-1251 <> utf8 map: it does not
-# contain Serbian and Macedonian letters.  If you need a full map,
-# use contrib/unicode2nginx/win-utf map instead.
-
-charset_map  windows-1251  utf-8 {
-
-    82  E2809A ; # single low-9 quotation mark
-
-    84  E2809E ; # double low-9 quotation mark
-    85  E280A6 ; # ellipsis
-    86  E280A0 ; # dagger
-    87  E280A1 ; # double dagger
-    88  E282AC ; # euro
-    89  E280B0 ; # per mille
-
-    91  E28098 ; # left single quotation mark
-    92  E28099 ; # right single quotation mark
-    93  E2809C ; # left double quotation mark
-    94  E2809D ; # right double quotation mark
-    95  E280A2 ; # bullet
-    96  E28093 ; # en dash
-    97  E28094 ; # em dash
-
-    99  E284A2 ; # trade mark sign
-
-    A0  C2A0 ;   # &nbsp;
-    A1  D18E ;   # capital Byelorussian short U
-    A2  D19E ;   # small Byelorussian short u
-
-    A4  C2A4 ;   # currency sign
-    A5  D290 ;   # capital Ukrainian soft G
-    A6  C2A6 ;   # borken bar
-    A7  C2A7 ;   # section sign
-    A8  D081 ;   # capital YO
-    A9  C2A9 ;   # (C)
-    AA  D084 ;   # capital Ukrainian YE
-    AB  C2AB ;   # left-pointing double angle quotation mark
-    AC  C2AC ;   # not sign
-    AD  C2AD ;   # soft hypen
-    AE  C2AE ;   # (R)
-    AF  D087 ;   # capital Ukrainian YI
-
-    B0  C2B0 ;   # &deg;
-    B1  C2B1 ;   # plus-minus sign
-    B2  D086 ;   # capital Ukrainian I
-    B3  D196 ;   # small Ukrainian i
-    B4  D291 ;   # small Ukrainian soft g
-    B5  C2B5 ;   # micro sign
-    B6  C2B6 ;   # pilcrow sign
-    B7  C2B7 ;   # &middot;
-    B8  D191 ;   # small yo
-    B9  E28496 ; # numero sign
-    BA  D194 ;   # small Ukrainian ye
-    BB  C2BB ;   # right-pointing double angle quotation mark
-
-    BF  D197 ;   # small Ukrainian yi
-
-    C0  D090 ;   # capital A
-    C1  D091 ;   # capital B
-    C2  D092 ;   # capital V
-    C3  D093 ;   # capital G
-    C4  D094 ;   # capital D
-    C5  D095 ;   # capital YE
-    C6  D096 ;   # capital ZH
-    C7  D097 ;   # capital Z
-    C8  D098 ;   # capital I
-    C9  D099 ;   # capital J
-    CA  D09A ;   # capital K
-    CB  D09B ;   # capital L
-    CC  D09C ;   # capital M
-    CD  D09D ;   # capital N
-    CE  D09E ;   # capital O
-    CF  D09F ;   # capital P
-
-    D0  D0A0 ;   # capital R
-    D1  D0A1 ;   # capital S
-    D2  D0A2 ;   # capital T
-    D3  D0A3 ;   # capital U
-    D4  D0A4 ;   # capital F
-    D5  D0A5 ;   # capital KH
-    D6  D0A6 ;   # capital TS
-    D7  D0A7 ;   # capital CH
-    D8  D0A8 ;   # capital SH
-    D9  D0A9 ;   # capital SHCH
-    DA  D0AA ;   # capital hard sign
-    DB  D0AB ;   # capital Y
-    DC  D0AC ;   # capital soft sign
-    DD  D0AD ;   # capital E
-    DE  D0AE ;   # capital YU
-    DF  D0AF ;   # capital YA
-
-    E0  D0B0 ;   # small a
-    E1  D0B1 ;   # small b
-    E2  D0B2 ;   # small v
-    E3  D0B3 ;   # small g
-    E4  D0B4 ;   # small d
-    E5  D0B5 ;   # small ye
-    E6  D0B6 ;   # small zh
-    E7  D0B7 ;   # small z
-    E8  D0B8 ;   # small i
-    E9  D0B9 ;   # small j
-    EA  D0BA ;   # small k
-    EB  D0BB ;   # small l
-    EC  D0BC ;   # small m
-    ED  D0BD ;   # small n
-    EE  D0BE ;   # small o
-    EF  D0BF ;   # small p
-
-    F0  D180 ;   # small r
-    F1  D181 ;   # small s
-    F2  D182 ;   # small t
-    F3  D183 ;   # small u
-    F4  D184 ;   # small f
-    F5  D185 ;   # small kh
-    F6  D186 ;   # small ts
-    F7  D187 ;   # small ch
-    F8  D188 ;   # small sh
-    F9  D189 ;   # small shch
-    FA  D18A ;   # small hard sign
-    FB  D18B ;   # small y
-    FC  D18C ;   # small soft sign
-    FD  D18D ;   # small e
-    FE  D18E ;   # small yu
-    FF  D18F ;   # small ya
-}

src/resources/nginx/contrib/README

@@ -1,21 +0,0 @@
-
-geo2nginx.pl 		by Andrei Nigmatulin
-
-	The perl script to convert CSV geoip database ( free download
-	at http://www.maxmind.com/app/geoip_country ) to format, suitable
-	for use by the ngx_http_geo_module.
-
-
-unicode2nginx		by Maxim Dounin
-
-	The perl script to convert unicode mappings ( available
-	at http://www.unicode.org/Public/MAPPINGS/ ) to the nginx
-	configuration file format.
-	Two generated full maps for windows-1251 and koi8-r.
-
-
-vim			by Evan Miller
-
-	Syntax highlighting of nginx configuration for vim, to be
-	placed into ~/.vim/.
-

src/resources/nginx/contrib/geo2nginx.pl

@@ -1,58 +0,0 @@
-#!/usr/bin/perl -w
-
-# (c) Andrei Nigmatulin, 2005
-#
-# this script provided "as is", without any warranties. use it at your own risk.
-#
-# special thanx to Andrew Sitnikov for perl port
-#
-# this script converts CSV geoip database (free download at http://www.maxmind.com/app/geoip_country)
-# to format, suitable for use with nginx_http_geo module (http://sysoev.ru/nginx)
-#
-# for example, line with ip range
-#
-#   "62.16.68.0","62.16.127.255","1041253376","1041268735","RU","Russian Federation"
-#
-# will be converted to four subnetworks:
-#
-#   62.16.68.0/22 RU;
-#   62.16.72.0/21 RU;
-#   62.16.80.0/20 RU;
-#   62.16.96.0/19 RU;
-
-
-use warnings;
-use strict;
-
-while( <STDIN> ){
-	if (/"[^"]+","[^"]+","([^"]+)","([^"]+)","([^"]+)"/){
-		print_subnets($1, $2, $3);
-	}
-}
-
-sub  print_subnets {
-	my ($a1, $a2, $c) = @_;
-	my $l;
-    while ($a1 <= $a2) {
-		for ($l = 0; ($a1 & (1 << $l)) == 0 && ($a1 + ((1 << ($l + 1)) - 1)) <= $a2; $l++){};
-		print long2ip($a1) . "/" . (32 - $l) . " " . $c . ";\n";
-    	$a1 += (1 << $l);
-	}
-}
-
-sub long2ip {
-	my $ip = shift;
-
-	my $str = 0;
-
-	$str = ($ip & 255);
-
-	$ip >>= 8;
-	$str = ($ip & 255).".$str";
-
-	$ip >>= 8;
-	$str = ($ip & 255).".$str";
-
-	$ip >>= 8;
-	$str = ($ip & 255).".$str";
-}

src/resources/nginx/contrib/unicode2nginx/koi-utf

@@ -1,131 +0,0 @@
-charset_map  koi8-r  utf-8 {
-
-    80  E29480 ; #	BOX DRAWINGS LIGHT HORIZONTAL
-    81  E29482 ; #	BOX DRAWINGS LIGHT VERTICAL
-    82  E2948C ; #	BOX DRAWINGS LIGHT DOWN AND RIGHT
-    83  E29490 ; #	BOX DRAWINGS LIGHT DOWN AND LEFT
-    84  E29494 ; #	BOX DRAWINGS LIGHT UP AND RIGHT
-    85  E29498 ; #	BOX DRAWINGS LIGHT UP AND LEFT
-    86  E2949C ; #	BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-    87  E294A4 ; #	BOX DRAWINGS LIGHT VERTICAL AND LEFT
-    88  E294AC ; #	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-    89  E294B4 ; #	BOX DRAWINGS LIGHT UP AND HORIZONTAL
-    8A  E294BC ; #	BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-    8B  E29680 ; #	UPPER HALF BLOCK
-    8C  E29684 ; #	LOWER HALF BLOCK
-    8D  E29688 ; #	FULL BLOCK
-    8E  E2968C ; #	LEFT HALF BLOCK
-    8F  E29690 ; #	RIGHT HALF BLOCK
-    90  E29691 ; #	LIGHT SHADE
-    91  E29692 ; #	MEDIUM SHADE
-    92  E29693 ; #	DARK SHADE
-    93  E28CA0 ; #	TOP HALF INTEGRAL
-    94  E296A0 ; #	BLACK SQUARE
-    95  E28899 ; #	BULLET OPERATOR
-    96  E2889A ; #	SQUARE ROOT
-    97  E28988 ; #	ALMOST EQUAL TO
-    98  E289A4 ; #	LESS-THAN OR EQUAL TO
-    99  E289A5 ; #	GREATER-THAN OR EQUAL TO
-    9A  C2A0 ; #	NO-BREAK SPACE
-    9B  E28CA1 ; #	BOTTOM HALF INTEGRAL
-    9C  C2B0 ; #	DEGREE SIGN
-    9D  C2B2 ; #	SUPERSCRIPT TWO
-    9E  C2B7 ; #	MIDDLE DOT
-    9F  C3B7 ; #	DIVISION SIGN
-    A0  E29590 ; #	BOX DRAWINGS DOUBLE HORIZONTAL
-    A1  E29591 ; #	BOX DRAWINGS DOUBLE VERTICAL
-    A2  E29592 ; #	BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
-    A3  D191 ; #	CYRILLIC SMALL LETTER IO
-    A4  E29593 ; #	BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
-    A5  E29594 ; #	BOX DRAWINGS DOUBLE DOWN AND RIGHT
-    A6  E29595 ; #	BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
-    A7  E29596 ; #	BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
-    A8  E29597 ; #	BOX DRAWINGS DOUBLE DOWN AND LEFT
-    A9  E29598 ; #	BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
-    AA  E29599 ; #	BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
-    AB  E2959A ; #	BOX DRAWINGS DOUBLE UP AND RIGHT
-    AC  E2959B ; #	BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
-    AD  E2959C ; #	BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
-    AE  E2959D ; #	BOX DRAWINGS DOUBLE UP AND LEFT
-    AF  E2959E ; #	BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
-    B0  E2959F ; #	BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
-    B1  E295A0 ; #	BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
-    B2  E295A1 ; #	BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
-    B3  D081 ; #	CYRILLIC CAPITAL LETTER IO
-    B4  E295A2 ; #	BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
-    B5  E295A3 ; #	BOX DRAWINGS DOUBLE VERTICAL AND LEFT
-    B6  E295A4 ; #	BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
-    B7  E295A5 ; #	BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
-    B8  E295A6 ; #	BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
-    B9  E295A7 ; #	BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
-    BA  E295A8 ; #	BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
-    BB  E295A9 ; #	BOX DRAWINGS DOUBLE UP AND HORIZONTAL
-    BC  E295AA ; #	BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
-    BD  E295AB ; #	BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
-    BE  E295AC ; #	BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
-    BF  C2A9 ; #	COPYRIGHT SIGN
-    C0  D18E ; #	CYRILLIC SMALL LETTER YU
-    C1  D0B0 ; #	CYRILLIC SMALL LETTER A
-    C2  D0B1 ; #	CYRILLIC SMALL LETTER BE
-    C3  D186 ; #	CYRILLIC SMALL LETTER TSE
-    C4  D0B4 ; #	CYRILLIC SMALL LETTER DE
-    C5  D0B5 ; #	CYRILLIC SMALL LETTER IE
-    C6  D184 ; #	CYRILLIC SMALL LETTER EF
-    C7  D0B3 ; #	CYRILLIC SMALL LETTER GHE
-    C8  D185 ; #	CYRILLIC SMALL LETTER HA
-    C9  D0B8 ; #	CYRILLIC SMALL LETTER I
-    CA  D0B9 ; #	CYRILLIC SMALL LETTER SHORT I
-    CB  D0BA ; #	CYRILLIC SMALL LETTER KA
-    CC  D0BB ; #	CYRILLIC SMALL LETTER EL
-    CD  D0BC ; #	CYRILLIC SMALL LETTER EM
-    CE  D0BD ; #	CYRILLIC SMALL LETTER EN
-    CF  D0BE ; #	CYRILLIC SMALL LETTER O
-    D0  D0BF ; #	CYRILLIC SMALL LETTER PE
-    D1  D18F ; #	CYRILLIC SMALL LETTER YA
-    D2  D180 ; #	CYRILLIC SMALL LETTER ER
-    D3  D181 ; #	CYRILLIC SMALL LETTER ES
-    D4  D182 ; #	CYRILLIC SMALL LETTER TE
-    D5  D183 ; #	CYRILLIC SMALL LETTER U
-    D6  D0B6 ; #	CYRILLIC SMALL LETTER ZHE
-    D7  D0B2 ; #	CYRILLIC SMALL LETTER VE
-    D8  D18C ; #	CYRILLIC SMALL LETTER SOFT SIGN
-    D9  D18B ; #	CYRILLIC SMALL LETTER YERU
-    DA  D0B7 ; #	CYRILLIC SMALL LETTER ZE
-    DB  D188 ; #	CYRILLIC SMALL LETTER SHA
-    DC  D18D ; #	CYRILLIC SMALL LETTER E
-    DD  D189 ; #	CYRILLIC SMALL LETTER SHCHA
-    DE  D187 ; #	CYRILLIC SMALL LETTER CHE
-    DF  D18A ; #	CYRILLIC SMALL LETTER HARD SIGN
-    E0  D0AE ; #	CYRILLIC CAPITAL LETTER YU
-    E1  D090 ; #	CYRILLIC CAPITAL LETTER A
-    E2  D091 ; #	CYRILLIC CAPITAL LETTER BE
-    E3  D0A6 ; #	CYRILLIC CAPITAL LETTER TSE
-    E4  D094 ; #	CYRILLIC CAPITAL LETTER DE
-    E5  D095 ; #	CYRILLIC CAPITAL LETTER IE
-    E6  D0A4 ; #	CYRILLIC CAPITAL LETTER EF
-    E7  D093 ; #	CYRILLIC CAPITAL LETTER GHE
-    E8  D0A5 ; #	CYRILLIC CAPITAL LETTER HA
-    E9  D098 ; #	CYRILLIC CAPITAL LETTER I
-    EA  D099 ; #	CYRILLIC CAPITAL LETTER SHORT I
-    EB  D09A ; #	CYRILLIC CAPITAL LETTER KA
-    EC  D09B ; #	CYRILLIC CAPITAL LETTER EL
-    ED  D09C ; #	CYRILLIC CAPITAL LETTER EM
-    EE  D09D ; #	CYRILLIC CAPITAL LETTER EN
-    EF  D09E ; #	CYRILLIC CAPITAL LETTER O
-    F0  D09F ; #	CYRILLIC CAPITAL LETTER PE
-    F1  D0AF ; #	CYRILLIC CAPITAL LETTER YA
-    F2  D0A0 ; #	CYRILLIC CAPITAL LETTER ER
-    F3  D0A1 ; #	CYRILLIC CAPITAL LETTER ES
-    F4  D0A2 ; #	CYRILLIC CAPITAL LETTER TE
-    F5  D0A3 ; #	CYRILLIC CAPITAL LETTER U
-    F6  D096 ; #	CYRILLIC CAPITAL LETTER ZHE
-    F7  D092 ; #	CYRILLIC CAPITAL LETTER VE
-    F8  D0AC ; #	CYRILLIC CAPITAL LETTER SOFT SIGN
-    F9  D0AB ; #	CYRILLIC CAPITAL LETTER YERU
-    FA  D097 ; #	CYRILLIC CAPITAL LETTER ZE
-    FB  D0A8 ; #	CYRILLIC CAPITAL LETTER SHA
-    FC  D0AD ; #	CYRILLIC CAPITAL LETTER E
-    FD  D0A9 ; #	CYRILLIC CAPITAL LETTER SHCHA
-    FE  D0A7 ; #	CYRILLIC CAPITAL LETTER CHE
-    FF  D0AA ; #	CYRILLIC CAPITAL LETTER HARD SIGN
-}

src/resources/nginx/contrib/unicode2nginx/unicode-to-nginx.pl

@@ -1,48 +0,0 @@
-#!/usr/bin/perl -w
-
-# Convert unicode mappings to nginx configuration file format.
-
-# You may find useful mappings in various places, including
-# unicode.org official site:
-#
-# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1251.TXT
-# http://www.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT
-
-# Needs perl 5.6 or later.
-
-# Written by Maxim Dounin, mdounin@mdounin.ru
-
-###############################################################################
-
-require 5.006;
-
-while (<>) {
-	# Skip comments and empty lines
-
-	next if /^#/;
-	next if /^\s*$/;
-	chomp;
-
-	# Convert mappings
-
-	if (/^\s*0x(..)\s*0x(....)\s*(#.*)/) {
-		# Mapping <from-code> <unicode-code> "#" <unicode-name>
-		my $cs_code = $1;
-		my $un_code = $2;
-		my $un_name = $3;
-
-		# Produce UTF-8 sequence from character code;
-
-		my $un_utf8 = join('',
-			map { sprintf("%02X", $_) }
-			unpack("U0C*", pack("U", hex($un_code)))
-		);
-
-		print "    $cs_code  $un_utf8 ; $un_name\n";
-
-	} else {
-		warn "Unrecognized line: '$_'";
-	}
-}
-
-###############################################################################

src/resources/nginx/contrib/unicode2nginx/win-utf

@@ -1,130 +0,0 @@
-charset_map  windows-1251  utf-8 {
-
-    80  D082 ; #CYRILLIC CAPITAL LETTER DJE
-    81  D083 ; #CYRILLIC CAPITAL LETTER GJE
-    82  E2809A ; #SINGLE LOW-9 QUOTATION MARK
-    83  D193 ; #CYRILLIC SMALL LETTER GJE
-    84  E2809E ; #DOUBLE LOW-9 QUOTATION MARK
-    85  E280A6 ; #HORIZONTAL ELLIPSIS
-    86  E280A0 ; #DAGGER
-    87  E280A1 ; #DOUBLE DAGGER
-    88  E282AC ; #EURO SIGN
-    89  E280B0 ; #PER MILLE SIGN
-    8A  D089 ; #CYRILLIC CAPITAL LETTER LJE
-    8B  E280B9 ; #SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-    8C  D08A ; #CYRILLIC CAPITAL LETTER NJE
-    8D  D08C ; #CYRILLIC CAPITAL LETTER KJE
-    8E  D08B ; #CYRILLIC CAPITAL LETTER TSHE
-    8F  D08F ; #CYRILLIC CAPITAL LETTER DZHE
-    90  D192 ; #CYRILLIC SMALL LETTER DJE
-    91  E28098 ; #LEFT SINGLE QUOTATION MARK
-    92  E28099 ; #RIGHT SINGLE QUOTATION MARK
-    93  E2809C ; #LEFT DOUBLE QUOTATION MARK
-    94  E2809D ; #RIGHT DOUBLE QUOTATION MARK
-    95  E280A2 ; #BULLET
-    96  E28093 ; #EN DASH
-    97  E28094 ; #EM DASH
-    99  E284A2 ; #TRADE MARK SIGN
-    9A  D199 ; #CYRILLIC SMALL LETTER LJE
-    9B  E280BA ; #SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-    9C  D19A ; #CYRILLIC SMALL LETTER NJE
-    9D  D19C ; #CYRILLIC SMALL LETTER KJE
-    9E  D19B ; #CYRILLIC SMALL LETTER TSHE
-    9F  D19F ; #CYRILLIC SMALL LETTER DZHE
-    A0  C2A0 ; #NO-BREAK SPACE
-    A1  D08E ; #CYRILLIC CAPITAL LETTER SHORT U
-    A2  D19E ; #CYRILLIC SMALL LETTER SHORT U
-    A3  D088 ; #CYRILLIC CAPITAL LETTER JE
-    A4  C2A4 ; #CURRENCY SIGN
-    A5  D290 ; #CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-    A6  C2A6 ; #BROKEN BAR
-    A7  C2A7 ; #SECTION SIGN
-    A8  D081 ; #CYRILLIC CAPITAL LETTER IO
-    A9  C2A9 ; #COPYRIGHT SIGN
-    AA  D084 ; #CYRILLIC CAPITAL LETTER UKRAINIAN IE
-    AB  C2AB ; #LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-    AC  C2AC ; #NOT SIGN
-    AD  C2AD ; #SOFT HYPHEN
-    AE  C2AE ; #REGISTERED SIGN
-    AF  D087 ; #CYRILLIC CAPITAL LETTER YI
-    B0  C2B0 ; #DEGREE SIGN
-    B1  C2B1 ; #PLUS-MINUS SIGN
-    B2  D086 ; #CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-    B3  D196 ; #CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-    B4  D291 ; #CYRILLIC SMALL LETTER GHE WITH UPTURN
-    B5  C2B5 ; #MICRO SIGN
-    B6  C2B6 ; #PILCROW SIGN
-    B7  C2B7 ; #MIDDLE DOT
-    B8  D191 ; #CYRILLIC SMALL LETTER IO
-    B9  E28496 ; #NUMERO SIGN
-    BA  D194 ; #CYRILLIC SMALL LETTER UKRAINIAN IE
-    BB  C2BB ; #RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-    BC  D198 ; #CYRILLIC SMALL LETTER JE
-    BD  D085 ; #CYRILLIC CAPITAL LETTER DZE
-    BE  D195 ; #CYRILLIC SMALL LETTER DZE
-    BF  D197 ; #CYRILLIC SMALL LETTER YI
-    C0  D090 ; #CYRILLIC CAPITAL LETTER A
-    C1  D091 ; #CYRILLIC CAPITAL LETTER BE
-    C2  D092 ; #CYRILLIC CAPITAL LETTER VE
-    C3  D093 ; #CYRILLIC CAPITAL LETTER GHE
-    C4  D094 ; #CYRILLIC CAPITAL LETTER DE
-    C5  D095 ; #CYRILLIC CAPITAL LETTER IE
-    C6  D096 ; #CYRILLIC CAPITAL LETTER ZHE
-    C7  D097 ; #CYRILLIC CAPITAL LETTER ZE
-    C8  D098 ; #CYRILLIC CAPITAL LETTER I
-    C9  D099 ; #CYRILLIC CAPITAL LETTER SHORT I
-    CA  D09A ; #CYRILLIC CAPITAL LETTER KA
-    CB  D09B ; #CYRILLIC CAPITAL LETTER EL
-    CC  D09C ; #CYRILLIC CAPITAL LETTER EM
-    CD  D09D ; #CYRILLIC CAPITAL LETTER EN
-    CE  D09E ; #CYRILLIC CAPITAL LETTER O
-    CF  D09F ; #CYRILLIC CAPITAL LETTER PE
-    D0  D0A0 ; #CYRILLIC CAPITAL LETTER ER
-    D1  D0A1 ; #CYRILLIC CAPITAL LETTER ES
-    D2  D0A2 ; #CYRILLIC CAPITAL LETTER TE
-    D3  D0A3 ; #CYRILLIC CAPITAL LETTER U
-    D4  D0A4 ; #CYRILLIC CAPITAL LETTER EF
-    D5  D0A5 ; #CYRILLIC CAPITAL LETTER HA
-    D6  D0A6 ; #CYRILLIC CAPITAL LETTER TSE
-    D7  D0A7 ; #CYRILLIC CAPITAL LETTER CHE
-    D8  D0A8 ; #CYRILLIC CAPITAL LETTER SHA
-    D9  D0A9 ; #CYRILLIC CAPITAL LETTER SHCHA
-    DA  D0AA ; #CYRILLIC CAPITAL LETTER HARD SIGN
-    DB  D0AB ; #CYRILLIC CAPITAL LETTER YERU
-    DC  D0AC ; #CYRILLIC CAPITAL LETTER SOFT SIGN
-    DD  D0AD ; #CYRILLIC CAPITAL LETTER E
-    DE  D0AE ; #CYRILLIC CAPITAL LETTER YU
-    DF  D0AF ; #CYRILLIC CAPITAL LETTER YA
-    E0  D0B0 ; #CYRILLIC SMALL LETTER A
-    E1  D0B1 ; #CYRILLIC SMALL LETTER BE
-    E2  D0B2 ; #CYRILLIC SMALL LETTER VE
-    E3  D0B3 ; #CYRILLIC SMALL LETTER GHE
-    E4  D0B4 ; #CYRILLIC SMALL LETTER DE
-    E5  D0B5 ; #CYRILLIC SMALL LETTER IE
-    E6  D0B6 ; #CYRILLIC SMALL LETTER ZHE
-    E7  D0B7 ; #CYRILLIC SMALL LETTER ZE
-    E8  D0B8 ; #CYRILLIC SMALL LETTER I
-    E9  D0B9 ; #CYRILLIC SMALL LETTER SHORT I
-    EA  D0BA ; #CYRILLIC SMALL LETTER KA
-    EB  D0BB ; #CYRILLIC SMALL LETTER EL
-    EC  D0BC ; #CYRILLIC SMALL LETTER EM
-    ED  D0BD ; #CYRILLIC SMALL LETTER EN
-    EE  D0BE ; #CYRILLIC SMALL LETTER O
-    EF  D0BF ; #CYRILLIC SMALL LETTER PE
-    F0  D180 ; #CYRILLIC SMALL LETTER ER
-    F1  D181 ; #CYRILLIC SMALL LETTER ES
-    F2  D182 ; #CYRILLIC SMALL LETTER TE
-    F3  D183 ; #CYRILLIC SMALL LETTER U
-    F4  D184 ; #CYRILLIC SMALL LETTER EF
-    F5  D185 ; #CYRILLIC SMALL LETTER HA
-    F6  D186 ; #CYRILLIC SMALL LETTER TSE
-    F7  D187 ; #CYRILLIC SMALL LETTER CHE
-    F8  D188 ; #CYRILLIC SMALL LETTER SHA
-    F9  D189 ; #CYRILLIC SMALL LETTER SHCHA
-    FA  D18A ; #CYRILLIC SMALL LETTER HARD SIGN
-    FB  D18B ; #CYRILLIC SMALL LETTER YERU
-    FC  D18C ; #CYRILLIC SMALL LETTER SOFT SIGN
-    FD  D18D ; #CYRILLIC SMALL LETTER E
-    FE  D18E ; #CYRILLIC SMALL LETTER YU
-    FF  D18F ; #CYRILLIC SMALL LETTER YA
-}

src/resources/nginx/contrib/vim/ftdetect/nginx.vim

@@ -1,4 +0,0 @@
-au BufRead,BufNewFile *.nginx set ft=nginx
-au BufRead,BufNewFile */etc/nginx/* set ft=nginx
-au BufRead,BufNewFile */usr/local/nginx/conf/* set ft=nginx
-au BufRead,BufNewFile nginx.conf set ft=nginx

src/resources/nginx/contrib/vim/ftplugin/nginx.vim

@@ -1 +0,0 @@
-setlocal commentstring=#\ %s

src/resources/nginx/contrib/vim/indent/nginx.vim

@@ -1,11 +0,0 @@
-if exists("b:did_indent")
-    finish
-endif
-let b:did_indent = 1
-
-setlocal indentexpr=
-
-" cindent actually works for nginx' simple file structure
-setlocal cindent
-" Just make sure that the comments are not reset as defs would be.
-setlocal cinkeys-=0#

src/resources/nginx/docs/LICENSE

@@ -1,26 +0,0 @@
-/* 
- * Copyright (C) 2002-2021 Igor Sysoev
- * Copyright (C) 2011-2022 Nginx, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */

src/resources/nginx/docs/OpenSSL.LICENSE

@@ -1,125 +0,0 @@
-
-  LICENSE ISSUES
-  ==============
-
-  The OpenSSL toolkit stays under a double license, i.e. both the conditions of
-  the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts.
-
-  OpenSSL License
-  ---------------
-
-/* ====================================================================
- * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
- Original SSLeay License
- -----------------------
-
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-

src/resources/nginx/docs/PCRE.LICENCE

@@ -1,94 +0,0 @@
-PCRE2 LICENCE
--------------
-
-PCRE2 is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-Releases 10.00 and above of PCRE2 are distributed under the terms of the "BSD"
-licence, as specified below, with one exemption for certain binary
-redistributions. The documentation for PCRE2, supplied in the "doc" directory,
-is distributed under the same terms as the software itself. The data in the
-testdata directory is not copyrighted and is in the public domain.
-
-The basic library functions are written in C and are freestanding. Also
-included in the distribution is a just-in-time compiler that can be used to
-optimize pattern matching. This is an optional feature that can be omitted when
-the library is built.
-
-
-THE BASIC LIBRARY FUNCTIONS
----------------------------
-
-Written by:       Philip Hazel
-Email local part: Philip.Hazel
-Email domain:     gmail.com
-
-Retired from University of Cambridge Computing Service,
-Cambridge, England.
-
-Copyright (c) 1997-2021 University of Cambridge
-All rights reserved.
-
-
-PCRE2 JUST-IN-TIME COMPILATION SUPPORT
---------------------------------------
-
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Email domain:     freemail.hu
-
-Copyright(c) 2010-2021 Zoltan Herczeg
-All rights reserved.
-
-
-STACK-LESS JUST-IN-TIME COMPILER
---------------------------------
-
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Email domain:     freemail.hu
-
-Copyright(c) 2009-2021 Zoltan Herczeg
-All rights reserved.
-
-
-THE "BSD" LICENCE
------------------
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notices,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notices, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of any
-      contributors may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
-EXEMPTION FOR BINARY LIBRARY-LIKE PACKAGES
-------------------------------------------
-
-The second condition in the BSD licence (covering binary redistributions) does
-not apply all the way down a chain of software. If binary package A includes
-PCRE2, it must respect the condition, but if package B is software that
-includes package A, the condition is not imposed on package B unless it uses
-PCRE2 independently.
-
-End

src/resources/nginx/docs/README

@@ -1,3 +0,0 @@
-
-Documentation is available at http://nginx.org
-

src/resources/nginx/docs/zlib.LICENSE

@@ -1,20 +0,0 @@
- (C) 1995-2022 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu

src/resources/nginx/html/50x.html

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Error</title>
-<style>
-html { color-scheme: light dark; }
-body { width: 35em; margin: 0 auto;
-font-family: Tahoma, Verdana, Arial, sans-serif; }
-</style>
-</head>
-<body>
-<h1>An error occurred.</h1>
-<p>Sorry, the page you are looking for is currently unavailable.<br/>
-Please try again later.</p>
-<p>If you are the system administrator of this resource then you should check
-the error log for details.</p>
-<p><em>Faithfully yours, nginx.</em></p>
-</body>
-</html>