同步基站增加BD/GPS使能功能，发布2.2.04版本

gui8000.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 12.0.1, 2025-03-10T15:41:01. -->
+<!-- Written by QtCreator 12.0.1, 2025-05-18T07:26:57. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -95,7 +95,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.6.1 MinGW 64-bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.6.1 MinGW 64-bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.661.win64_mingw_kit</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">

includes.h

@@ -48,6 +48,7 @@
 //2.1.01，2024-12-18，正式发布版本，修改同步模块、基站参数模块
 //2.2.02，2024-12-20，增加重置参数功能，正式发布网管软件
 //2.2.03，2025-03-13，增加rtc功能
-#define MAIN_SOFT_VERSION "2.2.03"
+//2.2.04，2025-05-17，同步基站增加BD/GPS使能功能
+#define MAIN_SOFT_VERSION "2.2.04"
 
 #endif // INCLUDES_H

main.cpp

@@ -8,7 +8,7 @@
 //软件版本
 // #define MAIN_SOFT_TYPE_DEV 1//开发版
 // #define MAIN_SOFT_TYPE_PRO 2//生产版
-quint8 gMain_bySoftType = MAIN_SOFT_TYPE_PRO;
+quint8 gMain_bySoftType = MAIN_SOFT_TYPE_DEV;
 
 int main(int argc, char *argv[])
 {

oamsyncparam.cpp

@@ -66,6 +66,11 @@ void OamSyncParam::init(){
         ui->comboBoxTxPower->addItem(strText, i);
     }
 
+    //初始化北斗GPS使能
+    ui->comboBoxBdGpsEnable->addItem("请选择", 0);
+    ui->comboBoxBdGpsEnable->addItem("关闭", 1);
+    ui->comboBoxBdGpsEnable->addItem("打开", 2);
+
     updateUi();
     configSignalSlot();//配置信号与槽函数
 }
@@ -101,6 +106,10 @@ void OamSyncParam::updateUi(){
         ui->checkBoxRssi->setChecked(false);
         ui->checkBoxRssi->setDisabled(true);
         ui->doubleSpinBoxRssi->setDisabled(true);
+
+        ui->checkBoxBdGpsEnable->setChecked(false);
+        ui->checkBoxBdGpsEnable->setDisabled(false);
+        ui->comboBoxBdGpsEnable->setDisabled(false);
     }else{//声波基站
         ui->checkBoxCenterFreq->setDisabled(false);
         ui->comboBoxCenterFreq->setDisabled(false);
@@ -123,6 +132,10 @@ void OamSyncParam::updateUi(){
 
         ui->checkBoxRssi->setDisabled(false);
         ui->doubleSpinBoxRssi->setDisabled(false);
+
+        ui->checkBoxBdGpsEnable->setChecked(false);
+        ui->checkBoxBdGpsEnable->setDisabled(true);
+        ui->comboBoxBdGpsEnable->setDisabled(true);
     }
 }
 
@@ -157,6 +170,8 @@ void OamSyncParam::selectAllItem(){
         ui->checkBoxTxSwitch->setChecked(false);
         ui->checkBoxTxCenterFreq->setChecked(false);
         ui->checkBoxTxSyncWordId->setChecked(false);
+
+        ui->checkBoxBdGpsEnable->setChecked(true);
     }else if(m_dwDeviceType == 0){//声波基站
         ui->checkBoxCenterFreq->setChecked(true);
         ui->checkBoxRxSyncWordId->setChecked(true);
@@ -166,6 +181,8 @@ void OamSyncParam::selectAllItem(){
         ui->checkBoxTxCenterFreq->setChecked(true);
         ui->checkBoxTxSyncWordId->setChecked(true);
         ui->checkBoxTxPower->setChecked(true);
+
+        ui->checkBoxBdGpsEnable->setChecked(false);
     }
 }
 
@@ -179,6 +196,7 @@ void OamSyncParam::selectAllNoItem(){
     ui->checkBoxTxCenterFreq->setChecked(false);
     ui->checkBoxTxSyncWordId->setChecked(false);
     ui->checkBoxTxPower->setChecked(false);
+    ui->checkBoxBdGpsEnable->setChecked(false);
 }
 
 //清空参数
@@ -193,6 +211,7 @@ void OamSyncParam::clearAllItem(){
     ui->comboBoxTxCenterFreq->setCurrentIndex(0);
     ui->comboBoxTxSyncWordId->setCurrentIndex(0);
     ui->comboBoxTxPower->setCurrentIndex(0);
+    ui->comboBoxBdGpsEnable->setCurrentIndex(0);
 
 }
 
@@ -282,6 +301,15 @@ void OamSyncParam::queryParam(){
         pbyHead = pbyHead +  stLtv.wLen;
     }
 
+    //北斗GPS使能
+    if(ui->checkBoxBdGpsEnable->isChecked()){
+        stLtv.wLen = 5;
+        stLtv.wTag = ORDER_SYNC_BD_GPS_ENABLE;
+        memcpy(pbyHead, &stLtv,  stLtv.wLen);
+        wLen = wLen + stLtv.wLen;
+        pbyHead = pbyHead +  stLtv.wLen;
+    }
+
     if(wLen > PS_FRAME_MCPA_PAYLOAD_LEN){
         QMessageBox::information(this,"提示", "数据长度超过报文最大值，请减少查询项");
         //启用按钮
@@ -341,6 +369,12 @@ void OamSyncParam::showParam(LTV_T *pstData){
         wIndex = ui->comboBoxTxPower->findData(QVariant(byTxPower));
         ui->comboBoxTxPower->setCurrentIndex(wIndex);
     }
+    else if(pstData->wTag == ORDER_SYNC_BD_GPS_ENABLE){//北斗GPS使能
+        memcpy(&byTmp, pstData->abyData, byLen);
+        byTmp += 1;
+        wIndex = ui->comboBoxBdGpsEnable->findData(QVariant(byTmp));
+        ui->comboBoxBdGpsEnable->setCurrentIndex(wIndex);
+    }
 
     return;
 }
@@ -537,6 +571,26 @@ void OamSyncParam::configParam(){
         return;
     }
 
+    //北斗GPS使能
+    if(ui->checkBoxBdGpsEnable->isChecked()){
+        memset((void*)stLtv.abyData, 0, PS_MCP_A_DATA_LEN);
+        stLtv.wLen = 5;
+        stLtv.wTag = ORDER_SYNC_BD_GPS_ENABLE;
+        varTmp = ui->comboBoxBdGpsEnable->currentData();
+        byTmp = (qint8)varTmp.toInt();
+        if(byTmp <= 0){
+            QMessageBox::critical(this, "提示", "请选择北斗使能开关");
+            switchBtnFlag(true);
+            return;
+        }
+
+        byTmp -= 1;
+        memcpy((void*)stLtv.abyData, &byTmp, (stLtv.wLen - 4));
+        memcpy(pbyHead, &stLtv,  stLtv.wLen);
+        wLen = wLen + stLtv.wLen;
+        pbyHead = pbyHead +  stLtv.wLen;
+    }
+
     if(wLen > PS_FRAME_MCPA_PAYLOAD_LEN){
         QMessageBox::information(this,"提示", "数据长度超过报文最大值，请减少配置项");
         switchBtnFlag(true);
@@ -661,6 +715,18 @@ void OamSyncParam::uploadData(){
         jsonObject["tx_power"] = byTxPower;
     }
 
+    //北斗GPS使能
+    if(ui->checkBoxBdGpsEnable->isChecked()){
+        varTmp = ui->comboBoxBdGpsEnable->currentData();
+        byTmp = (qint8)varTmp.toInt();
+        if(byTmp <= 0){
+            QMessageBox::critical(this, "提示", "请选择北斗使能开关");
+            switchBtnFlag(true);
+            return;
+        }
+        jsonObject["bd_gps_enable"] = byTmp;
+    }
+
     //开启按钮
     switchBtnFlag(true);
 

oamsyncparam.h

@@ -18,6 +18,7 @@
 #define ORDER_SYNC_TX_FLAG 0X0506
 #define ORDER_SYNC_TX_CENTER_FREQ 0X0507
 #define ORDER_SYNC_TX_SYNC_WORD 0X0508
+#define ORDER_SYNC_BD_GPS_ENABLE 0X0509 // 北斗GPS使能
 
 class MainDlg;
 namespace Ui {

oamsyncparam.ui

@@ -19,12 +19,48 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2">
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="2" column="1">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item row="1" column="1">
     <layout class="QVBoxLayout" name="verticalLayout_3">
-     <property name="spacing">
-      <number>20</number>
-     </property>
      <item>
       <widget class="QGroupBox" name="groupBox">
        <property name="minimumSize">
@@ -36,8 +72,8 @@
        <property name="title">
         <string/>
        </property>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
          <layout class="QVBoxLayout" name="verticalLayout">
           <property name="spacing">
            <number>20</number>
@@ -45,40 +81,50 @@
           <item>
            <layout class="QGridLayout" name="gridLayout">
             <property name="horizontalSpacing">
-             <number>12</number>
+             <number>10</number>
             </property>
             <property name="verticalSpacing">
              <number>15</number>
             </property>
-            <item row="6" column="3">
-             <widget class="QLabel" name="label_12">
+            <item row="0" column="0">
+             <widget class="QCheckBox" name="checkBoxCenterFreq">
+              <property name="minimumSize">
+               <size>
+                <width>20</width>
+                <height>0</height>
+               </size>
+              </property>
               <property name="text">
-               <string>单位：dBm</string>
+               <string/>
               </property>
              </widget>
             </item>
-            <item row="4" column="3">
-             <widget class="QLabel" name="label_3">
+            <item row="0" column="1">
+             <widget class="QLabel" name="label">
               <property name="text">
-               <string>单位：mHz</string>
+               <string>接收频率</string>
               </property>
              </widget>
             </item>
-            <item row="2" column="0">
-             <widget class="QCheckBox" name="checkBoxRssi">
+            <item row="0" column="2">
+             <widget class="QComboBox" name="comboBoxCenterFreq">
               <property name="minimumSize">
                <size>
-                <width>20</width>
-                <height>0</height>
+                <width>550</width>
+                <height>26</height>
                </size>
               </property>
+             </widget>
+            </item>
+            <item row="0" column="3">
+             <widget class="QLabel" name="label_2">
               <property name="text">
-               <string/>
+               <string>单位：mHz</string>
               </property>
              </widget>
             </item>
-            <item row="4" column="0">
-             <widget class="QCheckBox" name="checkBoxTxCenterFreq">
+            <item row="1" column="0">
+             <widget class="QCheckBox" name="checkBoxRxSyncWordId">
               <property name="minimumSize">
                <size>
                 <width>20</width>
@@ -90,15 +136,15 @@
               </property>
              </widget>
             </item>
-            <item row="5" column="1">
-             <widget class="QLabel" name="label_7">
+            <item row="1" column="1">
+             <widget class="QLabel" name="label_4">
               <property name="text">
-               <string>发射同步</string>
+               <string>接收同步</string>
               </property>
              </widget>
             </item>
-            <item row="5" column="2">
-             <widget class="QComboBox" name="comboBoxTxSyncWordId">
+            <item row="1" column="2">
+             <widget class="QComboBox" name="comboBoxRxSyncWordId">
               <property name="minimumSize">
                <size>
                 <width>550</width>
@@ -107,15 +153,8 @@
               </property>
              </widget>
             </item>
-            <item row="4" column="1">
-             <widget class="QLabel" name="label_6">
-              <property name="text">
-               <string>发射频率</string>
-              </property>
-             </widget>
-            </item>
-            <item row="5" column="0">
-             <widget class="QCheckBox" name="checkBoxTxSyncWordId">
+            <item row="2" column="0">
+             <widget class="QCheckBox" name="checkBoxRssi">
               <property name="minimumSize">
                <size>
                 <width>20</width>
@@ -127,6 +166,13 @@
               </property>
              </widget>
             </item>
+            <item row="2" column="1">
+             <widget class="QLabel" name="label_11">
+              <property name="text">
+               <string>接收电平</string>
+              </property>
+             </widget>
+            </item>
             <item row="2" column="2">
              <widget class="QDoubleSpinBox" name="doubleSpinBoxRssi">
               <property name="minimumSize">
@@ -152,29 +198,35 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
-             <widget class="QLabel" name="label_11">
+            <item row="2" column="3">
+             <widget class="QLabel" name="label_13">
               <property name="text">
-               <string>接收电平</string>
+               <string>单位：dBm</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="3">
-             <widget class="QLabel" name="label_2">
+            <item row="3" column="0">
+             <widget class="QCheckBox" name="checkBoxTxSwitch">
+              <property name="minimumSize">
+               <size>
+                <width>20</width>
+                <height>0</height>
+               </size>
+              </property>
               <property name="text">
-               <string>单位：mHz</string>
+               <string/>
               </property>
              </widget>
             </item>
-            <item row="2" column="3">
-             <widget class="QLabel" name="label_13">
+            <item row="3" column="1">
+             <widget class="QLabel" name="label_5">
               <property name="text">
-               <string>单位：dBm</string>
+               <string>发射开关</string>
               </property>
              </widget>
             </item>
-            <item row="6" column="2">
-             <widget class="QComboBox" name="comboBoxTxPower">
+            <item row="3" column="2">
+             <widget class="QComboBox" name="comboBoxTxSwitch">
               <property name="minimumSize">
                <size>
                 <width>550</width>
@@ -183,8 +235,8 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
-             <widget class="QCheckBox" name="checkBoxCenterFreq">
+            <item row="4" column="0">
+             <widget class="QCheckBox" name="checkBoxTxCenterFreq">
               <property name="minimumSize">
                <size>
                 <width>20</width>
@@ -196,15 +248,32 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="1">
-             <widget class="QLabel" name="label_5">
+            <item row="4" column="1">
+             <widget class="QLabel" name="label_6">
               <property name="text">
-               <string>发射开关</string>
+               <string>发射频率</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="checkBoxRxSyncWordId">
+            <item row="4" column="2">
+             <widget class="QComboBox" name="comboBoxTxCenterFreq">
+              <property name="minimumSize">
+               <size>
+                <width>550</width>
+                <height>26</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="3">
+             <widget class="QLabel" name="label_3">
+              <property name="text">
+               <string>单位：mHz</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="0">
+             <widget class="QCheckBox" name="checkBoxTxSyncWordId">
               <property name="minimumSize">
                <size>
                 <width>20</width>
@@ -216,8 +285,15 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="2">
-             <widget class="QComboBox" name="comboBoxTxSwitch">
+            <item row="5" column="1">
+             <widget class="QLabel" name="label_7">
+              <property name="text">
+               <string>发射同步</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="2">
+             <widget class="QComboBox" name="comboBoxTxSyncWordId">
               <property name="minimumSize">
                <size>
                 <width>550</width>
@@ -226,8 +302,8 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="0">
-             <widget class="QCheckBox" name="checkBoxTxSwitch">
+            <item row="6" column="0">
+             <widget class="QCheckBox" name="checkBoxTxPower">
               <property name="minimumSize">
                <size>
                 <width>20</width>
@@ -239,18 +315,15 @@
               </property>
              </widget>
             </item>
-            <item row="4" column="2">
-             <widget class="QComboBox" name="comboBoxTxCenterFreq">
-              <property name="minimumSize">
-               <size>
-                <width>550</width>
-                <height>26</height>
-               </size>
+            <item row="6" column="1">
+             <widget class="QLabel" name="label_10">
+              <property name="text">
+               <string>发射功率</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="2">
-             <widget class="QComboBox" name="comboBoxRxSyncWordId">
+            <item row="6" column="2">
+             <widget class="QComboBox" name="comboBoxTxPower">
               <property name="minimumSize">
                <size>
                 <width>550</width>
@@ -259,18 +332,15 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="2">
-             <widget class="QComboBox" name="comboBoxCenterFreq">
-              <property name="minimumSize">
-               <size>
-                <width>550</width>
-                <height>26</height>
-               </size>
+            <item row="6" column="3">
+             <widget class="QLabel" name="label_12">
+              <property name="text">
+               <string>单位：dBm</string>
               </property>
              </widget>
             </item>
-            <item row="6" column="0">
-             <widget class="QCheckBox" name="checkBoxTxPower">
+            <item row="7" column="0">
+             <widget class="QCheckBox" name="checkBoxBdGpsEnable">
               <property name="minimumSize">
                <size>
                 <width>20</width>
@@ -282,24 +352,20 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QLabel" name="label_4">
+            <item row="7" column="1">
+             <widget class="QLabel" name="label_16">
               <property name="text">
-               <string>接收同步</string>
+               <string>北斗使能</string>
               </property>
              </widget>
             </item>
-            <item row="6" column="1">
-             <widget class="QLabel" name="label_10">
-              <property name="text">
-               <string>发射功率</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>接收频率</string>
+            <item row="7" column="2">
+             <widget class="QComboBox" name="comboBoxBdGpsEnable">
+              <property name="minimumSize">
+               <size>
+                <width>550</width>
+                <height>26</height>
+               </size>
               </property>
              </widget>
             </item>
@@ -357,75 +423,40 @@
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label_22">
-       <property name="text">
-        <string>注意：</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_9">
-       <property name="text">
-        <string>1、接收频率与发射频率间的间隔要大于1mHz</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_14">
-       <property name="text">
-        <string>2、发射同步比接收同步大1 </string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_15">
-       <property name="text">
-        <string>3、“上传数据”是将数据上传至管理中心</string>
-       </property>
-      </widget>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="label_22">
+         <property name="text">
+          <string>注意：</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>1、接收频率与发射频率间的间隔要大于1mHz</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_14">
+         <property name="text">
+          <string>2、发射同步比接收同步大1 </string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_15">
+         <property name="text">
+          <string>3、“上传数据”是将数据上传至管理中心</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
    <item row="1" column="2">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="1">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="1">
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0">
     <spacer name="horizontalSpacer_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>

ui_oamsyncparam.h

@@ -28,37 +28,43 @@ QT_BEGIN_NAMESPACE
 class Ui_OamSyncParam
 {
 public:
-    QGridLayout *gridLayout_2;
+    QGridLayout *gridLayout_3;
+    QSpacerItem *verticalSpacer_2;
+    QSpacerItem *horizontalSpacer;
+    QSpacerItem *verticalSpacer;
     QVBoxLayout *verticalLayout_3;
     QGroupBox *groupBox;
-    QVBoxLayout *verticalLayout_2;
+    QGridLayout *gridLayout_2;
     QVBoxLayout *verticalLayout;
     QGridLayout *gridLayout;
-    QLabel *label_12;
-    QLabel *label_3;
+    QCheckBox *checkBoxCenterFreq;
+    QLabel *label;
+    QComboBox *comboBoxCenterFreq;
+    QLabel *label_2;
+    QCheckBox *checkBoxRxSyncWordId;
+    QLabel *label_4;
+    QComboBox *comboBoxRxSyncWordId;
     QCheckBox *checkBoxRssi;
-    QCheckBox *checkBoxTxCenterFreq;
-    QLabel *label_7;
-    QComboBox *comboBoxTxSyncWordId;
-    QLabel *label_6;
-    QCheckBox *checkBoxTxSyncWordId;
-    QDoubleSpinBox *doubleSpinBoxRssi;
     QLabel *label_11;
-    QLabel *label_2;
+    QDoubleSpinBox *doubleSpinBoxRssi;
     QLabel *label_13;
-    QComboBox *comboBoxTxPower;
-    QCheckBox *checkBoxCenterFreq;
+    QCheckBox *checkBoxTxSwitch;
     QLabel *label_5;
-    QCheckBox *checkBoxRxSyncWordId;
     QComboBox *comboBoxTxSwitch;
-    QCheckBox *checkBoxTxSwitch;
+    QCheckBox *checkBoxTxCenterFreq;
+    QLabel *label_6;
     QComboBox *comboBoxTxCenterFreq;
-    QComboBox *comboBoxRxSyncWordId;
-    QComboBox *comboBoxCenterFreq;
+    QLabel *label_3;
+    QCheckBox *checkBoxTxSyncWordId;
+    QLabel *label_7;
+    QComboBox *comboBoxTxSyncWordId;
     QCheckBox *checkBoxTxPower;
-    QLabel *label_4;
     QLabel *label_10;
-    QLabel *label;
+    QComboBox *comboBoxTxPower;
+    QLabel *label_12;
+    QCheckBox *checkBoxBdGpsEnable;
+    QLabel *label_16;
+    QComboBox *comboBoxBdGpsEnable;
     QHBoxLayout *horizontalLayout;
     QPushButton *pushButtonAllSel;
     QPushButton *pushButtonAllNoSel;
@@ -66,13 +72,11 @@ public:
     QPushButton *pushButtonQuery;
     QPushButton *pushButtonConfig;
     QPushButton *pushButtonUpload;
+    QVBoxLayout *verticalLayout_2;
     QLabel *label_22;
     QLabel *label_9;
     QLabel *label_14;
     QLabel *label_15;
-    QSpacerItem *horizontalSpacer;
-    QSpacerItem *verticalSpacer;
-    QSpacerItem *verticalSpacer_2;
     QSpacerItem *horizontalSpacer_2;
 
     void setupUi(QDialog *OamSyncParam)
@@ -81,66 +85,83 @@ public:
             OamSyncParam->setObjectName("OamSyncParam");
         OamSyncParam->resize(1024, 700);
         OamSyncParam->setMinimumSize(QSize(760, 700));
-        gridLayout_2 = new QGridLayout(OamSyncParam);
-        gridLayout_2->setObjectName("gridLayout_2");
+        gridLayout_3 = new QGridLayout(OamSyncParam);
+        gridLayout_3->setObjectName("gridLayout_3");
+        verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout_3->addItem(verticalSpacer_2, 2, 1, 1, 1);
+
+        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        gridLayout_3->addItem(horizontalSpacer, 1, 0, 1, 1);
+
+        verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        gridLayout_3->addItem(verticalSpacer, 0, 1, 1, 1);
+
         verticalLayout_3 = new QVBoxLayout();
-        verticalLayout_3->setSpacing(20);
         verticalLayout_3->setObjectName("verticalLayout_3");
         groupBox = new QGroupBox(OamSyncParam);
         groupBox->setObjectName("groupBox");
         groupBox->setMinimumSize(QSize(770, 190));
-        verticalLayout_2 = new QVBoxLayout(groupBox);
-        verticalLayout_2->setObjectName("verticalLayout_2");
+        gridLayout_2 = new QGridLayout(groupBox);
+        gridLayout_2->setObjectName("gridLayout_2");
         verticalLayout = new QVBoxLayout();
         verticalLayout->setSpacing(20);
         verticalLayout->setObjectName("verticalLayout");
         gridLayout = new QGridLayout();
         gridLayout->setObjectName("gridLayout");
-        gridLayout->setHorizontalSpacing(12);
+        gridLayout->setHorizontalSpacing(10);
         gridLayout->setVerticalSpacing(15);
-        label_12 = new QLabel(groupBox);
-        label_12->setObjectName("label_12");
+        checkBoxCenterFreq = new QCheckBox(groupBox);
+        checkBoxCenterFreq->setObjectName("checkBoxCenterFreq");
+        checkBoxCenterFreq->setMinimumSize(QSize(20, 0));
 
-        gridLayout->addWidget(label_12, 6, 3, 1, 1);
+        gridLayout->addWidget(checkBoxCenterFreq, 0, 0, 1, 1);
 
-        label_3 = new QLabel(groupBox);
-        label_3->setObjectName("label_3");
+        label = new QLabel(groupBox);
+        label->setObjectName("label");
 
-        gridLayout->addWidget(label_3, 4, 3, 1, 1);
+        gridLayout->addWidget(label, 0, 1, 1, 1);
 
-        checkBoxRssi = new QCheckBox(groupBox);
-        checkBoxRssi->setObjectName("checkBoxRssi");
-        checkBoxRssi->setMinimumSize(QSize(20, 0));
+        comboBoxCenterFreq = new QComboBox(groupBox);
+        comboBoxCenterFreq->setObjectName("comboBoxCenterFreq");
+        comboBoxCenterFreq->setMinimumSize(QSize(550, 26));
 
-        gridLayout->addWidget(checkBoxRssi, 2, 0, 1, 1);
+        gridLayout->addWidget(comboBoxCenterFreq, 0, 2, 1, 1);
 
-        checkBoxTxCenterFreq = new QCheckBox(groupBox);
-        checkBoxTxCenterFreq->setObjectName("checkBoxTxCenterFreq");
-        checkBoxTxCenterFreq->setMinimumSize(QSize(20, 0));
+        label_2 = new QLabel(groupBox);
+        label_2->setObjectName("label_2");
 
-        gridLayout->addWidget(checkBoxTxCenterFreq, 4, 0, 1, 1);
+        gridLayout->addWidget(label_2, 0, 3, 1, 1);
 
-        label_7 = new QLabel(groupBox);
-        label_7->setObjectName("label_7");
+        checkBoxRxSyncWordId = new QCheckBox(groupBox);
+        checkBoxRxSyncWordId->setObjectName("checkBoxRxSyncWordId");
+        checkBoxRxSyncWordId->setMinimumSize(QSize(20, 0));
 
-        gridLayout->addWidget(label_7, 5, 1, 1, 1);
+        gridLayout->addWidget(checkBoxRxSyncWordId, 1, 0, 1, 1);
 
-        comboBoxTxSyncWordId = new QComboBox(groupBox);
-        comboBoxTxSyncWordId->setObjectName("comboBoxTxSyncWordId");
-        comboBoxTxSyncWordId->setMinimumSize(QSize(550, 26));
+        label_4 = new QLabel(groupBox);
+        label_4->setObjectName("label_4");
 
-        gridLayout->addWidget(comboBoxTxSyncWordId, 5, 2, 1, 1);
+        gridLayout->addWidget(label_4, 1, 1, 1, 1);
 
-        label_6 = new QLabel(groupBox);
-        label_6->setObjectName("label_6");
+        comboBoxRxSyncWordId = new QComboBox(groupBox);
+        comboBoxRxSyncWordId->setObjectName("comboBoxRxSyncWordId");
+        comboBoxRxSyncWordId->setMinimumSize(QSize(550, 26));
 
-        gridLayout->addWidget(label_6, 4, 1, 1, 1);
+        gridLayout->addWidget(comboBoxRxSyncWordId, 1, 2, 1, 1);
 
-        checkBoxTxSyncWordId = new QCheckBox(groupBox);
-        checkBoxTxSyncWordId->setObjectName("checkBoxTxSyncWordId");
-        checkBoxTxSyncWordId->setMinimumSize(QSize(20, 0));
+        checkBoxRssi = new QCheckBox(groupBox);
+        checkBoxRssi->setObjectName("checkBoxRssi");
+        checkBoxRssi->setMinimumSize(QSize(20, 0));
 
-        gridLayout->addWidget(checkBoxTxSyncWordId, 5, 0, 1, 1);
+        gridLayout->addWidget(checkBoxRssi, 2, 0, 1, 1);
+
+        label_11 = new QLabel(groupBox);
+        label_11->setObjectName("label_11");
+
+        gridLayout->addWidget(label_11, 2, 1, 1, 1);
 
         doubleSpinBoxRssi = new QDoubleSpinBox(groupBox);
         doubleSpinBoxRssi->setObjectName("doubleSpinBoxRssi");
@@ -153,55 +174,38 @@ public:
 
         gridLayout->addWidget(doubleSpinBoxRssi, 2, 2, 1, 1);
 
-        label_11 = new QLabel(groupBox);
-        label_11->setObjectName("label_11");
-
-        gridLayout->addWidget(label_11, 2, 1, 1, 1);
-
-        label_2 = new QLabel(groupBox);
-        label_2->setObjectName("label_2");
-
-        gridLayout->addWidget(label_2, 0, 3, 1, 1);
-
         label_13 = new QLabel(groupBox);
         label_13->setObjectName("label_13");
 
         gridLayout->addWidget(label_13, 2, 3, 1, 1);
 
-        comboBoxTxPower = new QComboBox(groupBox);
-        comboBoxTxPower->setObjectName("comboBoxTxPower");
-        comboBoxTxPower->setMinimumSize(QSize(550, 26));
-
-        gridLayout->addWidget(comboBoxTxPower, 6, 2, 1, 1);
-
-        checkBoxCenterFreq = new QCheckBox(groupBox);
-        checkBoxCenterFreq->setObjectName("checkBoxCenterFreq");
-        checkBoxCenterFreq->setMinimumSize(QSize(20, 0));
+        checkBoxTxSwitch = new QCheckBox(groupBox);
+        checkBoxTxSwitch->setObjectName("checkBoxTxSwitch");
+        checkBoxTxSwitch->setMinimumSize(QSize(20, 0));
 
-        gridLayout->addWidget(checkBoxCenterFreq, 0, 0, 1, 1);
+        gridLayout->addWidget(checkBoxTxSwitch, 3, 0, 1, 1);
 
         label_5 = new QLabel(groupBox);
         label_5->setObjectName("label_5");
 
         gridLayout->addWidget(label_5, 3, 1, 1, 1);
 
-        checkBoxRxSyncWordId = new QCheckBox(groupBox);
-        checkBoxRxSyncWordId->setObjectName("checkBoxRxSyncWordId");
-        checkBoxRxSyncWordId->setMinimumSize(QSize(20, 0));
-
-        gridLayout->addWidget(checkBoxRxSyncWordId, 1, 0, 1, 1);
-
         comboBoxTxSwitch = new QComboBox(groupBox);
         comboBoxTxSwitch->setObjectName("comboBoxTxSwitch");
         comboBoxTxSwitch->setMinimumSize(QSize(550, 26));
 
         gridLayout->addWidget(comboBoxTxSwitch, 3, 2, 1, 1);
 
-        checkBoxTxSwitch = new QCheckBox(groupBox);
-        checkBoxTxSwitch->setObjectName("checkBoxTxSwitch");
-        checkBoxTxSwitch->setMinimumSize(QSize(20, 0));
+        checkBoxTxCenterFreq = new QCheckBox(groupBox);
+        checkBoxTxCenterFreq->setObjectName("checkBoxTxCenterFreq");
+        checkBoxTxCenterFreq->setMinimumSize(QSize(20, 0));
 
-        gridLayout->addWidget(checkBoxTxSwitch, 3, 0, 1, 1);
+        gridLayout->addWidget(checkBoxTxCenterFreq, 4, 0, 1, 1);
+
+        label_6 = new QLabel(groupBox);
+        label_6->setObjectName("label_6");
+
+        gridLayout->addWidget(label_6, 4, 1, 1, 1);
 
         comboBoxTxCenterFreq = new QComboBox(groupBox);
         comboBoxTxCenterFreq->setObjectName("comboBoxTxCenterFreq");
@@ -209,17 +213,27 @@ public:
 
         gridLayout->addWidget(comboBoxTxCenterFreq, 4, 2, 1, 1);
 
-        comboBoxRxSyncWordId = new QComboBox(groupBox);
-        comboBoxRxSyncWordId->setObjectName("comboBoxRxSyncWordId");
-        comboBoxRxSyncWordId->setMinimumSize(QSize(550, 26));
+        label_3 = new QLabel(groupBox);
+        label_3->setObjectName("label_3");
 
-        gridLayout->addWidget(comboBoxRxSyncWordId, 1, 2, 1, 1);
+        gridLayout->addWidget(label_3, 4, 3, 1, 1);
 
-        comboBoxCenterFreq = new QComboBox(groupBox);
-        comboBoxCenterFreq->setObjectName("comboBoxCenterFreq");
-        comboBoxCenterFreq->setMinimumSize(QSize(550, 26));
+        checkBoxTxSyncWordId = new QCheckBox(groupBox);
+        checkBoxTxSyncWordId->setObjectName("checkBoxTxSyncWordId");
+        checkBoxTxSyncWordId->setMinimumSize(QSize(20, 0));
 
-        gridLayout->addWidget(comboBoxCenterFreq, 0, 2, 1, 1);
+        gridLayout->addWidget(checkBoxTxSyncWordId, 5, 0, 1, 1);
+
+        label_7 = new QLabel(groupBox);
+        label_7->setObjectName("label_7");
+
+        gridLayout->addWidget(label_7, 5, 1, 1, 1);
+
+        comboBoxTxSyncWordId = new QComboBox(groupBox);
+        comboBoxTxSyncWordId->setObjectName("comboBoxTxSyncWordId");
+        comboBoxTxSyncWordId->setMinimumSize(QSize(550, 26));
+
+        gridLayout->addWidget(comboBoxTxSyncWordId, 5, 2, 1, 1);
 
         checkBoxTxPower = new QCheckBox(groupBox);
         checkBoxTxPower->setObjectName("checkBoxTxPower");
@@ -227,20 +241,38 @@ public:
 
         gridLayout->addWidget(checkBoxTxPower, 6, 0, 1, 1);
 
-        label_4 = new QLabel(groupBox);
-        label_4->setObjectName("label_4");
-
-        gridLayout->addWidget(label_4, 1, 1, 1, 1);
-
         label_10 = new QLabel(groupBox);
         label_10->setObjectName("label_10");
 
         gridLayout->addWidget(label_10, 6, 1, 1, 1);
 
-        label = new QLabel(groupBox);
-        label->setObjectName("label");
+        comboBoxTxPower = new QComboBox(groupBox);
+        comboBoxTxPower->setObjectName("comboBoxTxPower");
+        comboBoxTxPower->setMinimumSize(QSize(550, 26));
 
-        gridLayout->addWidget(label, 0, 1, 1, 1);
+        gridLayout->addWidget(comboBoxTxPower, 6, 2, 1, 1);
+
+        label_12 = new QLabel(groupBox);
+        label_12->setObjectName("label_12");
+
+        gridLayout->addWidget(label_12, 6, 3, 1, 1);
+
+        checkBoxBdGpsEnable = new QCheckBox(groupBox);
+        checkBoxBdGpsEnable->setObjectName("checkBoxBdGpsEnable");
+        checkBoxBdGpsEnable->setMinimumSize(QSize(20, 0));
+
+        gridLayout->addWidget(checkBoxBdGpsEnable, 7, 0, 1, 1);
+
+        label_16 = new QLabel(groupBox);
+        label_16->setObjectName("label_16");
+
+        gridLayout->addWidget(label_16, 7, 1, 1, 1);
+
+        comboBoxBdGpsEnable = new QComboBox(groupBox);
+        comboBoxBdGpsEnable->setObjectName("comboBoxBdGpsEnable");
+        comboBoxBdGpsEnable->setMinimumSize(QSize(550, 26));
+
+        gridLayout->addWidget(comboBoxBdGpsEnable, 7, 2, 1, 1);
 
 
         verticalLayout->addLayout(gridLayout);
@@ -281,49 +313,42 @@ public:
         verticalLayout->addLayout(horizontalLayout);
 
 
-        verticalLayout_2->addLayout(verticalLayout);
+        gridLayout_2->addLayout(verticalLayout, 0, 0, 1, 1);
 
 
         verticalLayout_3->addWidget(groupBox);
 
+        verticalLayout_2 = new QVBoxLayout();
+        verticalLayout_2->setObjectName("verticalLayout_2");
         label_22 = new QLabel(OamSyncParam);
         label_22->setObjectName("label_22");
 
-        verticalLayout_3->addWidget(label_22);
+        verticalLayout_2->addWidget(label_22);
 
         label_9 = new QLabel(OamSyncParam);
         label_9->setObjectName("label_9");
 
-        verticalLayout_3->addWidget(label_9);
+        verticalLayout_2->addWidget(label_9);
 
         label_14 = new QLabel(OamSyncParam);
         label_14->setObjectName("label_14");
 
-        verticalLayout_3->addWidget(label_14);
+        verticalLayout_2->addWidget(label_14);
 
         label_15 = new QLabel(OamSyncParam);
         label_15->setObjectName("label_15");
 
-        verticalLayout_3->addWidget(label_15);
-
+        verticalLayout_2->addWidget(label_15);
 
-        gridLayout_2->addLayout(verticalLayout_3, 1, 1, 1, 1);
 
-        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        gridLayout_2->addItem(horizontalSpacer, 1, 2, 1, 1);
-
-        verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+        verticalLayout_3->addLayout(verticalLayout_2);
 
-        gridLayout_2->addItem(verticalSpacer, 0, 1, 1, 1);
 
-        verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-        gridLayout_2->addItem(verticalSpacer_2, 2, 1, 1, 1);
+        gridLayout_3->addLayout(verticalLayout_3, 1, 1, 1, 1);
 
         horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
-        gridLayout_2->addItem(horizontalSpacer_2, 1, 0, 1, 1);
+        gridLayout_3->addItem(horizontalSpacer_2, 1, 2, 1, 1);
 
 
         retranslateUi(OamSyncParam);
@@ -335,24 +360,26 @@ public:
     {
         OamSyncParam->setWindowTitle(QCoreApplication::translate("OamSyncParam", "Dialog", nullptr));
         groupBox->setTitle(QString());
-        label_12->setText(QCoreApplication::translate("OamSyncParam", "\345\215\225\344\275\215\357\274\232dBm", nullptr));
-        label_3->setText(QCoreApplication::translate("OamSyncParam", "\345\215\225\344\275\215\357\274\232mHz", nullptr));
+        checkBoxCenterFreq->setText(QString());
+        label->setText(QCoreApplication::translate("OamSyncParam", "\346\216\245\346\224\266\351\242\221\347\216\207", nullptr));
+        label_2->setText(QCoreApplication::translate("OamSyncParam", "\345\215\225\344\275\215\357\274\232mHz", nullptr));
+        checkBoxRxSyncWordId->setText(QString());
+        label_4->setText(QCoreApplication::translate("OamSyncParam", "\346\216\245\346\224\266\345\220\214\346\255\245", nullptr));
         checkBoxRssi->setText(QString());
-        checkBoxTxCenterFreq->setText(QString());
-        label_7->setText(QCoreApplication::translate("OamSyncParam", "\345\217\221\345\260\204\345\220\214\346\255\245", nullptr));
-        label_6->setText(QCoreApplication::translate("OamSyncParam", "\345\217\221\345\260\204\351\242\221\347\216\207", nullptr));
-        checkBoxTxSyncWordId->setText(QString());
         label_11->setText(QCoreApplication::translate("OamSyncParam", "\346\216\245\346\224\266\347\224\265\345\271\263", nullptr));
-        label_2->setText(QCoreApplication::translate("OamSyncParam", "\345\215\225\344\275\215\357\274\232mHz", nullptr));
         label_13->setText(QCoreApplication::translate("OamSyncParam", "\345\215\225\344\275\215\357\274\232dBm", nullptr));
-        checkBoxCenterFreq->setText(QString());
-        label_5->setText(QCoreApplication::translate("OamSyncParam", "\345\217\221\345\260\204\345\274\200\345\205\263", nullptr));
-        checkBoxRxSyncWordId->setText(QString());
         checkBoxTxSwitch->setText(QString());
+        label_5->setText(QCoreApplication::translate("OamSyncParam", "\345\217\221\345\260\204\345\274\200\345\205\263", nullptr));
+        checkBoxTxCenterFreq->setText(QString());
+        label_6->setText(QCoreApplication::translate("OamSyncParam", "\345\217\221\345\260\204\351\242\221\347\216\207", nullptr));
+        label_3->setText(QCoreApplication::translate("OamSyncParam", "\345\215\225\344\275\215\357\274\232mHz", nullptr));
+        checkBoxTxSyncWordId->setText(QString());
+        label_7->setText(QCoreApplication::translate("OamSyncParam", "\345\217\221\345\260\204\345\220\214\346\255\245", nullptr));
         checkBoxTxPower->setText(QString());
-        label_4->setText(QCoreApplication::translate("OamSyncParam", "\346\216\245\346\224\266\345\220\214\346\255\245", nullptr));
         label_10->setText(QCoreApplication::translate("OamSyncParam", "\345\217\221\345\260\204\345\212\237\347\216\207", nullptr));
-        label->setText(QCoreApplication::translate("OamSyncParam", "\346\216\245\346\224\266\351\242\221\347\216\207", nullptr));
+        label_12->setText(QCoreApplication::translate("OamSyncParam", "\345\215\225\344\275\215\357\274\232dBm", nullptr));
+        checkBoxBdGpsEnable->setText(QString());
+        label_16->setText(QCoreApplication::translate("OamSyncParam", "\345\214\227\346\226\227\344\275\277\350\203\275", nullptr));
         pushButtonAllSel->setText(QCoreApplication::translate("OamSyncParam", "\345\205\250\351\200\211", nullptr));
         pushButtonAllNoSel->setText(QCoreApplication::translate("OamSyncParam", "\345\205\250\344\270\215\351\200\211", nullptr));
         pushButtonClear->setText(QCoreApplication::translate("OamSyncParam", "\346\270\205\347\251\272", nullptr));