检查界面可以根据不同的飞机导入不同的检查文件

App/CheckUI/Check.json

@@ -1,5 +1,5 @@
 {
-    "comment":  "Custom",
+    "comment":  "All",
     "version": 1,
     "spacing" : 20,
 

App/CheckUI/CheckUI.cpp

@@ -8,6 +8,9 @@ const char* CheckUI::_versionJsonKey            = "version";
 const char* CheckUI::_spacingJsonKey            = "spacing";
 
 const char* CheckUI::_commentJsonKey            = "comment";
+const char* CheckUI::_vehicleJsonKey            = "vehicle";
+
+
 const char* CheckUI::_ButtonJsonKey             = "Button";
 
 const char* CheckUI::_WidthJsonKey              = "Width";
@@ -41,7 +44,6 @@ CheckUI::CheckUI(QWidget *parent) :
     if(!Dir->exists("./checks"))
     Dir->mkdir("./checks");//如果文件夹不存在就新建
 
-
     //load qss
     QFile file(":/qss/CheckUI.qss");
     file.open(QFile::ReadOnly);
@@ -51,10 +53,26 @@ CheckUI::CheckUI(QWidget *parent) :
     file.close();
 
     //载入json
-    loadCommandJson(":/json/Check.json");
+
+    LoadCheckFiles("./checks");
+
+    //loadCommandJson(":/json/Check.json");
     //loadCommandJson("./json/Check.json");
 
 
+
+
+
+}
+
+CheckUI::~CheckUI()
+{
+    delete ui;
+}
+
+
+void CheckUI::reBuild(void)
+{
     ui->gridLayout_Check->setSpacing(spacing);
 
     for(QJsonValue info: infoArray) {
@@ -62,7 +80,7 @@ CheckUI::CheckUI(QWidget *parent) :
             return;
         }
 
-        QPushButton *btn = new QPushButton(this);
+        QPushButton *btn = new QPushButton(ui->frame_check);
 
         btn->setText(info.toObject().find(_TextJsonKey).value().toString());
 
@@ -80,45 +98,13 @@ CheckUI::CheckUI(QWidget *parent) :
         connect(btn,SIGNAL(clicked(bool)),
                 this,SLOT(on_commandClicked()));
     }
-
-
 }
 
-CheckUI::~CheckUI()
+void CheckUI::loadCommandJson(QJsonObject json)
 {
-    delete ui;
-}
-
-
-
-
-void CheckUI::loadCommandJson(const QString& jsonFilename)
-{
-    if (jsonFilename.isEmpty()) {
-        return;
-    }
-
-    qDebug() << "Loading " << jsonFilename;
-
-    QFile jsonFile(jsonFilename);
-    if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qWarning() << "Unable to open file" << jsonFilename << jsonFile.errorString();
-        return;
-    }
-
-    QByteArray bytes = jsonFile.readAll();
-
-    jsonFile.close();
-    QJsonParseError jsonParseError;
-    QJsonDocument doc = QJsonDocument::fromJson(bytes, &jsonParseError);
-    if (jsonParseError.error != QJsonParseError::NoError) {
-        qWarning() << jsonFilename << "Unable to open json document" << jsonParseError.errorString();
-        return;
-    }
-
-    QJsonObject json = doc.object();
     version = json.value(_versionJsonKey).toInt();
-    qDebug() << "command version :" << version;
+    qDebug() << "check version :" << version;
+
 
     spacing = json.value(_spacingJsonKey).toInt();
     width = json.value(_WidthJsonKey).toInt();
@@ -128,7 +114,7 @@ void CheckUI::loadCommandJson(const QString& jsonFilename)
     QJsonValue jsonValue = json.value(_ButtonJsonKey);
 
     if (!jsonValue.isArray()) {
-        qWarning() << jsonFilename << "Button not array";
+        qWarning() << "Button not array";
         return;
     }
 
@@ -136,7 +122,7 @@ void CheckUI::loadCommandJson(const QString& jsonFilename)
 
     for(QJsonValue info: infoArray) {
         if (!info.isObject()) {
-            qWarning() << jsonFilename << "Array should contain objects";
+            qWarning() << "Array should contain objects";
             return;
         }
     }
@@ -170,14 +156,28 @@ void CheckUI::loadCommandJson(const QString& jsonFilename)
            uint8_t confirm = info.toObject().find(_confirmJsonKey).value().toInt();
 
               emit cmd_long(param1,param2, param3,param4,param5,param6,param7,command,confirm);
+
+           feedback(1);
          }
+
+
+
      }
  }
 
 
 void CheckUI::feedback(bool flag)
 {
+        QObjectList list = ui->frame_check->children();
 
+        foreach (QObject *obj, list)
+        {
+            QPushButton *btn = qobject_cast<QPushButton *>(obj);
+            if(btn)
+            {
+                //qDebug() << btn->text();
+            }
+        }
 }
 
 void CheckUI::RecieveMsg(mavlink_message_t msg)
@@ -191,10 +191,6 @@ void CheckUI::RecieveMsg(mavlink_message_t msg)
     }break;
     case MAVLINK_MSG_ID_HEARTBEAT: {
        mavlink_msg_heartbeat_decode(&msg,&heartbeat);
-
-
-
-
     }break;
     case MAVLINK_MSG_ID_PING: {
          mavlink_msg_ping_decode(&msg,&ping);
@@ -246,10 +242,131 @@ void CheckUI::RecieveMsg(mavlink_message_t msg)
 }
 
 
+//添加一个设备，
+void CheckUI::addVehicles(int sysid, int compid)
+{
+    Q_UNUSED(compid)
+
+    if(!Vehicles.keys().contains(sysid))
+    {
+        Vehicles.insert(sysid,tr("Vehicle %1").arg(sysid));
+
+        if(ui->pushButton_Vehicle->text().isEmpty())
+        {
+            ui->pushButton_Vehicle->setText(tr("Vehicle %1").arg(sysid));
+
+            loadCommandJson(CheckFiles.value(sysid));
+             reBuild();
+        }
 
 
+    }
+}
+
+QJsonObject CheckUI::parseCheckfiles(const QString& jsonFilename)
+{
+    QJsonObject json;
+
+    QFile jsonFile(jsonFilename);
+    if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qWarning() << "Unable to open file" << jsonFilename << jsonFile.errorString();
+        return json;
+    }
+
+    QByteArray bytes = jsonFile.readAll();
+
+    jsonFile.close();
+    QJsonParseError jsonParseError;
+    QJsonDocument doc = QJsonDocument::fromJson(bytes, &jsonParseError);
+    if (jsonParseError.error != QJsonParseError::NoError) {
+        qWarning() << jsonFilename << "Unable to open json document" << jsonParseError.errorString();
+        return json;
+    }
+
+    json = doc.object();
+
+    return json;
+}
+
+void CheckUI::LoadCheckFiles(QString path)
+{
+    QDir dir(path);
+    QFileInfoList file_list = dir.entryInfoList(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
+
+    foreach(QFileInfo fileinfo, file_list)
+    {
+        QString filter;
+        filter = fileinfo.suffix();    //后缀名
+        if(filter == "json")
+        {
+            QJsonObject json = parseCheckfiles(fileinfo.absoluteFilePath());
+
+            if(&json)
+            {
+                int vehicle = json.value(_vehicleJsonKey).toInt();
+
+                CheckFiles.insert(vehicle,json);
+            }
+        }
+    }
+}
 
 
+void CheckUI::setVehicle(QVariant value)
+{
+    //从新载入一次文件
+    LoadCheckFiles("./checks");
+
+    int index = value.toString().indexOf(' ');
+    QString selectid = value.toString().mid(index);
+    int vehicle = selectid.toInt();
+
+    //检查是否有专属的检查文件，如果有，那么载入，如果没有载入通用的检查文件
+    if(CheckFiles.contains(vehicle))
+    {
+        loadCommandJson(CheckFiles.value(vehicle));
+        reBuild();
+    }
+    else
+    {
+        qDebug() << tr("not Contains special check file") << vehicle;
+        if(CheckFiles.contains(0xFFFF))//默认文件
+        {
+            loadCommandJson(CheckFiles.value(0xFFFF));
+            reBuild();
+        }
+        else
+        {
+            qDebug() << tr("not Contains Default check file") << vehicle;
+        }
+    }
+
+}
 
 
+void CheckUI::on_pushButton_Vehicle_clicked()
+{
+    if(!ui->pushButton_Vehicle->text().isEmpty())
+    {
+        Selector *selector = new Selector(this);
 
+        selector->setGeometry(0,0,this->geometry().width(),this->geometry().height());
+        //selector->setGeometry(0,0,this->width(),this->height());
+
+        QStringList list;
+        list.clear();
+
+        QHash<int,QString>::iterator ite;
+
+        for(ite=Vehicles.begin(); ite!=Vehicles.end();++ite)//每一个key下面都是一个设备的所有参数
+        {
+            list.append(tr("Vehicle %1").arg(ite.key()));
+        }
+
+        selector->setList(list,ui->pushButton_Vehicle->text());
+        connect(selector,SIGNAL(confirmValue(QVariant)),
+                this,SLOT(setVehicle(QVariant)));
+
+        selector->show();
+    }
+}

App/CheckUI/CheckUI.h

@@ -21,6 +21,10 @@
 #include "mavlinknode.h"
 
 
+#include "multiselector.h"
+#include "Selector.h"
+#include "Inputter.h"
+#include "CharInputter.h"
 
 namespace Ui {
 class CheckUI;
@@ -54,13 +58,29 @@ public slots:
     void feedback(bool flag);
     void RecieveMsg(mavlink_message_t msg);
 
+    void addVehicles(int sysid, int compid);
+
+
 private slots:
 
+   void setVehicle(QVariant value);
+
    void on_commandClicked();
 
+
+
+
+   void on_pushButton_Vehicle_clicked();
+
 protected:
 
-   void loadCommandJson(const QString& jsonFilename);
+   QJsonObject parseCheckfiles(const QString& jsonFilename);
+
+   void LoadCheckFiles(QString path);
+
+   void reBuild(void);
+
+   void loadCommandJson(QJsonObject jsonFilename);
 
 private:
 
@@ -90,6 +110,7 @@ private:
     static const char* _spacingJsonKey;
 
     static const char* _commentJsonKey;
+    static const char* _vehicleJsonKey;
     static const char* _ButtonJsonKey;
 
     static const char* _WidthJsonKey;
@@ -121,6 +142,10 @@ private:
 
 
 
+    QHash<int,QJsonObject> CheckFiles;// vehicle,check
+
+    QHash<int,QString> Vehicles;
+
 
     Ui::CheckUI *ui;
 };

App/CheckUI/CheckUI.pri

@@ -7,7 +7,10 @@ QT += quickwidgets
 QT += quick
 QT += qml
 
-
+INCLUDEPATH += $$PWD/../ComponentUI/CharInputter
+INCLUDEPATH += $$PWD/../ComponentUI/Inputter
+INCLUDEPATH += $$PWD/../ComponentUI/MultiSelector
+INCLUDEPATH += $$PWD/../ComponentUI/Selector
 
 FORMS += \
     $$PWD/CheckUI.ui

App/CheckUI/CheckUI.qss

@@ -18,7 +18,7 @@ QPushButton {
     border-style: solid;
     border-radius: 5;
     padding: 3px;
-    font: 20px "Arial";
+    font: 15px "Arial";
 }
 
 QPushButton:pressed[CheckState="0"] {

App/CheckUI/CheckUI.ui

@@ -13,35 +13,133 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
-    <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>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="leftMargin">
+    <number>9</number>
+   </property>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <item row="0" column="0" colspan="2">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QPushButton" name="pushButton_Previous">
+       <property name="minimumSize">
+        <size>
+         <width>80</width>
+         <height>80</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>80</width>
+         <height>80</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Previous</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QPushButton" name="pushButton_Vehicle">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>80</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QPushButton" name="pushButton_Next">
+       <property name="minimumSize">
+        <size>
+         <width>80</width>
+         <height>80</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>80</width>
+         <height>80</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Next</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="0" column="0">
-    <layout class="QGridLayout" name="gridLayout_Check"/>
-   </item>
-   <item row="0" column="1">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+   <item row="1" column="1">
+    <widget class="QFrame" name="frame_check">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
      </property>
-    </spacer>
+     <layout class="QGridLayout" name="gridLayout_">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <layout class="QGridLayout" name="gridLayout_Check">
+        <property name="leftMargin">
+         <number>5</number>
+        </property>
+        <property name="topMargin">
+         <number>5</number>
+        </property>
+        <property name="rightMargin">
+         <number>5</number>
+        </property>
+        <property name="bottomMargin">
+         <number>5</number>
+        </property>
+       </layout>
+      </item>
+      <item row="0" column="1">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>511</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="0">
+       <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>
+     </layout>
+    </widget>
    </item>
   </layout>
  </widget>

App/GCS_zh_CN.ts

@@ -72,72 +72,82 @@
         <translation>U</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="304"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="431"/>
         <source>A</source>
         <translation>A</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="323"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="914"/>
+        <source>EN</source>
+        <translation>英文</translation>
+    </message>
+    <message>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="304"/>
         <source>G</source>
         <translation>G</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="342"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="412"/>
         <source>K</source>
         <translation>K</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="361"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="323"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="380"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="361"/>
         <source>D</source>
         <translation>D</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="399"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="469"/>
         <source>J</source>
         <translation>J</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="418"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="342"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="437"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="380"/>
         <source>H</source>
         <translation>H</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="469"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="450"/>
         <source>L</source>
         <translation>L</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="486"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="482"/>
+        <source>Caps</source>
+        <translation>大写</translation>
+    </message>
+    <message>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="538"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="499"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="590"/>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="512"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="564"/>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="525"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="629"/>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="538"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="512"/>
         <source>6</source>
         <translation>6</translation>
     </message>
@@ -147,77 +157,77 @@
         <translation>8</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="577"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="525"/>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="590"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="499"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="603"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="577"/>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="629"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="642"/>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="652"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="863"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="671"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="818"/>
         <source>B</source>
         <translation>B</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="690"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="786"/>
         <source>Z</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="722"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="678"/>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="741"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="735"/>
         <source>X</source>
         <translation>X</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="760"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="754"/>
         <source>V</source>
         <translation>V</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="779"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="882"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="831"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="767"/>
         <source>Space</source>
         <translation>空格</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="856"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="703"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="869"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="799"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="888"/>
+        <location filename="ComponentUI/CharInputter/CharInputter.ui" line="901"/>
         <source>Enter</source>
         <translation>回车</translation>
     </message>
@@ -230,9 +240,35 @@
         <translation>界面</translation>
     </message>
     <message>
-        <location filename="CheckUI/CheckUI.ui" line="20"/>
+        <location filename="CheckUI/CheckUI.ui" line="40"/>
+        <source>Previous</source>
+        <translation>上一个</translation>
+    </message>
+    <message>
+        <location filename="CheckUI/CheckUI.ui" line="72"/>
+        <source>Next</source>
+        <translation>下一个</translation>
+    </message>
+    <message>
         <source>Seft Test</source>
-        <translation>自检</translation>
+        <translation type="vanished">自检</translation>
+    </message>
+    <message>
+        <location filename="CheckUI/CheckUI.cpp" line="252"/>
+        <location filename="CheckUI/CheckUI.cpp" line="253"/>
+        <location filename="CheckUI/CheckUI.cpp" line="351"/>
+        <source>Vehicle %1</source>
+        <translation type="unfinished">无人机 %1</translation>
+    </message>
+    <message>
+        <location filename="CheckUI/CheckUI.cpp" line="320"/>
+        <source>not Contains special check file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="CheckUI/CheckUI.cpp" line="328"/>
+        <source>not Contains Default check file</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -321,6 +357,8 @@
     </message>
     <message>
         <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="72"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="537"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="770"/>
         <source>Connect</source>
         <translation>连接</translation>
     </message>
@@ -362,132 +400,158 @@
     <message>
         <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="308"/>
         <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.ui" line="321"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="100"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="129"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="101"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="130"/>
         <source>Type</source>
         <translation>类型</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="54"/>
         <source>unname</source>
-        <translation>未命名</translation>
+        <translation type="vanished">未命名</translation>
     </message>
     <message>
         <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="55"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="97"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="288"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="327"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="346"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="415"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="457"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="499"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="98"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="287"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="326"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="345"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="414"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="456"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="498"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="543"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="581"/>
         <source>SerialPort</source>
         <translation>串口</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="64"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="298"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="65"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="297"/>
         <source>115200</source>
         <translation>115200</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="65"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="299"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="423"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="66"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="298"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="422"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="66"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="300"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="67"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="299"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="463"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="549"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="587"/>
         <source>NONE</source>
         <translation>无</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="67"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="301"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="68"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="300"/>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="99"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="128"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="100"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="129"/>
         <source>User Name</source>
         <translation>用户名</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="101"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="102"/>
         <source>Port</source>
         <translation>端口</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="102"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="103"/>
         <source>Baud</source>
         <translation>波特率</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="103"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="104"/>
         <source>Data</source>
         <translation>数据</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="104"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="105"/>
         <source>Parity</source>
         <translation>校验</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="105"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="106"/>
         <source>Stop</source>
         <translation>停止</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="116"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="117"/>
         <source>this port is busy now
 </source>
         <translation>端口已经被占用
 </translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="126"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="306"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="328"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="369"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="127"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="305"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="327"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="368"/>
         <source>UDP</source>
         <translation>UDP</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="130"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="131"/>
         <source>Local</source>
         <translation>本地</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="132"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="133"/>
         <source>Remote</source>
         <translation>远端</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="138"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="139"/>
         <source>NetWork</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="157"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="235"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="464"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="553"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="591"/>
+        <source>ODD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="465"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="557"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="595"/>
+        <source>EVEN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="578"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="754"/>
+        <source>DisConnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="54"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="158"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="231"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="233"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="252"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="251"/>
         <source>Name</source>
         <translation type="unfinished">名称</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="422"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="421"/>
         <source>7</source>
         <translation type="unfinished">7</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="424"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="423"/>
         <source>9</source>
         <translation type="unfinished">9</translation>
     </message>
@@ -496,18 +560,18 @@
         <translation type="vanished">网络</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="308"/>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="310"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="307"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="309"/>
         <source>127.0.0.1</source>
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="309"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="308"/>
         <source>6061</source>
         <translation>6061</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="311"/>
+        <location filename="Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp" line="310"/>
         <source>6060</source>
         <translation>6060</translation>
     </message>
@@ -542,6 +606,16 @@
         <source>Map</source>
         <translation>地图设置</translation>
     </message>
+    <message>
+        <location filename="Setting/Index0/Index0.ui" line="78"/>
+        <source>Command</source>
+        <translation>指令</translation>
+    </message>
+    <message>
+        <location filename="Setting/Index0/Index0.ui" line="104"/>
+        <source>Check</source>
+        <translation>自检</translation>
+    </message>
 </context>
 <context>
     <name>Index1</name>
@@ -688,9 +762,8 @@
         <translation>新增连接</translation>
     </message>
     <message>
-        <location filename="Setting/Index0/LinkUI/LinkUI.cpp" line="46"/>
         <source>SerialPort</source>
-        <translation>串口</translation>
+        <translation type="vanished">串口</translation>
     </message>
     <message>
         <source>UDP</source>
@@ -704,6 +777,11 @@
         <source>add component</source>
         <translation type="vanished">添加部件</translation>
     </message>
+    <message>
+        <location filename="Setting/Index0/LinkUI/LinkUI.cpp" line="44"/>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MAVLinkInspector</name>
@@ -741,52 +819,52 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cpp" line="437"/>
+        <location filename="mainwindow.cpp" line="436"/>
         <source>SerialPort</source>
         <translation>串口</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="441"/>
+        <location filename="mainwindow.cpp" line="440"/>
         <source>UDP</source>
         <translation>UDP</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="445"/>
+        <location filename="mainwindow.cpp" line="444"/>
         <source>Mavlink</source>
         <translation>Mavlink</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="449"/>
+        <location filename="mainwindow.cpp" line="448"/>
         <source>Parameter</source>
         <translation>参数</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="596"/>
+        <location filename="mainwindow.cpp" line="595"/>
         <source>%1D Fix</source>
         <translation>%1D 定位</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="599"/>
+        <location filename="mainwindow.cpp" line="598"/>
         <source>Fixed</source>
         <translation>固定差分</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="602"/>
+        <location filename="mainwindow.cpp" line="601"/>
         <source>Float</source>
         <translation>浮点差分</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="605"/>
+        <location filename="mainwindow.cpp" line="604"/>
         <source>gps err</source>
         <translation>GPS错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="622"/>
+        <location filename="mainwindow.cpp" line="621"/>
         <source>ARM</source>
         <translation>已解锁</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="625"/>
+        <location filename="mainwindow.cpp" line="624"/>
         <source>DISARM</source>
         <translation>未解锁</translation>
     </message>
@@ -941,7 +1019,7 @@
         <location filename="Setting/Index1/ParameterInspector/ParameterInspector.cpp" line="86"/>
         <location filename="Setting/Index1/ParameterInspector/ParameterInspector.cpp" line="187"/>
         <location filename="Setting/Index1/ParameterInspector/ParameterInspector.cpp" line="201"/>
-        <location filename="Setting/Index1/ParameterInspector/ParameterInspector.cpp" line="542"/>
+        <location filename="Setting/Index1/ParameterInspector/ParameterInspector.cpp" line="544"/>
         <source>Vehicle %1</source>
         <translation>无人机 %1</translation>
     </message>

App/Setting/Index0/LinkUI/ConnectDialog/ConnectDialog.cpp

@@ -688,9 +688,10 @@ void ConnectDialog::writeInfo(QVariant Name,
     doc.setObject(root);
 
     QFile file(ConnectInfoFile);
-    if(!file.open(QIODevice::ReadWrite)) {
+    if(!file.open(QIODevice::ReadWrite|QFile::Truncate)) {
         qDebug() << "File open error";
     }
+
     file.write(doc.toJson());
     file.close();
 

App/mainwindow.cpp

@@ -111,6 +111,8 @@ MainWindow::MainWindow(QWidget *parent)
     connect(dlink->mavlinknode,SIGNAL(recievemsg(mavlink_message_t)),
             checkUI,SLOT(RecieveMsg(mavlink_message_t)));
 
+    connect(dlink->mavlinknode,SIGNAL(addVehicles(int,int)),
+            checkUI,SLOT(addVehicles(int,int)));
 
     //setting ----- dlink
     connect(dlink,SIGNAL(PortConnected(QVariant,QVariant,QVariant,QVariant,QVariant,QVariant,QVariant,QVariant)),

dlink/GCS_zh_CN.ts

@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="zh_CN">
-<context>
-    <name>DLink</name>
-    <message>
-        <source>SerialPort</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>