diff --git a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserPluginWidget.cpp b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserPluginWidget.cpp
index c4a4703a..7b31e10b 100644
--- a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserPluginWidget.cpp
+++ b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CBrowserPluginWidget.h"
 #include "CBrowserWidget.h"
 
diff --git a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserPluginWidget.h b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserPluginWidget.h
index 4fd2cc2d..a1485778 100644
--- a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserPluginWidget.h
+++ b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CBROWSERPLUGINWIDGET_H
+#ifndef CBROWSERPLUGINWIDGET_H
 #define CBROWSERPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CBrowserPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.cpp b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.cpp
index ea27b250..73b348d6 100644
--- a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.cpp
+++ b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.cpp
@@ -1,4 +1,4 @@
-#include "CBrowserWidget.h"
+#include "CBrowserWidget.h"
 #include "pub_logger_api/logger.h"
 #include <QNetworkProxyFactory>
 
diff --git a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.h b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.h
index 563774c1..7cd6026e 100644
--- a/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.h
+++ b/product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.h
@@ -1,4 +1,4 @@
-#ifndef CBROWSERWIDGET_H
+#ifndef CBROWSERWIDGET_H
 #define CBROWSERWIDGET_H
 
 #include <QCoreApplication>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.cpp
index 6e0ae775..e73ae633 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.cpp
@@ -1,4 +1,4 @@
-#include "CAiAlarmDataCollect.h"
+#include "CAiAlarmDataCollect.h"
 #include "pub_logger_api/logger.h"
 #include "CAlarmMsgManage.h"
 #include <QDebug>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.h b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.h
index dd7dc392..37eeca38 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.h
@@ -1,4 +1,4 @@
-#ifndef CAIALARMDATACOLLECT_H
+#ifndef CAIALARMDATACOLLECT_H
 #define CAIALARMDATACOLLECT_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.cpp
index ad34f39d..91de5241 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.cpp
@@ -1,4 +1,4 @@
-#include "CAiAlarmDelegate.h"
+#include "CAiAlarmDelegate.h"
 #include <QFile>
 #include "pub_utility_api/FileUtil.h"
 #include "pub_logger_api/logger.h"
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.h b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.h
index 95a15eed..7ef1033e 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.h
@@ -1,4 +1,4 @@
-#ifndef CAIALARMDELEGATE_H
+#ifndef CAIALARMDELEGATE_H
 #define CAIALARMDELEGATE_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.cpp
index 9f644f7d..fe62a0f8 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.cpp
@@ -1,4 +1,4 @@
-#include "CAiAlarmMsgInfo.h"
+#include "CAiAlarmMsgInfo.h"
 #include <QDateTime>
 #include "CAlarmDataCollect.h"
 #include <QDebug>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.h b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.h
index 07c33d7e..924d6a86 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.h
@@ -1,4 +1,4 @@
-#ifndef CAIALARMMSGINFO_H
+#ifndef CAIALARMMSGINFO_H
 #define CAIALARMMSGINFO_H
 
 
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeItem.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeItem.cpp
index c6787dc8..dec075d5 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeItem.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeItem.cpp
@@ -1,4 +1,4 @@
-#include "CAiAlarmTreeItem.h"
+#include "CAiAlarmTreeItem.h"
 #include "CAiAlarmMsgInfo.h"
 #include "CAlarmMsgInfo.h"
 #include "CAlarmCommon.h"
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeItem.h b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeItem.h
index ae826783..7b74b32d 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeItem.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeItem.h
@@ -1,4 +1,4 @@
-#ifndef CAIALARMTREEITEM_H
+#ifndef CAIALARMTREEITEM_H
 #define CAIALARMTREEITEM_H
 
 #include <QVector>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeModel.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeModel.cpp
index 979633aa..4bb48a52 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeModel.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeModel.cpp
@@ -1,4 +1,4 @@
-#include "CAiAlarmTreeModel.h"
+#include "CAiAlarmTreeModel.h"
 #include "CAlarmMsgManage.h"
 #include "CAiAlarmDataCollect.h"
 #include "CAlarmDataCollect.h"
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeModel.h b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeModel.h
index b4b5c324..f83908da 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeModel.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeModel.h
@@ -1,4 +1,4 @@
-#ifndef CAIALARMTREEMODEL_H
+#ifndef CAIALARMTREEMODEL_H
 #define CAIALARMTREEMODEL_H
 
 #include <QAbstractItemModel>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeView.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeView.cpp
index cd92927f..410d6c32 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeView.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeView.cpp
@@ -1,4 +1,4 @@
-#include "CAiAlarmTreeView.h"
+#include "CAiAlarmTreeView.h"
 #include <QHeaderView>
 #include <QScrollBar>
 CAiAlarmTreeView::CAiAlarmTreeView(QWidget *parent)
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeView.h b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeView.h
index e4af5631..77b60d21 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeView.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeView.h
@@ -1,4 +1,4 @@
-#ifndef CAIALARMTREEVIEW_H
+#ifndef CAIALARMTREEVIEW_H
 #define CAIALARMTREEVIEW_H
 
 #include <QTreeView>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmCommon.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmCommon.h
index ea992d9d..ae601a98 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmCommon.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmCommon.h
@@ -1,4 +1,4 @@
-#ifndef CALARMCOMMON_H
+#ifndef CALARMCOMMON_H
 #define CALARMCOMMON_H
 
 #include <QSharedPointer>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.cpp
index e2bf0e93..0596ad0d 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmDataCollect.h"
+#include "CAlarmDataCollect.h"
 #include <QDateTime>
 #include "pub_logger_api/logger.h"
 #include "CAlarmMsgManage.h"
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.h
index 96ea3a82..759636a0 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.h
@@ -1,4 +1,4 @@
-#ifndef CALARMDATACOLLECT_H
+#ifndef CALARMDATACOLLECT_H
 #define CALARMDATACOLLECT_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.cpp
index 6a47fb24..a132e02e 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.cpp
@@ -1,4 +1,4 @@
-#include <QFile>
+#include <QFile>
 #include <QPainter>
 #include <QDomDocument>
 #include "CAlarmDelegate.h"
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.h
index 7427c474..104397bb 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.h
@@ -1,4 +1,4 @@
-#ifndef CALARMDELEGATE_H
+#ifndef CALARMDELEGATE_H
 #define CALARMDELEGATE_H
 
 #include <QStyledItemDelegate>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeItem.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeItem.cpp
index 9aaa1f82..c2e9070a 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeItem.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeItem.cpp
@@ -1,4 +1,4 @@
-#include <QStringList>
+#include <QStringList>
 #include "CAlarmDeviceTreeItem.h"
 #include "pub_logger_api/logger.h"
 
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeItem.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeItem.h
index e97e5406..d09d31ce 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeItem.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeItem.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeModel.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeModel.cpp
index 294d8d52..2e98e8c3 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeModel.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeModel.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmDeviceTreeItem.h"
+#include "CAlarmDeviceTreeItem.h"
 #include "CAlarmDeviceTreeModel.h"
 #include "CAlarmMsgManage.h"
 #include <QStringList>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeModel.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeModel.h
index df258f0e..77171d64 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeModel.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeModel.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeView.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeView.cpp
index abd57560..083e828a 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeView.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeView.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmDeviceTreeView.h"
+#include "CAlarmDeviceTreeView.h"
 #include "CAlarmDeviceTreeModel.h"
 #include "CAlarmDeviceTreeItem.h"
 #include <QMenu>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.cpp
index 73a9eee0..5df2e190 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmFilterDialog.h"
+#include "CAlarmFilterDialog.h"
 #include "ui_CAlarmFilterDialog.h"
 #include "public/pub_sysinfo_api/SysInfoApi.h"
 #include "pub_logger_api/logger.h"
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.h
index e650900c..7861c0f1 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.h
@@ -1,4 +1,4 @@
-#ifndef CALARMFILTERDIALOG_H
+#ifndef CALARMFILTERDIALOG_H
 #define CALARMFILTERDIALOG_H
 
 #include <QMap>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.cpp
index 0336b173..a5f2b0a9 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmForm.h"
+#include "CAlarmForm.h"
 #include <QMenu>
 #include <QPrinter>
 #include <QMessageBox>
@@ -159,7 +159,7 @@ void CAlarmForm::initialize()
 
     //< lingdaoyaoqiu
     {
-        QSettings columFlags("KBD_HMI", "alarm config");
+        QSettings columFlags("IOT_HMI", "alarm config");
         if(!columFlags.contains(QString("alarm/colum_0")))
         {
             columFlags.setValue(QString("alarm/colum_0"), false);   //< 时间
@@ -505,7 +505,7 @@ void CAlarmForm::setAlarmModel(CAlarmItemModel *model)
     ui->alarmView->setColumnWidth(6, 120);
 
     ui->alarmView->horizontalHeader()->setSortIndicator(1, Qt::AscendingOrder);
-    QSettings columFlags("KBD_HMI", "alarm config");
+    QSettings columFlags("IOT_HMI", "alarm config");
     for(int nColumnIndex(0); nColumnIndex < m_pModel->columnCount(); nColumnIndex++)
     {
         bool visible = columFlags.value(QString("alarm/colum_%1").arg(nColumnIndex)).toBool();
@@ -1029,7 +1029,7 @@ void CAlarmForm::contextMenuStack0Event(QContextMenuEvent *event)
             connect(action, &QAction::triggered, [=](){
                 ui->alarmView->setColumnHidden(nColumnIndex, !action->isChecked());
                 ui->aiAlarmTreeView->setColumnHidden(nColumnIndex, !action->isChecked());
-                QSettings columFlags("KBD_HMI", "alarm config");
+                QSettings columFlags("IOT_HMI", "alarm config");
                 columFlags.setValue(QString("alarm/colum_%1").arg(nColumnIndex), !action->isChecked());
             });
         }
@@ -1099,7 +1099,7 @@ void CAlarmForm::contextMenuStack1Event(QContextMenuEvent *event)
             connect(action, &QAction::triggered, [=](){
                 ui->alarmView->setColumnHidden(nColumnIndex, !action->isChecked());
                 ui->aiAlarmTreeView->setColumnHidden(nColumnIndex, !action->isChecked());
-                QSettings columFlags("KBD_HMI", "alarm config");
+                QSettings columFlags("IOT_HMI", "alarm config");
                 columFlags.setValue(QString("alarm/colum_%1").arg(nColumnIndex), !action->isChecked());
             });
         }
@@ -1372,7 +1372,7 @@ void CAlarmForm::loadDeviceGroupFilterWidget()
             QString sqlSequenceQuery = QString("select tag_name, description from dev_group where location_id = %1;").arg(iter.key());
             if(false == m_pReadDb->execute(sqlSequenceQuery, query))
             {
-                LOGINFO("load device info error, dbInterface execute failed!")
+                LOGINFO("load device info error, dbInterface execute failed!");
             }
 
             while(query.next())
@@ -1385,7 +1385,7 @@ void CAlarmForm::loadDeviceGroupFilterWidget()
     }
     else
     {
-        LOGINFO("load deviceGroup info error, database open failed!")
+        LOGINFO("load deviceGroup info error, database open failed!");
     }
     m_pReadDb->close();
     delete m_pReadDb;
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.h
index e7941a70..90aed857 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.h
@@ -1,4 +1,4 @@
-#ifndef CALARMFORM_H
+#ifndef CALARMFORM_H
 #define CALARMFORM_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.cpp
index b5b2b98d..fcbb95e2 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmInhibitDialog.h"
+#include "CAlarmInhibitDialog.h"
 #include "ui_CAlarmInhibitDialog.h"
 #include <QDateTime>
 #include <QFile>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.h
index f6371f5f..51fb17f4 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.h
@@ -1,4 +1,4 @@
-#ifndef CALARMINHIBITDIALOG_H
+#ifndef CALARMINHIBITDIALOG_H
 #define CALARMINHIBITDIALOG_H
 
 #include <QMap>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.cpp
index 4fbdccea..ce3e8d59 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmItemModel.h"
+#include "CAlarmItemModel.h"
 #include "CAlarmMsgInfo.h"
 #include <QModelIndex>
 #include <QHeaderView>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.h
index a025c8eb..8708d8e8 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.h
@@ -1,4 +1,4 @@
-#ifndef CALARMITEMMODEL_H
+#ifndef CALARMITEMMODEL_H
 #define CALARMITEMMODEL_H
 
 #include <QSet>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.cpp
index 419d836d..1c91f29c 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.cpp
@@ -1,4 +1,4 @@
-
+
 #ifdef OS_WINDOWS
 //< 为了检测可用声卡
 #include <mmdeviceapi.h>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.h
index 52cc2746..270f9414 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.h
@@ -1,4 +1,4 @@
-#ifndef CALARMMEDIAPLAYER_H
+#ifndef CALARMMEDIAPLAYER_H
 #define CALARMMEDIAPLAYER_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.cpp
index ce6dbd48..b53a5a11 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmMsgInfo.h"
+#include "CAlarmMsgInfo.h"
 #include <QDateTime>
 #include "CAlarmDataCollect.h"
 #include <QDebug>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.h
index b8c78aa8..9bed1e75 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.h
@@ -1,4 +1,4 @@
-#ifndef ALARMMSGINFO_H
+#ifndef ALARMMSGINFO_H
 #define ALARMMSGINFO_H
 
 #include <QMetaType>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.cpp
index af43b652..69d740c2 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmMsgManage.h"
+#include "CAlarmMsgManage.h"
 #include <QMutex>
 #include <QMutexLocker>
 #include <QDateTime>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.h
index e8eb0c2c..15ce0615 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.h
@@ -1,4 +1,4 @@
-#ifndef CALARMMSGMANAGE_H
+#ifndef CALARMMSGMANAGE_H
 #define CALARMMSGMANAGE_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.cpp
index f937b850..b42f9420 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmPlugin.h"
+#include "CAlarmPlugin.h"
 #include <QMediaPlaylist>
 #include <QHBoxLayout>
 #include <QFile>
@@ -885,7 +885,7 @@ void CAlarmPlugin::updateAlarmOperatePerm()
     iot_public::CSysInfoInterfacePtr spSysInfo;
     if (!iot_public::createSysInfoInstance(spSysInfo))
     {
-        LOGERROR("创建系统信息访问库实例失败！")
+        LOGERROR("创建系统信息访问库实例失败！");
                 return;
     }
     spSysInfo->getLocalNodeInfo(stNodeInfo);
@@ -901,12 +901,12 @@ void CAlarmPlugin::updateAlarmOperatePerm()
         std::string strInstanceName;
         if(0 != permMngPtr->CurUser(m_currentUsrId, nUserGrpId, nLevel, nLoginSec, strInstanceName))
         {
-            LOGERROR("用户ID获取失败！")
+            LOGERROR("用户ID获取失败！");
                     return;
         }
         if(PERM_NORMAL != permMngPtr->GetSpeFunc(FUNC_SPE_ALARM_OPERATE, m_vecRegionId, m_vecLocationId))
         {
-            LOGERROR("用户不具备告警操作权限！")
+            LOGERROR("用户不具备告警操作权限！");
                     return;
         }
     }
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.h
index f15eccc4..d865ed41 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.h
@@ -1,4 +1,4 @@
-#ifndef CALARMPLUGIN_H
+#ifndef CALARMPLUGIN_H
 #define CALARMPLUGIN_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPluginWidget.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPluginWidget.cpp
index 5337d7e3..d16db7e0 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPluginWidget.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CAlarmPluginWidget.h"
 #include "CAlarmPlugin.h"
 #include "pub_logger_api/logger.h"
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPluginWidget.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPluginWidget.h
index 5c706ea9..95196608 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPluginWidget.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CALARMPLUGINWIDGET_H
+#ifndef CALARMPLUGINWIDGET_H
 #define CALARMPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CAlarmPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmView.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmView.cpp
index d24f5892..693e1a24 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmView.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmView.cpp
@@ -1,4 +1,4 @@
-#include <QHeaderView>
+#include <QHeaderView>
 #include <QMouseEvent>
 #include "CAlarmView.h"
 #include <QScrollBar>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmView.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmView.h
index 468ae17d..9ed09649 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmView.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmView.h
@@ -1,4 +1,4 @@
-#ifndef CALARMVIEW_H
+#ifndef CALARMVIEW_H
 #define CALARMVIEW_H
 
 #include <QTableView>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.cpp
index b7a029f6..eb501e34 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmWidget.h"
+#include "CAlarmWidget.h"
 #include <QVBoxLayout>
 #include <QTableView>
 #include <QHeaderView>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.h b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.h
index 7edd2f35..c4f8c1de 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.h
@@ -1,4 +1,4 @@
-#ifndef CALARMWINDOW_H
+#ifndef CALARMWINDOW_H
 #define CALARMWINDOW_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CDisposalPlanDialog.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CDisposalPlanDialog.cpp
index 415eb4bf..64c81342 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CDisposalPlanDialog.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CDisposalPlanDialog.cpp
@@ -1,4 +1,4 @@
-#include "CDisposalPlanDialog.h"
+#include "CDisposalPlanDialog.h"
 #include "ui_CDisposalPlanDialog.h"
 #include "CAiAlarmMsgInfo.h"
 #include <QDate>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CDisposalPlanDialog.h b/product/src/gui/plugin/ISCSAlarmWidget/CDisposalPlanDialog.h
index 3dccca2c..f2735e4f 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CDisposalPlanDialog.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CDisposalPlanDialog.h
@@ -1,4 +1,4 @@
-#ifndef CDISPOSALPLANDIALOG_H
+#ifndef CDISPOSALPLANDIALOG_H
 #define CDISPOSALPLANDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CMyCalendar.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CMyCalendar.cpp
index 9dca56ae..9c72e0d7 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CMyCalendar.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CMyCalendar.cpp
@@ -1,4 +1,4 @@
-#include "CMyCalendar.h"
+#include "CMyCalendar.h"
 #include "ui_CMyCalendar.h"
 #include <pub_logger_api/logger.h>
 #include <QMessageBox>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CMyCalendar.h b/product/src/gui/plugin/ISCSAlarmWidget/CMyCalendar.h
index 339fb73c..caa34e37 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CMyCalendar.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CMyCalendar.h
@@ -1,4 +1,4 @@
-#ifndef CMYCALENDAR_H
+#ifndef CMYCALENDAR_H
 #define CMYCALENDAR_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CMyCheckBox.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CMyCheckBox.cpp
index b2bc5d95..797e7f84 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CMyCheckBox.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CMyCheckBox.cpp
@@ -1,4 +1,4 @@
-#include "CMyCheckBox.h"
+#include "CMyCheckBox.h"
 #include <QMouseEvent>
 
 CMyCheckBox::CMyCheckBox(QString text, QWidget *parent)
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CMyCheckBox.h b/product/src/gui/plugin/ISCSAlarmWidget/CMyCheckBox.h
index bdba8dbc..1dad82e3 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CMyCheckBox.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CMyCheckBox.h
@@ -1,4 +1,4 @@
-#ifndef MYCHECKBOX_H
+#ifndef MYCHECKBOX_H
 #define MYCHECKBOX_H
 
 #include <QCheckBox>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CMyListWidget.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CMyListWidget.cpp
index ded92615..fa73a493 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CMyListWidget.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CMyListWidget.cpp
@@ -1,4 +1,4 @@
-#include "CMyListWidget.h"
+#include "CMyListWidget.h"
 
 CMyListWidget::CMyListWidget(QWidget *parent):QListWidget(parent)
 {
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CMyListWidget.h b/product/src/gui/plugin/ISCSAlarmWidget/CMyListWidget.h
index 3e92461e..728f308d 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CMyListWidget.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CMyListWidget.h
@@ -1,4 +1,4 @@
-#ifndef CMYLISTWIDGET_H
+#ifndef CMYLISTWIDGET_H
 #define CMYLISTWIDGET_H
 
 #include <QListWidget>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CPdfPrinter.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CPdfPrinter.cpp
index 587c9959..40a8a315 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CPdfPrinter.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CPdfPrinter.cpp
@@ -1,4 +1,4 @@
-#include "CPdfPrinter.h"
+#include "CPdfPrinter.h"
 #include <QDebug>
 #include <QPrinter>
 #include <QHeaderView>
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CPdfPrinter.h b/product/src/gui/plugin/ISCSAlarmWidget/CPdfPrinter.h
index 0a8f9145..3b31ddf9 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CPdfPrinter.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CPdfPrinter.h
@@ -1,4 +1,4 @@
-/**
+/**
 * @file          AlarmWidget   之前是做pdf打印，因需求修改，现在改为excel ，但是类名不变，维护请注意
 * @brief
 * @author        jxd
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CTableViewPrinter.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CTableViewPrinter.cpp
index 0163ba9a..b8816a4a 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CTableViewPrinter.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CTableViewPrinter.cpp
@@ -1,4 +1,4 @@
-#include "CTableViewPrinter.h"
+#include "CTableViewPrinter.h"
 #include "CAlarmCommon.h"
 #include "CAlarmMsgManage.h"
 CTableViewPrinter::CTableViewPrinter(CAlarmItemModel *model):
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CTableViewPrinter.h b/product/src/gui/plugin/ISCSAlarmWidget/CTableViewPrinter.h
index b911e7a8..09e78694 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CTableViewPrinter.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CTableViewPrinter.h
@@ -1,4 +1,4 @@
-#ifndef CTABLEVIEWPRINTER_H
+#ifndef CTABLEVIEWPRINTER_H
 #define CTABLEVIEWPRINTER_H
 #include "CAlarmItemModel.h"
 class QVariant;
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CTreeViewPrinter.cpp b/product/src/gui/plugin/ISCSAlarmWidget/CTreeViewPrinter.cpp
index 673ee6af..ae54c404 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CTreeViewPrinter.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CTreeViewPrinter.cpp
@@ -1,4 +1,4 @@
-#include "CTreeViewPrinter.h"
+#include "CTreeViewPrinter.h"
 #include "CAiAlarmTreeItem.h"
 CTreeViewPrinter::CTreeViewPrinter(CAiAlarmTreeModel *model):
     m_pModel(model)
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/CTreeViewPrinter.h b/product/src/gui/plugin/ISCSAlarmWidget/CTreeViewPrinter.h
index a28a4498..d5745648 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/CTreeViewPrinter.h
+++ b/product/src/gui/plugin/ISCSAlarmWidget/CTreeViewPrinter.h
@@ -1,4 +1,4 @@
-#ifndef CTREEVIEWPRINTER_H
+#ifndef CTREEVIEWPRINTER_H
 #define CTREEVIEWPRINTER_H
 #include "CAiAlarmTreeModel.h"
 class QVariant;
diff --git a/product/src/gui/plugin/ISCSAlarmWidget/main.cpp b/product/src/gui/plugin/ISCSAlarmWidget/main.cpp
index 6477efb7..5576ff4c 100644
--- a/product/src/gui/plugin/ISCSAlarmWidget/main.cpp
+++ b/product/src/gui/plugin/ISCSAlarmWidget/main.cpp
@@ -1,4 +1,4 @@
-#include <QApplication>
+#include <QApplication>
 #include "CAlarmPlugin.h"
 #include "pub_logger_api/logger.h"
 #include "net_msg_bus_api/MsgBusApi.h"
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.cpp
index bdca55b1..1fa35ed7 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.cpp
@@ -1,4 +1,4 @@
-#include "CEventDataCollect.h"
+#include "CEventDataCollect.h"
 #include <QDateTime>
 #include <QMutex>
 #include <QThread>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.h b/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.h
index 5ef9b2ea..a39a0107 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.h
@@ -1,4 +1,4 @@
-#ifndef CEventDataCollect_H
+#ifndef CEventDataCollect_H
 #define CEventDataCollect_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.cpp
index ad2f9456..ebedce7a 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.cpp
@@ -1,4 +1,4 @@
-#include "CEventFilterDialog.h"
+#include "CEventFilterDialog.h"
 #include "ui_CEventFilterDialog.h"
 #include "CEventDataCollect.h"
 #include "public/pub_sysinfo_api/SysInfoApi.h"
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.h b/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.h
index 84d27583..453b6ab2 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.h
@@ -1,4 +1,4 @@
-#ifndef CEVENTFILTERDIALOG_H
+#ifndef CEVENTFILTERDIALOG_H
 #define CEVENTFILTERDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventForm.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventForm.cpp
index 9c95b482..94d7ea17 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventForm.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventForm.cpp
@@ -1,4 +1,4 @@
-#include "CEventForm.h"
+#include "CEventForm.h"
 #include "ui_CEventForm.h"
 #include "CEventMsgInfo.h"
 #include <QContextMenuEvent>
@@ -140,7 +140,7 @@ void CEventForm::initilize()
 {
     //< lingdaoyaoqiu
     {
-        QSettings columFlags1("KBD_HMI", "eventReal config");
+        QSettings columFlags1("IOT_HMI", "eventReal config");
         if(!columFlags1.contains(QString("eventReal/colum_0")))
         {
             columFlags1.setValue(QString("eventReal/colum_0"), false);   //< 时间
@@ -153,7 +153,7 @@ void CEventForm::initilize()
         }
     }
     {
-        QSettings columFlags2("KBD_HMI", "eventHis config");
+        QSettings columFlags2("IOT_HMI", "eventHis config");
         if(!columFlags2.contains(QString("eventHis/colum_0")))
         {
             columFlags2.setValue(QString("eventHis/colum_0"), false);   //< 时间
@@ -487,7 +487,7 @@ void CEventForm::slotUpdateModel()
             connect(m_pHistoryModel, &CEventHistoryModel::sigHISRecordOutOfRangeTips, this, &CEventForm::slotHISRecordOutOfRangeTips);
         }
         ui->eventView->setModel(m_pHistoryModel);
-        QSettings columFlags2("KBD_HMI", "eventHis config");
+        QSettings columFlags2("IOT_HMI", "eventHis config");
         for(int nColumnIndex(0); nColumnIndex < m_pHistoryModel->columnCount(); nColumnIndex++)
         {
             bool visible = columFlags2.value(QString("eventHis/colum_%1").arg(nColumnIndex)).toBool();
@@ -512,7 +512,7 @@ void CEventForm::slotUpdateModel()
             ui->eventView->horizontalHeader()->setSortIndicator(0, Qt::AscendingOrder);
         }
         ui->eventView->setModel(m_pRealTimeModel);
-        QSettings columFlags1("KBD_HMI", "eventReal config");
+        QSettings columFlags1("IOT_HMI", "eventReal config");
         for(int nColumnIndex(0); nColumnIndex < m_pRealTimeModel->columnCount(); nColumnIndex++)
         {
             bool visible = columFlags1.value(QString("eventReal/colum_%1").arg(nColumnIndex)).toBool();
@@ -935,13 +935,13 @@ void CEventForm::contextMenuEvent(QContextMenuEvent *event)
             {
                 QAction * action = columnMenu.addAction(m_pRealTimeModel->headerData(nColumnIndex, Qt::Horizontal, Qt::DisplayRole).toString());
                 action->setCheckable(true);
-                QSettings columFlags1_1("KBD_HMI", "eventReal config");
+                QSettings columFlags1_1("IOT_HMI", "eventReal config");
                 action->setChecked(!columFlags1_1.value(QString("eventReal/colum_%1").arg(nColumnIndex)).toBool());
 
                 connect(action, &QAction::triggered, [=](){
 
                     ui->eventView->setColumnHidden(nColumnIndex, !action->isChecked());
-                    QSettings columFlags1("KBD_HMI", "eventReal config");
+                    QSettings columFlags1("IOT_HMI", "eventReal config");
                     columFlags1.setValue(QString("eventReal/colum_%1").arg(nColumnIndex), !action->isChecked());
                 });
             }
@@ -954,7 +954,7 @@ void CEventForm::contextMenuEvent(QContextMenuEvent *event)
                 action->setChecked(!ui->eventView->isColumnHidden(nColumnIndex));
                 connect(action, &QAction::triggered, [=](){
                     ui->eventView->setColumnHidden(nColumnIndex, !action->isChecked());
-                    QSettings columFlags2("KBD_HMI", "eventHis config");
+                    QSettings columFlags2("IOT_HMI", "eventHis config");
                     columFlags2.setValue(QString("eventHis/colum_%1").arg(nColumnIndex), !action->isChecked());
                 });
             }
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventForm.h b/product/src/gui/plugin/ISCSEventWidget/CEventForm.h
index fc8bed39..a5b7a562 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventForm.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventForm.h
@@ -1,4 +1,4 @@
-#ifndef CEventForm_H
+#ifndef CEventForm_H
 #define CEventForm_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.cpp
index 10e25586..113226bc 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.cpp
@@ -1,4 +1,4 @@
-#include "CEventHistoryModel.h"
+#include "CEventHistoryModel.h"
 #include "CEventMsgInfo.h"
 #include <QModelIndex>
 #include <QMutexLocker>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.h b/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.h
index 726e5776..56e9b343 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.h
@@ -1,4 +1,4 @@
-#ifndef CEVENTHISTORYMODEL_H
+#ifndef CEVENTHISTORYMODEL_H
 #define CEVENTHISTORYMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventItemModel.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventItemModel.cpp
index bbd8dfd0..68b18ea4 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventItemModel.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventItemModel.cpp
@@ -1,4 +1,4 @@
-#include "CEventItemModel.h"
+#include "CEventItemModel.h"
 #include "CEventMsgInfo.h"
 #include <QModelIndex>
 #include <QMutexLocker>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventItemModel.h b/product/src/gui/plugin/ISCSEventWidget/CEventItemModel.h
index b8ff2ce3..40032cdb 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventItemModel.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventItemModel.h
@@ -1,4 +1,4 @@
-#ifndef CEVENTITEMMODEL_H
+#ifndef CEVENTITEMMODEL_H
 #define CEVENTITEMMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.cpp
index 67db931c..43b97a3e 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.cpp
@@ -1,4 +1,4 @@
-#include "CEventMsgInfo.h"
+#include "CEventMsgInfo.h"
 #include <QDateTime>
 #include "CEventDataCollect.h"
 #include <QDebug>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.h b/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.h
index 7c5a9e7c..76c54454 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.h
@@ -1,4 +1,4 @@
-#ifndef ALARMMSGINFO_H
+#ifndef ALARMMSGINFO_H
 #define ALARMMSGINFO_H
 
 #include <QMetaType>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventMsgManage.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventMsgManage.cpp
index 1c9fdaff..d629ca49 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventMsgManage.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventMsgManage.cpp
@@ -1,4 +1,4 @@
-#include "CEventMsgManage.h"
+#include "CEventMsgManage.h"
 #include <QMutex>
 #include <QMutexLocker>
 CEventMsgManage * CEventMsgManage::m_pInstance = Q_NULLPTR;
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventMsgManage.h b/product/src/gui/plugin/ISCSEventWidget/CEventMsgManage.h
index f0150ab8..357d10ba 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventMsgManage.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventMsgManage.h
@@ -1,4 +1,4 @@
-#ifndef CEventMsgManage_H
+#ifndef CEventMsgManage_H
 #define CEventMsgManage_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventPluginWidget.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventPluginWidget.cpp
index eeddeec3..6f98b18c 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventPluginWidget.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CEventPluginWidget.h"
 #include "CEventForm.h"
 
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventPluginWidget.h b/product/src/gui/plugin/ISCSEventWidget/CEventPluginWidget.h
index 1e530db5..6ef08a0c 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventPluginWidget.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CEVENTPLUGINWIDGET_H
+#ifndef CEVENTPLUGINWIDGET_H
 #define CEVENTPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CEventPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventView.cpp b/product/src/gui/plugin/ISCSEventWidget/CEventView.cpp
index ea528e77..b550ecd2 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventView.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventView.cpp
@@ -1,4 +1,4 @@
-#include <QHeaderView>
+#include <QHeaderView>
 #include "CEventView.h"
 
 CEventView::CEventView(QWidget *parent)
diff --git a/product/src/gui/plugin/ISCSEventWidget/CEventView.h b/product/src/gui/plugin/ISCSEventWidget/CEventView.h
index de3f7226..44eca255 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CEventView.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CEventView.h
@@ -1,4 +1,4 @@
-#ifndef CEventView_H
+#ifndef CEventView_H
 #define CEventView_H
 
 #include <QTableView>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CExcelPrinter.cpp b/product/src/gui/plugin/ISCSEventWidget/CExcelPrinter.cpp
index 53b4f8b4..d96f2f04 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CExcelPrinter.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CExcelPrinter.cpp
@@ -1,4 +1,4 @@
-#include "CExcelPrinter.h"
+#include "CExcelPrinter.h"
 CExcelPrinter::CExcelPrinter(QObject *parent) : QObject(parent)
 {
 
diff --git a/product/src/gui/plugin/ISCSEventWidget/CExcelPrinter.h b/product/src/gui/plugin/ISCSEventWidget/CExcelPrinter.h
index b3cdfeeb..b9b2864a 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CExcelPrinter.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CExcelPrinter.h
@@ -1,4 +1,4 @@
-#ifndef CEXCELPRINTER_H
+#ifndef CEXCELPRINTER_H
 #define CEXCELPRINTER_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CMyCalendar.cpp b/product/src/gui/plugin/ISCSEventWidget/CMyCalendar.cpp
index 0482e2e0..30a9cae7 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CMyCalendar.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CMyCalendar.cpp
@@ -1,4 +1,4 @@
-#include "CMyCalendar.h"
+#include "CMyCalendar.h"
 #include "ui_CMyCalendar.h"
 #include <pub_logger_api/logger.h>
 #include <QMessageBox>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CMyCalendar.h b/product/src/gui/plugin/ISCSEventWidget/CMyCalendar.h
index db92a26b..15775649 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CMyCalendar.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CMyCalendar.h
@@ -1,4 +1,4 @@
-#ifndef CMYCALENDAR_H
+#ifndef CMYCALENDAR_H
 #define CMYCALENDAR_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CMyCheckBox.cpp b/product/src/gui/plugin/ISCSEventWidget/CMyCheckBox.cpp
index b2bc5d95..797e7f84 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CMyCheckBox.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CMyCheckBox.cpp
@@ -1,4 +1,4 @@
-#include "CMyCheckBox.h"
+#include "CMyCheckBox.h"
 #include <QMouseEvent>
 
 CMyCheckBox::CMyCheckBox(QString text, QWidget *parent)
diff --git a/product/src/gui/plugin/ISCSEventWidget/CMyCheckBox.h b/product/src/gui/plugin/ISCSEventWidget/CMyCheckBox.h
index bdba8dbc..1dad82e3 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CMyCheckBox.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CMyCheckBox.h
@@ -1,4 +1,4 @@
-#ifndef MYCHECKBOX_H
+#ifndef MYCHECKBOX_H
 #define MYCHECKBOX_H
 
 #include <QCheckBox>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CMyListWidget.cpp b/product/src/gui/plugin/ISCSEventWidget/CMyListWidget.cpp
index ded92615..fa73a493 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CMyListWidget.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CMyListWidget.cpp
@@ -1,4 +1,4 @@
-#include "CMyListWidget.h"
+#include "CMyListWidget.h"
 
 CMyListWidget::CMyListWidget(QWidget *parent):QListWidget(parent)
 {
diff --git a/product/src/gui/plugin/ISCSEventWidget/CMyListWidget.h b/product/src/gui/plugin/ISCSEventWidget/CMyListWidget.h
index 3e92461e..728f308d 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CMyListWidget.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CMyListWidget.h
@@ -1,4 +1,4 @@
-#ifndef CMYLISTWIDGET_H
+#ifndef CMYLISTWIDGET_H
 #define CMYLISTWIDGET_H
 
 #include <QListWidget>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CTableViewPrinter.cpp b/product/src/gui/plugin/ISCSEventWidget/CTableViewPrinter.cpp
index afbf955c..c9a7e6e8 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CTableViewPrinter.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/CTableViewPrinter.cpp
@@ -1,4 +1,4 @@
-#include "CTableViewPrinter.h"
+#include "CTableViewPrinter.h"
 #include <QPainter>
 #include <QPrinter>
 #include <QTableView>
diff --git a/product/src/gui/plugin/ISCSEventWidget/CTableViewPrinter.h b/product/src/gui/plugin/ISCSEventWidget/CTableViewPrinter.h
index 839198f2..cb595560 100644
--- a/product/src/gui/plugin/ISCSEventWidget/CTableViewPrinter.h
+++ b/product/src/gui/plugin/ISCSEventWidget/CTableViewPrinter.h
@@ -1,4 +1,4 @@
-#ifndef CTABLEVIEWPRINTER_H
+#ifndef CTABLEVIEWPRINTER_H
 #define CTABLEVIEWPRINTER_H
 
 class QPointF;
diff --git a/product/src/gui/plugin/ISCSEventWidget/main.cpp b/product/src/gui/plugin/ISCSEventWidget/main.cpp
index e8d744d0..3fc3ad58 100644
--- a/product/src/gui/plugin/ISCSEventWidget/main.cpp
+++ b/product/src/gui/plugin/ISCSEventWidget/main.cpp
@@ -1,4 +1,4 @@
-#include <QApplication>
+#include <QApplication>
 //#include "CEventPlugin.h"
 #include "CEventForm.h"
 #include "pub_logger_api/logger.h"
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendModel.cpp b/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendModel.cpp
index b9606cee..caa22a5d 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendModel.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendModel.cpp
@@ -1,4 +1,4 @@
-#include "CCurveLegendModel.h"
+#include "CCurveLegendModel.h"
 #include "CTrendGraph.h"
 #include <QDoubleSpinBox>
 #include <QColorDialog>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendModel.h b/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendModel.h
index f55fa7d0..7615a031 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendModel.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendModel.h
@@ -1,4 +1,4 @@
-#ifndef CCURVELEGENDMODEL_H
+#ifndef CCURVELEGENDMODEL_H
 #define CCURVELEGENDMODEL_H
 
 #include <QLabel>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendView.cpp b/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendView.cpp
index 4df730f2..55885a8a 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendView.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendView.cpp
@@ -1,4 +1,4 @@
-#include "CCurveLegendView.h"
+#include "CCurveLegendView.h"
 #include "CCurveLegendModel.h"
 #include <QContextMenuEvent>
 #include <QMenu>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendView.h b/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendView.h
index b73453c2..73482602 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendView.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CCurveLegendView.h
@@ -1,4 +1,4 @@
-#ifndef CCURVELEGENDVIEW_H
+#ifndef CCURVELEGENDVIEW_H
 #define CCURVELEGENDVIEW_H
 
 #include <QTableView>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.cpp b/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.cpp
index b7e5834d..4c0984f5 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.cpp
@@ -1,4 +1,4 @@
-#include "CHisDataManage.h"
+#include "CHisDataManage.h"
 #include "db_his_query_api/DbHisQueryApi.h"
 #include "sample_server_api/SampleDefine.h"
 #include "CTrendInfoManage.h"
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.h b/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.h
index 3de350fd..8e9b4ef7 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.h
@@ -1,4 +1,4 @@
-#ifndef CHISDATAMANAGE_H
+#ifndef CHISDATAMANAGE_H
 #define CHISDATAMANAGE_H
 
 #include <QMutex>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.cpp b/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.cpp
index e5edba9f..3f79ef1b 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.cpp
@@ -1,4 +1,4 @@
-#include "CHisEventManage.h"
+#include "CHisEventManage.h"
 #include "service/alarm_server_api/AlarmCommonDef.h"
 
 CHisEventManage::CHisEventManage(QObject *parent)
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.h b/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.h
index 0672a92a..91fa60dd 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.h
@@ -1,4 +1,4 @@
-#ifndef CHISEVENTMANAGE_H
+#ifndef CHISEVENTMANAGE_H
 #define CHISEVENTMANAGE_H
 
 #include "db_api_ex/CDbApi.h"
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.cpp b/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.cpp
index 9d89e0a1..a76979dd 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.cpp
@@ -1,4 +1,4 @@
-#include "CPlotWidget.h"
+#include "CPlotWidget.h"
 #include "ui_CPlotWidget.h"
 #include "CCurveLegendModel.h"
 #include "CHisEventManage.h"
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.h b/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.h
index 041d1c08..e17ac478 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CPlotWidget.h
@@ -1,4 +1,4 @@
-#ifndef CPLOTWIDGET_H
+#ifndef CPLOTWIDGET_H
 #define CPLOTWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.cpp b/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.cpp
index b9ea6936..d958e89e 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.cpp
@@ -1,4 +1,4 @@
-#include "CRealTimeDataCollect.h"
+#include "CRealTimeDataCollect.h"
 #include "MessageChannel.h"
 #include "DataProcMessage.pb.h"
 #include "pub_logger_api/logger.h"
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.h b/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.h
index 5b0bdf82..40e55ab3 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CRealTimeDataCollect.h
@@ -1,4 +1,4 @@
-#ifndef CREALTIMEDATACOLLECT_H
+#ifndef CREALTIMEDATACOLLECT_H
 #define CREALTIMEDATACOLLECT_H
 
 #include <QThread>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.cpp
index 68b6bbac..cb61387b 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.cpp
@@ -1,4 +1,4 @@
-#include <QMessageBox>
+#include <QMessageBox>
 #include "CTrendEditDialog.h"
 #include "ui_CTrendEditDialog.h"
 #include "CTrendEditModel.h"
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.h b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.h
index 03c4f5ec..fdacb186 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditDialog.h
@@ -1,4 +1,4 @@
-#ifndef CTRENDEDITDIALOG_H
+#ifndef CTRENDEDITDIALOG_H
 #define CTRENDEDITDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditModel.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditModel.cpp
index 51147b41..c1d52353 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditModel.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditModel.cpp
@@ -1,4 +1,4 @@
-#include <QUuid>
+#include <QUuid>
 #include <QPainter>
 #include <QSpinBox>
 #include "CTrendGraph.h"
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditModel.h b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditModel.h
index 6b0ffd1b..43ec90fd 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditModel.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditModel.h
@@ -1,4 +1,4 @@
-#ifndef CTRENDEDITMODEL_H
+#ifndef CTRENDEDITMODEL_H
 #define CTRENDEDITMODEL_H
 
 /*****************************************
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditView.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditView.cpp
index bb823955..cff03830 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditView.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditView.cpp
@@ -1,4 +1,4 @@
-#include "CTrendEditView.h"
+#include "CTrendEditView.h"
 #include <QDragEnterEvent>
 #include <QDragMoveEvent>
 #include <QDropEvent>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditView.h b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditView.h
index 5245c626..834babf4 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendEditView.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendEditView.h
@@ -1,4 +1,4 @@
-#ifndef CTRENDEDITVIEW_H
+#ifndef CTRENDEDITVIEW_H
 #define CTRENDEDITVIEW_H
 
 #include <QTableView>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.cpp
index bddc2fd4..55ffd044 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.cpp
@@ -1,4 +1,4 @@
-#include "CTrendFavTreeWidget.h"
+#include "CTrendFavTreeWidget.h"
 #include "CTrendEditDialog.h"
 #include <QDir>
 #include <QMenu>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.h b/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.h
index a71cbf33..018874c8 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendFavTreeWidget.h
@@ -1,4 +1,4 @@
-#ifndef CTRENDFAVTREEWIDGET_H
+#ifndef CTRENDFAVTREEWIDGET_H
 #define CTRENDFAVTREEWIDGET_H
 
 #include <QTreeWidget>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendGraph.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendGraph.cpp
index d1fe4867..cd95c865 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendGraph.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendGraph.cpp
@@ -1,4 +1,4 @@
-#include "CTrendGraph.h"
+#include "CTrendGraph.h"
 #include <QDateTime>
 #include "plot/qcustomplot.h"
 
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendGraph.h b/product/src/gui/plugin/ISCSTrendCurves/CTrendGraph.h
index 629d8d2b..67219c3c 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendGraph.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendGraph.h
@@ -1,4 +1,4 @@
-#ifndef CTRENDGRAPH_H
+#ifndef CTRENDGRAPH_H
 #define CTRENDGRAPH_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.cpp
index 29d15acf..c526298c 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.cpp
@@ -1,4 +1,4 @@
-#include "CTrendInfoManage.h"
+#include "CTrendInfoManage.h"
 #include "service/perm_mng_api/PermMngApi.h"
 #include "public/pub_sysinfo_api/SysInfoApi.h"
 #include "pub_logger_api/logger.h"
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.h b/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.h
index afdbbcef..2bd0870f 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendInfoManage.h
@@ -1,4 +1,4 @@
-#ifndef CTRENDINFOMANAGE_H
+#ifndef CTRENDINFOMANAGE_H
 #define CTRENDINFOMANAGE_H
 
 #include <QMap>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendPluginWidget.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendPluginWidget.cpp
index b857fe30..e8b1fdd8 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendPluginWidget.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CTrendPluginWidget.h"
 #include "CTrendWindow.h"
 
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendPluginWidget.h b/product/src/gui/plugin/ISCSTrendCurves/CTrendPluginWidget.h
index 620317a8..06c92ce7 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendPluginWidget.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CTRENDPLUGINWIDGET_H
+#ifndef CTRENDPLUGINWIDGET_H
 #define CTRENDPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CTrendPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeItem.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeItem.cpp
index a4946827..0285a476 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeItem.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeItem.cpp
@@ -1,4 +1,4 @@
-#include <QStringList>
+#include <QStringList>
 #include "CTrendTreeItem.h"
 
 CTrendTreeItem::CTrendTreeItem(int type)
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeItem.h b/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeItem.h
index b172400a..2adc9aaa 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeItem.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeItem.h
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeModel.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeModel.cpp
index 4f478563..d3427a1d 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeModel.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeModel.cpp
@@ -1,4 +1,4 @@
-#include "CTrendTreeModel.h"
+#include "CTrendTreeModel.h"
 #include "CTrendInfoManage.h"
 #include <QTimer>
 
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeModel.h b/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeModel.h
index 6240ebe1..30c59a77 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeModel.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeModel.h
@@ -1,4 +1,4 @@
-#ifndef CTRENDTREEMODEL_H
+#ifndef CTRENDTREEMODEL_H
 #define CTRENDTREEMODEL_H
 
 #include <QTreeWidgetItem>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeView.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeView.cpp
index 73ed6ee8..f2db1a50 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeView.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendTreeView.cpp
@@ -1,4 +1,4 @@
-#include "CTrendTreeView.h"
+#include "CTrendTreeView.h"
 #include "CTrendTreeModel.h"
 #include <QMenu>
 #include <QMouseEvent>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.cpp b/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.cpp
index 2a9aa572..8c6dc6d4 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.cpp
@@ -1,4 +1,4 @@
-#include "CTrendWindow.h"
+#include "CTrendWindow.h"
 #include <QFile>
 #include <QTextStream>
 #include <QSplitter>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.h b/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.h
index 829daa0b..e0dcf1f3 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/CTrendWindow.h
@@ -1,4 +1,4 @@
-#ifndef CTRENDWINDOW_H
+#ifndef CTRENDWINDOW_H
 #define CTRENDWINDOW_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/main.cpp b/product/src/gui/plugin/ISCSTrendCurves/main.cpp
index f3ccb082..ee72bb87 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/main.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/main.cpp
@@ -1,4 +1,4 @@
-#include <QApplication>
+#include <QApplication>
 #include "CTrendWindow.h"
 #include "pub_logger_api/logger.h"
 #include "dp_chg_data_api/CDpcdaForApp.h"
diff --git a/product/src/gui/plugin/ISCSTrendCurves/plot/qcustomplot.cpp b/product/src/gui/plugin/ISCSTrendCurves/plot/qcustomplot.cpp
index fd0cd606..0466e130 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/plot/qcustomplot.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/plot/qcustomplot.cpp
@@ -1,4 +1,4 @@
-/***************************************************************************
+/***************************************************************************
 **                                                                        **
 **  QCustomPlot, an easy to use, modern plotting widget for Qt            **
 **  Copyright (C) 2011-2017 Emanuel Eichhammer                            **
diff --git a/product/src/gui/plugin/ISCSTrendCurves/plot/qcustomplot.h b/product/src/gui/plugin/ISCSTrendCurves/plot/qcustomplot.h
index 81a546a6..62228d59 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/plot/qcustomplot.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/plot/qcustomplot.h
@@ -1,4 +1,4 @@
-/***************************************************************************
+/***************************************************************************
 **                                                                        **
 **  QCustomPlot, an easy to use, modern plotting widget for Qt            **
 **  Copyright (C) 2011-2017 Emanuel Eichhammer                            **
diff --git a/product/src/gui/plugin/ISCSTrendCurves/widgets/CEditCollectWidget.cpp b/product/src/gui/plugin/ISCSTrendCurves/widgets/CEditCollectWidget.cpp
index fb0b9c4e..d0b93241 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/widgets/CEditCollectWidget.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/widgets/CEditCollectWidget.cpp
@@ -1,4 +1,4 @@
-#include "CEditCollectWidget.h"
+#include "CEditCollectWidget.h"
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QLabel>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/widgets/CEditCollectWidget.h b/product/src/gui/plugin/ISCSTrendCurves/widgets/CEditCollectWidget.h
index 97d8266d..a7902110 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/widgets/CEditCollectWidget.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/widgets/CEditCollectWidget.h
@@ -1,4 +1,4 @@
-#ifndef CEDITCOLLECTWIDGET_H
+#ifndef CEDITCOLLECTWIDGET_H
 #define CEDITCOLLECTWIDGET_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/widgets/CTabButton.cpp b/product/src/gui/plugin/ISCSTrendCurves/widgets/CTabButton.cpp
index abd2c898..f6e1e452 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/widgets/CTabButton.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/widgets/CTabButton.cpp
@@ -1,4 +1,4 @@
-#include "CTabButton.h"
+#include "CTabButton.h"
 #include <QPainter>
 #include "CCalendarWidget.h"
 
diff --git a/product/src/gui/plugin/ISCSTrendCurves/widgets/CTabButton.h b/product/src/gui/plugin/ISCSTrendCurves/widgets/CTabButton.h
index 56a7c409..f43a01ea 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/widgets/CTabButton.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/widgets/CTabButton.h
@@ -1,4 +1,4 @@
-#ifndef CTABBUTTON_H
+#ifndef CTABBUTTON_H
 #define CTABBUTTON_H
 
 #include <QPushButton>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/widgets/CToolTip.cpp b/product/src/gui/plugin/ISCSTrendCurves/widgets/CToolTip.cpp
index df30688a..3c972a98 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/widgets/CToolTip.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/widgets/CToolTip.cpp
@@ -1,4 +1,4 @@
-#include "CToolTip.h"
+#include "CToolTip.h"
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QEvent>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/widgets/CToolTip.h b/product/src/gui/plugin/ISCSTrendCurves/widgets/CToolTip.h
index 27affd5a..67d4d86a 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/widgets/CToolTip.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/widgets/CToolTip.h
@@ -1,4 +1,4 @@
-#ifndef CTOOLTIP_H
+#ifndef CTOOLTIP_H
 #define CTOOLTIP_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/widgets/CTrendAddWidget.cpp b/product/src/gui/plugin/ISCSTrendCurves/widgets/CTrendAddWidget.cpp
index e2a537aa..97deacd6 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/widgets/CTrendAddWidget.cpp
+++ b/product/src/gui/plugin/ISCSTrendCurves/widgets/CTrendAddWidget.cpp
@@ -1,4 +1,4 @@
-#include "CTrendAddWidget.h"
+#include "CTrendAddWidget.h"
 #include "CTrendInfoManage.h"
 #include <QGridLayout>
 #include <QComboBox>
diff --git a/product/src/gui/plugin/ISCSTrendCurves/widgets/CTrendAddWidget.h b/product/src/gui/plugin/ISCSTrendCurves/widgets/CTrendAddWidget.h
index 9ce2b4bc..15991042 100644
--- a/product/src/gui/plugin/ISCSTrendCurves/widgets/CTrendAddWidget.h
+++ b/product/src/gui/plugin/ISCSTrendCurves/widgets/CTrendAddWidget.h
@@ -1,4 +1,4 @@
-#ifndef CTRENDADDWIDGET_H
+#ifndef CTRENDADDWIDGET_H
 #define CTRENDADDWIDGET_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CHistoryActionModel.cpp b/product/src/gui/plugin/LinkCtrlWidget/CHistoryActionModel.cpp
index 5f95d077..5e68c068 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CHistoryActionModel.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CHistoryActionModel.cpp
@@ -1,4 +1,4 @@
-#include "CHistoryActionModel.h"
+#include "CHistoryActionModel.h"
 
 CHistoryActionTreeModelItem::CHistoryActionTreeModelItem(CHistoryActionTreeModelItem *parent)
     : m_parent(parent)
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CHistoryActionModel.h b/product/src/gui/plugin/LinkCtrlWidget/CHistoryActionModel.h
index 0b22080d..28faa14e 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CHistoryActionModel.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CHistoryActionModel.h
@@ -1,4 +1,4 @@
-#ifndef CHISTORYACTIONMODEL_H
+#ifndef CHISTORYACTIONMODEL_H
 #define CHISTORYACTIONMODEL_H
 
 #include <QAbstractItemModel>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkFilterDialog.cpp b/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkFilterDialog.cpp
index 320d6c2b..426cfe63 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkFilterDialog.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkFilterDialog.cpp
@@ -1,4 +1,4 @@
-#include "CHistoryLinkFilterDialog.h"
+#include "CHistoryLinkFilterDialog.h"
 #include "ui_CHistoryLinkFilterDialog.h"
 
 CHistoryLinkFilterDialog::CHistoryLinkFilterDialog(QStringList locationList, QStringList userNameList, QWidget *parent) :
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkFilterDialog.h b/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkFilterDialog.h
index 9e7d3885..2f032a59 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkFilterDialog.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkFilterDialog.h
@@ -1,4 +1,4 @@
-#ifndef CHISTORYLINKFILTERDIALOG_H
+#ifndef CHISTORYLINKFILTERDIALOG_H
 #define CHISTORYLINKFILTERDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkModel.h b/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkModel.h
index 4d5f6f02..b9089a08 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkModel.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CHistoryLinkModel.h
@@ -1,4 +1,4 @@
-#ifndef CHISTORYLINKMODEL_H
+#ifndef CHISTORYLINKMODEL_H
 #define CHISTORYLINKMODEL_H
 
 #include <QAbstractItemModel>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CHistroyLinkModel.cpp b/product/src/gui/plugin/LinkCtrlWidget/CHistroyLinkModel.cpp
index e7e3bb1a..fce3de3b 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CHistroyLinkModel.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CHistroyLinkModel.cpp
@@ -1,4 +1,4 @@
-#include "CHistoryLinkModel.h"
+#include "CHistoryLinkModel.h"
 #include <QDateTime>
 
 CHistoryLinkModel::CHistoryLinkModel(QObject *parent)
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.cpp
index 59b82f1c..929018a1 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.cpp
@@ -1,4 +1,4 @@
-#include "CLinkCtrlDataManage.h"
+#include "CLinkCtrlDataManage.h"
 #include "linkctrl_def.h"
 #include "CLinkCtrlMessageHandle.h"
 #include "perm_mng_api/PermMngApi.h"
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.h
index cda77515..ecafcc3b 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlDataManage.h
@@ -1,4 +1,4 @@
-#ifndef CLINKCTRLDATAMANAGE_H
+#ifndef CLINKCTRLDATAMANAGE_H
 #define CLINKCTRLDATAMANAGE_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.cpp
index 5ab9983a..5eb5977f 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.cpp
@@ -1,4 +1,4 @@
-#include "CLinkCtrlMessageHandle.h"
+#include "CLinkCtrlMessageHandle.h"
 #include "CLinkCtrlDataManage.h"
 
 CLinkCtrlMessageHandle::CLinkCtrlMessageHandle(CLinkCtrlDataManage * linkCtrlDataManage)
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h
index 875b204e..77f70182 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlMessageHandle.h
@@ -1,4 +1,4 @@
-#ifndef CLINKCTRLMESSAGEHANDLE_H
+#ifndef CLINKCTRLMESSAGEHANDLE_H
 #define CLINKCTRLMESSAGEHANDLE_H
 
 #include "application/linkage_server_api/CLinkageForHmiApi.h"
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlPluginWidget.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlPluginWidget.cpp
index b714bb0e..80142139 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlPluginWidget.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CLinkCtrlPluginWidget.h"
 #include "CLinkCtrlWidget.h"
 
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlPluginWidget.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlPluginWidget.h
index bb1d1412..e52cffae 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlPluginWidget.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CLINKCTRLPLUGINWIDGET_H
+#ifndef CLINKCTRLPLUGINWIDGET_H
 #define CLINKCTRLPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CLinkCtrlPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.cpp
index a5bf7493..fc89da46 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.cpp
@@ -1,4 +1,4 @@
-#include "CLinkCtrlStateManage.h"
+#include "CLinkCtrlStateManage.h"
 #include "linkctrl_def.h"
 #include "CLinkCtrlMessageHandle.h"
 #include "public/pub_sysinfo_api/SysInfoApi.h"
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.h
index dd87dd03..74b70381 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlStateManage.h
@@ -1,4 +1,4 @@
-#ifndef CLINKSTATESTATEMANAGE_H
+#ifndef CLINKSTATESTATEMANAGE_H
 #define CLINKSTATESTATEMANAGE_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTableModel.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTableModel.cpp
index 4ee79fc3..5f263fa6 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTableModel.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTableModel.cpp
@@ -1,4 +1,4 @@
-#include "CLinkCtrlTableModel.h"
+#include "CLinkCtrlTableModel.h"
 #include "QDateTime"
 
 CLinkCtrlTableModel::CLinkCtrlTableModel(QObject *parent)
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTableModel.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTableModel.h
index 51f62c70..6609b709 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTableModel.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTableModel.h
@@ -1,4 +1,4 @@
-#ifndef CLINKCTRLTABLEMODEL_H
+#ifndef CLINKCTRLTABLEMODEL_H
 #define CLINKCTRLTABLEMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeModel.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeModel.cpp
index a887d4ed..15d73b31 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeModel.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeModel.cpp
@@ -1,4 +1,4 @@
-#include "CLinkCtrlTreeModel.h"
+#include "CLinkCtrlTreeModel.h"
 
 CLinkCtrlTreeModelItem::CLinkCtrlTreeModelItem(CLinkCtrlTreeModelItem *parent)
     : m_parent(parent),
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeModel.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeModel.h
index 9dbbad71..7b91cc39 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeModel.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeModel.h
@@ -1,4 +1,4 @@
-#ifndef CLINKCTRLTREEMODEL_H
+#ifndef CLINKCTRLTREEMODEL_H
 #define CLINKCTRLTREEMODEL_H
 
 #include <QAbstractItemModel>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeView.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeView.cpp
index 3624cacc..b84fa86b 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeView.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeView.cpp
@@ -1,4 +1,4 @@
-#include "CLinkCtrlTreeView.h"
+#include "CLinkCtrlTreeView.h"
 #include <QMouseEvent>
 
 CLinkCtrlTreeView::CLinkCtrlTreeView(QWidget *parent)
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeView.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeView.h
index 8aa0787c..4fec2ab9 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeView.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlTreeView.h
@@ -1,4 +1,4 @@
-#ifndef CLINKCTRLTREEVIEW_H
+#ifndef CLINKCTRLTREEVIEW_H
 #define CLINKCTRLTREEVIEW_H
 
 #include <QTreeView>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp
index 363bf116..2f53e537 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.cpp
@@ -1,4 +1,4 @@
-#include "CLinkCtrlWidget.h"
+#include "CLinkCtrlWidget.h"
 #include "ui_CLinkCtrlWidget.h"
 #include "CLinkCtrlDataManage.h"
 #include "CLinkCtrlStateManage.h"
@@ -18,7 +18,19 @@
 #include "pub_utility_api/FileUtil.h"
 #include "pub_utility_api/CommonConfigParse.h"
 #include "pub_utility_api/FileStyle.h"
+
+//< 屏蔽xml_parser编译告警
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-copy"
+#endif
+
 #include "boost/property_tree/xml_parser.hpp"
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #include "boost/typeof/typeof.hpp"
 #include "boost/filesystem.hpp"
 #include <boost/algorithm/string/classification.hpp>
@@ -161,7 +173,7 @@ void CLinkCtrlWidget::initialize()
     ui->actionTreeView->setHeaderHidden(false);
 
     //2020-6-15 modifi linkage type by read configuretion file
-    if(readLinkTypeDescXml()==kbdSuccess)
+    if(readLinkTypeDescXml()==iotSuccess)
     {
         QStringList linkTypeList;
         for(int index=0;index < (int)m_linkTypeStr.size(); index++)
@@ -999,10 +1011,10 @@ int CLinkCtrlWidget::readLinkTypeDescXml()
 
     //< 读取LINKAGE_SETTING配置文件，获取联动类型
     std::string path = iot_public::CFileUtil::getPathOfResFile("model_studio/setting/table/LINKAGE_SETTING.xml");
-    if(readXml(path,linkTypeStr)==kbdFailed)
+    if(readXml(path,linkTypeStr)==iotFailed)
     {
         LOGERROR("readLinkTypeDescXml load [zh] LINKAGE_SETTING.xml error");
-        return kbdFailed;
+        return iotFailed;
     }
 
     std::vector<std::string> destination;
@@ -1016,7 +1028,7 @@ int CLinkCtrlWidget::readLinkTypeDescXml()
         m_linkTypeStr.insert(std::pair<std::string, std::string>(destination2.at(0), destination2.at(1)));
 
     }
-    return kbdSuccess;
+    return iotSuccess;
 }
 
 int CLinkCtrlWidget::readXml(std::string fileName,std::string &strValue)
@@ -1052,15 +1064,15 @@ int CLinkCtrlWidget::readXml(std::string fileName,std::string &strValue)
     catch (std::exception &ex)
     {
         LOGERROR("解析配置文件[%s]失败.Msg = [%s]", fileName.c_str(),ex.what());
-        return kbdFailed;
+        return iotFailed;
     }
 
     if(strValue == "LINK_TYPE")
     {
         LOGERROR("获取联动类型值失败！");
-        return kbdFailed;
+        return iotFailed;
     }
-    return kbdSuccess;
+    return iotSuccess;
 }
 
 void CLinkCtrlWidget::filterHistoryLink()
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.h
index 1f6463a9..d4b6213e 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkCtrlWidget.h
@@ -1,4 +1,4 @@
-#ifndef CLINKCTRLWIDGET_H
+#ifndef CLINKCTRLWIDGET_H
 #define CLINKCTRLWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.cpp
index 3eb8490f..92d51ef6 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.cpp
@@ -1,4 +1,4 @@
-#include "CLinkDBInterface.h"
+#include "CLinkDBInterface.h"
 #include "public/pub_sysinfo_api/SysInfoApi.h"
 #include "../../idl_files/LinkageMessage.pb.h"
 #include "../../idl_files/RdbServerMessage.pb.h"
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.h
index d47d7033..ec8b075c 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkDBInterface.h
@@ -1,4 +1,4 @@
-#ifndef CLINKDBINTERFACE_H
+#ifndef CLINKDBINTERFACE_H
 #define CLINKDBINTERFACE_H
 
 #include "link_history_def.h"
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApi.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApi.cpp
index 8c0a7ac7..037749c6 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApi.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApi.cpp
@@ -1,4 +1,4 @@
-#include "application/linkage_server_api/CLinkageForHmiApi.h"
+#include "application/linkage_server_api/CLinkageForHmiApi.h"
 #include "CLinkageForHmiApiImpl.h"
 
 using namespace iot_app;
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp
index 1fb4ddcb..b0fcf1ed 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.cpp
@@ -1,4 +1,4 @@
-#include "public/pub_logger_api/logger.h"
+#include "public/pub_logger_api/logger.h"
 #include "MessageChannel.h"
 #include "Common.h"
 
@@ -87,8 +87,7 @@ bool CLinkageForHmiApiImpl::recvMsgLink(
         case enumStatusMessage:
         {
             StatusChangeMessage dataMsg;
-            if (!dataMsg.ParseFromArray(msg.getDataPtr(),
-                msg.getDataSize()))
+            if (!dataMsg.ParseFromArray(msg.getDataPtr(),static_cast<int>(msg.getDataSize()) ))
             {
                 BOOST_ASSERT(false);
                 return false;
@@ -99,8 +98,7 @@ bool CLinkageForHmiApiImpl::recvMsgLink(
         case enumLinkStartRequestMessage:
         {
             LinkStartRequestMessage dataMsg;
-            if (!dataMsg.ParseFromArray(msg.getDataPtr(),
-                msg.getDataSize()))
+            if (!dataMsg.ParseFromArray(msg.getDataPtr(),static_cast<int>(msg.getDataSize()) ))
             {
                 BOOST_ASSERT(false);
             }
@@ -110,8 +108,7 @@ bool CLinkageForHmiApiImpl::recvMsgLink(
         case enumLinkOperateMessageAck:
         {
             LinkOperateMessageAck dataMsg;
-            if (!dataMsg.ParseFromArray(msg.getDataPtr(),
-                msg.getDataSize()))
+            if (!dataMsg.ParseFromArray(msg.getDataPtr(),static_cast<int>(msg.getDataSize()) ))
             {
                 BOOST_ASSERT(false);
             }
@@ -121,8 +118,7 @@ bool CLinkageForHmiApiImpl::recvMsgLink(
         case enumUiRequestMessage:
         {
             UiRequestMessage dataMsg;
-            if (!dataMsg.ParseFromArray(msg.getDataPtr(),
-                msg.getDataSize()))
+            if (!dataMsg.ParseFromArray(msg.getDataPtr(),static_cast<int>(msg.getDataSize()) ))
             {
                 BOOST_ASSERT(false);
             }
diff --git a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h
index e1b2f567..9e7d37c1 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/CLinkageForHmiApiImpl.h
@@ -1,4 +1,4 @@
-#ifndef CLINKAGEFORHMIAPIIMPL_H
+#ifndef CLINKAGEFORHMIAPIIMPL_H
 #define CLINKAGEFORHMIAPIIMPL_H
 
 #include <string>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/link_history_def.h b/product/src/gui/plugin/LinkCtrlWidget/link_history_def.h
index bbf0f4da..9c47afed 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/link_history_def.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/link_history_def.h
@@ -1,4 +1,4 @@
-#ifndef LINK_HISTORY_DEF_H
+#ifndef LINK_HISTORY_DEF_H
 #define LINK_HISTORY_DEF_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/linkctrl_def.h b/product/src/gui/plugin/LinkCtrlWidget/linkctrl_def.h
index 1cd99b84..4ce99656 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/linkctrl_def.h
+++ b/product/src/gui/plugin/LinkCtrlWidget/linkctrl_def.h
@@ -1,4 +1,4 @@
-#ifndef LINKCTRL_DEF_H
+#ifndef LINKCTRL_DEF_H
 #define LINKCTRL_DEF_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/LinkCtrlWidget/main.cpp b/product/src/gui/plugin/LinkCtrlWidget/main.cpp
index 408b78d9..56c725fe 100644
--- a/product/src/gui/plugin/LinkCtrlWidget/main.cpp
+++ b/product/src/gui/plugin/LinkCtrlWidget/main.cpp
@@ -1,4 +1,4 @@
-#include "CLinkCtrlWidget.h"
+#include "CLinkCtrlWidget.h"
 #include <QApplication>
 #include "pub_logger_api/logger.h"
 #include "net_msg_bus_api/MsgBusApi.h"
diff --git a/product/src/gui/plugin/NavigationWidget/CColorLabel.cpp b/product/src/gui/plugin/NavigationWidget/CColorLabel.cpp
index 2033d81c..392f0a14 100644
--- a/product/src/gui/plugin/NavigationWidget/CColorLabel.cpp
+++ b/product/src/gui/plugin/NavigationWidget/CColorLabel.cpp
@@ -1,4 +1,4 @@
-#include <QPainter>
+#include <QPainter>
 #include <QPaintEvent>
 #include <QMouseEvent>
 #include <QColorDialog>
diff --git a/product/src/gui/plugin/NavigationWidget/CColorLabel.h b/product/src/gui/plugin/NavigationWidget/CColorLabel.h
index 7fdbb60c..ccbb92e3 100644
--- a/product/src/gui/plugin/NavigationWidget/CColorLabel.h
+++ b/product/src/gui/plugin/NavigationWidget/CColorLabel.h
@@ -1,4 +1,4 @@
-#ifndef CCOLORLABEL_H
+#ifndef CCOLORLABEL_H
 #define CCOLORLABEL_H
 
 #include <QLabel>
diff --git a/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.cpp b/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.cpp
index c0b2d9ee..e5f157cb 100644
--- a/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.cpp
+++ b/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.cpp
@@ -1,4 +1,4 @@
-#include <QFileDialog>
+#include <QFileDialog>
 #include "CNavigationConfigDialog.h"
 #include "CNavigationWidget.h"
 #include "CColorLabel.h"
diff --git a/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.h b/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.h
index d66854b4..17835a6e 100644
--- a/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.h
+++ b/product/src/gui/plugin/NavigationWidget/CNavigationConfigDialog.h
@@ -1,4 +1,4 @@
-#ifndef CNAVIGATIONCONFIGDIALOG_H
+#ifndef CNAVIGATIONCONFIGDIALOG_H
 #define CNAVIGATIONCONFIGDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/NavigationWidget/CNavigationDelegate.cpp b/product/src/gui/plugin/NavigationWidget/CNavigationDelegate.cpp
index efe75312..2042349e 100644
--- a/product/src/gui/plugin/NavigationWidget/CNavigationDelegate.cpp
+++ b/product/src/gui/plugin/NavigationWidget/CNavigationDelegate.cpp
@@ -1,4 +1,4 @@
-#include "CNavigationDelegate.h"
+#include "CNavigationDelegate.h"
 #include "CNavigationWidget.h"
 #include <QApplication>
 #include <QToolTip>
@@ -202,6 +202,10 @@ void CNavigationDelegate::drawItem(QPainter *painter, const QStyleOptionViewItem
     rt.adjust(delta, 0, 0, 0);
     painter->setPen(std::move(pen));
     QFont font = option.font;
+    if (option.state & QStyle::State_Selected)
+    {
+        font.setBold(true);
+    }
     font.setPixelSize(std::get<2>(m_pItemProxy->vecItemStyle[level]));
     painter->setFont(std::move(font));
     painter->drawText(rt, index.data().toString(), textOpiton);
diff --git a/product/src/gui/plugin/NavigationWidget/CNavigationDelegate.h b/product/src/gui/plugin/NavigationWidget/CNavigationDelegate.h
index 1007cecd..c2205519 100644
--- a/product/src/gui/plugin/NavigationWidget/CNavigationDelegate.h
+++ b/product/src/gui/plugin/NavigationWidget/CNavigationDelegate.h
@@ -1,4 +1,4 @@
-#ifndef CNAVIGATIONDELEGATE_H
+#ifndef CNAVIGATIONDELEGATE_H
 #define CNAVIGATIONDELEGATE_H
 
 #include <QStyledItemDelegate>
diff --git a/product/src/gui/plugin/NavigationWidget/CNavigationPluginWidget.cpp b/product/src/gui/plugin/NavigationWidget/CNavigationPluginWidget.cpp
index b40bcc39..da8658a6 100644
--- a/product/src/gui/plugin/NavigationWidget/CNavigationPluginWidget.cpp
+++ b/product/src/gui/plugin/NavigationWidget/CNavigationPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CNavigationPluginWidget.h"
 #include "CNavigationWidget.h"
 
diff --git a/product/src/gui/plugin/NavigationWidget/CNavigationPluginWidget.h b/product/src/gui/plugin/NavigationWidget/CNavigationPluginWidget.h
index afb1b2ec..bb43c2b3 100644
--- a/product/src/gui/plugin/NavigationWidget/CNavigationPluginWidget.h
+++ b/product/src/gui/plugin/NavigationWidget/CNavigationPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CNAVIGATIONPLUGINWIDGET_H
+#ifndef CNAVIGATIONPLUGINWIDGET_H
 #define CNAVIGATIONPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CNavigationPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/NavigationWidget/CNavigationWidget.cpp b/product/src/gui/plugin/NavigationWidget/CNavigationWidget.cpp
index e0ef0455..80afa9d8 100644
--- a/product/src/gui/plugin/NavigationWidget/CNavigationWidget.cpp
+++ b/product/src/gui/plugin/NavigationWidget/CNavigationWidget.cpp
@@ -1,4 +1,4 @@
-#include <QDir>
+#include <QDir>
 #include <QFile>
 #include <QMenu>
 #include <QDebug>
@@ -51,7 +51,7 @@ CNavigationWidget::~CNavigationWidget()
 
 void CNavigationWidget::initialize()
 {
-    setStyleSheet("background-color:transparent;QLineEdit:edit-focus{background-color:white}");
+    //setStyleSheet("background-color:transparent;QLineEdit:edit-focus{background-color:white}");
     setMouseTracking(true);
     setRootIsDecorated(false);
     header()->setVisible(false);
@@ -70,12 +70,20 @@ void CNavigationWidget::initialize()
 
     QString strItemConfigFile = m_strFileHomePath + QString("model%1NavigationWidget.json").arg(QDir::separator());
     read(strItemConfigFile);
+    initStyleSheet();
     if(EDIT_MODE != m_navigationMode)
     {
         expandAll();
     }
 }
 
+void CNavigationWidget::initStyleSheet()
+{
+   QString br=QString("background: #%1;").arg(QString::number(m_pItemProxy->backgroundColor, 16).toUpper());
+   QString qss=QString("CNavigationWidget {%1}").arg(br);;
+   setStyleSheet(qss);
+}
+
 void CNavigationWidget::setNavigationMode(const CNavigationWidget::Navigation_Mode &navigationMode)
 {
     m_navigationMode = navigationMode;
@@ -161,8 +169,8 @@ void CNavigationWidget::setItemSelected(const QString &data)
 
 void CNavigationWidget::paintEvent(QPaintEvent *event)
 {
-    QPainter painter(viewport());
-    painter.fillRect(viewport()->rect(), m_pItemProxy->backgroundColor);
+    //QPainter painter(viewport());
+    //painter.fillRect(viewport()->rect(), QColor::fromRgba(m_pItemProxy->backgroundColor).rgba());
     QTreeView::paintEvent(event);
 }
 
@@ -746,7 +754,7 @@ void CNavigationWidget::drawRow(QPainter *painter, const QStyleOptionViewItem &o
     }
 }
 
-void CNavigationWidget::setTreeBackgroundColor(const rgb &color)
+void CNavigationWidget::setTreeBackgroundColor(const rgba &color)
 {
     if(m_pItemProxy)
     {
@@ -754,7 +762,7 @@ void CNavigationWidget::setTreeBackgroundColor(const rgb &color)
     }
 }
 
-void CNavigationWidget::setItemHoverBackgroundColor(const rgb &color)
+void CNavigationWidget::setItemHoverBackgroundColor(const rgba &color)
 {
     if(m_pItemProxy)
     {
@@ -762,7 +770,7 @@ void CNavigationWidget::setItemHoverBackgroundColor(const rgb &color)
     }
 }
 
-void CNavigationWidget::setItemSelectedBackgroundColor(const rgb &color)
+void CNavigationWidget::setItemSelectedBackgroundColor(const rgba &color)
 {
     if(m_pItemProxy)
     {
@@ -770,7 +778,7 @@ void CNavigationWidget::setItemSelectedBackgroundColor(const rgb &color)
     }
 }
 
-void CNavigationWidget::setTextColor(const rgb &color)
+void CNavigationWidget::setTextColor(const rgba &color)
 {
     if(m_pItemProxy)
     {
@@ -778,7 +786,7 @@ void CNavigationWidget::setTextColor(const rgb &color)
     }
 }
 
-void CNavigationWidget::setTextHoverColor(const rgb &color)
+void CNavigationWidget::setTextHoverColor(const rgba &color)
 {
     if(m_pItemProxy)
     {
@@ -786,7 +794,7 @@ void CNavigationWidget::setTextHoverColor(const rgb &color)
     }
 }
 
-void CNavigationWidget::setTextSelectedColor(const rgb &color)
+void CNavigationWidget::setTextSelectedColor(const rgba &color)
 {
     if(m_pItemProxy)
     {
@@ -794,7 +802,7 @@ void CNavigationWidget::setTextSelectedColor(const rgb &color)
     }
 }
 
-void CNavigationWidget::setItemBackgroundColor(const rgb &color, const Node_Level &level)
+void CNavigationWidget::setItemBackgroundColor(const rgba &color, const Node_Level &level)
 {
     if(m_pItemProxy)
     {
@@ -835,33 +843,33 @@ void CNavigationWidget::read(const QString &strFileName)
     if(root.contains("configure"))
     {
         QJsonObject configObject = root.value("configure").toObject();
-        m_pItemProxy->backgroundColor = QColor(configObject["backgroundColor"].toString()).rgb();
+        m_pItemProxy->backgroundColor = QColor(configObject["backgroundColor"].toString()).rgba();
         m_pItemProxy->indicatorWidth = configObject["indicatorWidth"].toInt();
         m_pItemProxy->iconMargin = configObject["iconMargin"].toInt();
         m_pItemDelegate->m_rowHeight = configObject["rowHeight"].toInt();
 
-        std::get<0>(m_pItemProxy->vecItemStyle[TOP_LEVEL]) = QColor(configObject["levelTopItemBgColor"].toString()).rgb();
-        std::get<1>(m_pItemProxy->vecItemStyle[TOP_LEVEL]) = QColor(configObject["levelTopItemTextColor"].toString()).rgb();
+        std::get<0>(m_pItemProxy->vecItemStyle[TOP_LEVEL]) = QColor(configObject["levelTopItemBgColor"].toString()).rgba();
+        std::get<1>(m_pItemProxy->vecItemStyle[TOP_LEVEL]) = QColor(configObject["levelTopItemTextColor"].toString()).rgba();
         std::get<2>(m_pItemProxy->vecItemStyle[TOP_LEVEL]) = configObject["levelTopItemTextSize"].toInt();
         std::get<3>(m_pItemProxy->vecItemStyle[TOP_LEVEL]) = configObject["levelTopItemIconSize"].toInt();
         std::get<4>(m_pItemProxy->vecItemStyle[TOP_LEVEL]) = configObject["levelTopItemIndentation"].toInt();
 
-        std::get<0>(m_pItemProxy->vecItemStyle[CHILD_LEVEL]) = QColor(configObject["levelChildItemBgColor"].toString()).rgb();
-        std::get<1>(m_pItemProxy->vecItemStyle[CHILD_LEVEL]) = QColor(configObject["levelChildItemTextColor"].toString()).rgb();
+        std::get<0>(m_pItemProxy->vecItemStyle[CHILD_LEVEL]) = QColor(configObject["levelChildItemBgColor"].toString()).rgba();
+        std::get<1>(m_pItemProxy->vecItemStyle[CHILD_LEVEL]) = QColor(configObject["levelChildItemTextColor"].toString()).rgba();
         std::get<2>(m_pItemProxy->vecItemStyle[CHILD_LEVEL]) = configObject["levelChildItemTextSize"].toInt();
         std::get<3>(m_pItemProxy->vecItemStyle[CHILD_LEVEL]) = configObject["levelChildItemIconSize"].toInt();
         std::get<4>(m_pItemProxy->vecItemStyle[CHILD_LEVEL]) = configObject["levelChildItemIndentation"].toInt();
 
-        std::get<0>(m_pItemProxy->vecItemStyle[LEAF_LEVEL]) = QColor(configObject["levelLeafItemBgColor"].toString()).rgb();
-        std::get<1>(m_pItemProxy->vecItemStyle[LEAF_LEVEL]) = QColor(configObject["levelLeafItemTextColor"].toString()).rgb();
+        std::get<0>(m_pItemProxy->vecItemStyle[LEAF_LEVEL]) = QColor(configObject["levelLeafItemBgColor"].toString()).rgba();
+        std::get<1>(m_pItemProxy->vecItemStyle[LEAF_LEVEL]) = QColor(configObject["levelLeafItemTextColor"].toString()).rgba();
         std::get<2>(m_pItemProxy->vecItemStyle[LEAF_LEVEL]) = configObject["levelLeafItemTextSize"].toInt();
         std::get<3>(m_pItemProxy->vecItemStyle[LEAF_LEVEL]) = configObject["levelLeafItemIconSize"].toInt();
         std::get<4>(m_pItemProxy->vecItemStyle[LEAF_LEVEL]) = configObject["levelLeafItemIndentation"].toInt();
 
-        m_pItemProxy->itemHoveredColor = QColor(configObject["itemHoveredBgColor"].toString()).rgb();
-        m_pItemProxy->itemSelectedColor = QColor(configObject["itemSelectedColor"].toString()).rgb();
-        m_pItemProxy->itemHoveredTextColor = QColor(configObject["itemHoveredTextColor"].toString()).rgb();
-        m_pItemProxy->itemSelectedTextColor = QColor(configObject["itemSelectedTextColor"].toString()).rgb();
+        m_pItemProxy->itemHoveredColor = QColor(configObject["itemHoveredBgColor"].toString()).rgba();
+        m_pItemProxy->itemSelectedColor = QColor(configObject["itemSelectedColor"].toString()).rgba();
+        m_pItemProxy->itemHoveredTextColor = QColor(configObject["itemHoveredTextColor"].toString()).rgba();
+        m_pItemProxy->itemSelectedTextColor = QColor(configObject["itemSelectedTextColor"].toString()).rgba();
     }
 
     if(root.contains("items"))
diff --git a/product/src/gui/plugin/NavigationWidget/CNavigationWidget.h b/product/src/gui/plugin/NavigationWidget/CNavigationWidget.h
index 59d22194..4f008452 100644
--- a/product/src/gui/plugin/NavigationWidget/CNavigationWidget.h
+++ b/product/src/gui/plugin/NavigationWidget/CNavigationWidget.h
@@ -1,4 +1,4 @@
-#ifndef CNAVIGATIONWIDGET_H
+#ifndef CNAVIGATIONWIDGET_H
 #define CNAVIGATIONWIDGET_H
 
 #include <QTreeWidget>
@@ -7,9 +7,9 @@
 
 class CNavigationDelegate;
 
-typedef unsigned int rgb;
+typedef unsigned int rgba;
 
-typedef std::tuple<rgb, int, int, int, int> NodeInfo; //< 节点背景颜色、节点字体颜色、节点字体大小、图标大小、偏移像素
+typedef std::tuple<rgba, int, int, int, int> NodeInfo; //< 节点背景颜色、节点字体颜色、节点字体大小、图标大小、偏移像素
 
 extern const int Level_Role;        //< 节点层级
 extern const int Corner_Role;       //< 活动根节点
@@ -26,14 +26,14 @@ struct ITEM_STYLE_PROXY
     int iconMargin;
 
     //< 填充颜色
-    rgb backgroundColor;
-    rgb itemHoveredColor;
-    rgb itemSelectedColor;
+    rgba backgroundColor;
+    rgba itemHoveredColor;
+    rgba itemSelectedColor;
 
     //< 文字颜色
-    rgb itemTextColor;
-    rgb itemHoveredTextColor;
-    rgb itemSelectedTextColor;
+    rgba itemTextColor;
+    rgba itemHoveredTextColor;
+    rgba itemSelectedTextColor;
 
     std::vector< NodeInfo > vecItemStyle;
 };
@@ -120,15 +120,15 @@ public Q_SLOTS:
     void getNodeTypeMap(QMap<int, QString> &map);
 
     /******************** 样式设置-[begin] ************************/
-    void setTreeBackgroundColor(const rgb &color);
-    void setItemHoverBackgroundColor(const rgb &color);
-    void setItemSelectedBackgroundColor(const rgb &color);
+    void setTreeBackgroundColor(const rgba &color);
+    void setItemHoverBackgroundColor(const rgba &color);
+    void setItemSelectedBackgroundColor(const rgba &color);
 
-    void setTextColor(const rgb &color);
-    void setTextHoverColor(const rgb &color);
-    void setTextSelectedColor(const rgb &color);
+    void setTextColor(const rgba &color);
+    void setTextHoverColor(const rgba &color);
+    void setTextSelectedColor(const rgba &color);
 
-    void setItemBackgroundColor(const rgb &color, const Node_Level &level);
+    void setItemBackgroundColor(const rgba &color, const Node_Level &level);
     void setItemTextSize(const int &size, const Node_Level &level);
     /******************** 样式设置-[end] *************************/
 
@@ -141,6 +141,7 @@ Q_SIGNALS:
 private:
     void initialize();
 
+    void initStyleSheet();
     void loadItemDelegate();
 
     void updateItems(const CNavigationWidget * pNavigation);
diff --git a/product/src/gui/plugin/NavigationWidget/NavigationConfigDialog.ui b/product/src/gui/plugin/NavigationWidget/NavigationConfigDialog.ui
index aca5d2e4..956c1094 100644
--- a/product/src/gui/plugin/NavigationWidget/NavigationConfigDialog.ui
+++ b/product/src/gui/plugin/NavigationWidget/NavigationConfigDialog.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>NavigationConfigDialog</class>
  <widget class="QDialog" name="NavigationConfigDialog">
diff --git a/product/src/gui/plugin/PointsLockWidget/CConditionModel.cpp b/product/src/gui/plugin/PointsLockWidget/CConditionModel.cpp
index 8ccb7acc..ace3390b 100644
--- a/product/src/gui/plugin/PointsLockWidget/CConditionModel.cpp
+++ b/product/src/gui/plugin/PointsLockWidget/CConditionModel.cpp
@@ -1,4 +1,4 @@
-#include "CConditionModel.h"
+#include "CConditionModel.h"
 #include "CDbInterfaceMng.h"
 
 CConditionModel::CConditionModel(QObject *parent)
diff --git a/product/src/gui/plugin/PointsLockWidget/CConditionModel.h b/product/src/gui/plugin/PointsLockWidget/CConditionModel.h
index 047b4623..dd402294 100644
--- a/product/src/gui/plugin/PointsLockWidget/CConditionModel.h
+++ b/product/src/gui/plugin/PointsLockWidget/CConditionModel.h
@@ -1,4 +1,4 @@
-#ifndef CCONDITIONMODEL_H
+#ifndef CCONDITIONMODEL_H
 #define CCONDITIONMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.cpp b/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.cpp
index 7732c739..2b09cf5b 100644
--- a/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.cpp
+++ b/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.cpp
@@ -1,4 +1,4 @@
-#include "CConditionOptDialog.h"
+#include "CConditionOptDialog.h"
 #include "ui_CConditionOptDialog.h"
 #include "PointsLockCommon.h"
 #include "CDbInterfaceMng.h"
@@ -169,7 +169,7 @@ void CConditionOptDialog::okClicked()
         info->value1 = ui->dValue1->value();
         info->value2 = ui->dValue2->value();
     }
-    if(CDbInterfaceMng::instance()->addConditionLock(m_info,info) == kbdSuccess)
+    if(CDbInterfaceMng::instance()->addConditionLock(m_info,info) == iotSuccess)
     {
         accept();
     }else
diff --git a/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.h b/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.h
index 758a16f9..ab05e0b9 100644
--- a/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.h
+++ b/product/src/gui/plugin/PointsLockWidget/CConditionOptDialog.h
@@ -1,4 +1,4 @@
-#ifndef CCONDITIONOPTDIALOG_H
+#ifndef CCONDITIONOPTDIALOG_H
 #define CCONDITIONOPTDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/PointsLockWidget/CConditionView.cpp b/product/src/gui/plugin/PointsLockWidget/CConditionView.cpp
index d4f0d99b..e99d94f9 100644
--- a/product/src/gui/plugin/PointsLockWidget/CConditionView.cpp
+++ b/product/src/gui/plugin/PointsLockWidget/CConditionView.cpp
@@ -1,4 +1,4 @@
-#include "CConditionView.h"
+#include "CConditionView.h"
 #include <QHeaderView>
 #include <QScrollBar>
 
diff --git a/product/src/gui/plugin/PointsLockWidget/CConditionView.h b/product/src/gui/plugin/PointsLockWidget/CConditionView.h
index af5d0bd4..72ef9725 100644
--- a/product/src/gui/plugin/PointsLockWidget/CConditionView.h
+++ b/product/src/gui/plugin/PointsLockWidget/CConditionView.h
@@ -1,4 +1,4 @@
-#ifndef CCONDITIONVIEW_H
+#ifndef CCONDITIONVIEW_H
 #define CCONDITIONVIEW_H
 #include <QObject>
 
diff --git a/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp b/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp
index bc1c3565..b68fc6bc 100644
--- a/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp
+++ b/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.cpp
@@ -1,4 +1,4 @@
-#include "CDbInterfaceMng.h"
+#include "CDbInterfaceMng.h"
 #include "service/perm_mng_api/PermMngApi.h"
 #include "pub_logger_api/logger.h"
 
@@ -114,37 +114,37 @@ int CDbInterfaceMng::addPointLock(const QString &tag, int digitalValue, int chec
 {
     if(!m_pWriteDb->isOpen())
     {
-        return kbdFailed;
+        return iotFailed;
     }
     QString sqlQuery = QString("insert into  point_lock_config_info(tag_name,actual_value,isEnable) values('%1',%2,%3)").arg(tag).arg(QString::number(digitalValue)).arg(QString::number(check));
 
     if(m_pWriteDb->execute(sqlQuery))
     {
-        return kbdSuccess;
+        return iotSuccess;
     }
-    return kbdFailed;
+    return iotFailed;
 }
 
 int CDbInterfaceMng::updatePointLock(PointsInfoPtr info, bool isEnable)
 {
     if(!m_pWriteDb->isOpen())
     {
-        return kbdFailed;
+        return iotFailed;
     }
     QString sqlQuery = QString("update point_lock_config_info set isEnable = %1 where tag_name = '%2' and actual_value = %3").arg(isEnable?1:0).arg(info->tag).arg(info->value);
 
     if(m_pWriteDb->execute(sqlQuery))
     {
-        return kbdSuccess;
+        return iotSuccess;
     }
-    return kbdFailed;
+    return iotFailed;
 }
 
 int CDbInterfaceMng::delPointLock(PointsInfoPtr info)
 {
     if(!m_pWriteDb->isOpen())
     {
-        return kbdFailed;
+        return iotFailed;
     }
     m_pWriteDb->transaction();
     QString sql1 = QString("delete from  point_lock_config_info where tag_name ='%1' and actual_value = %2").arg(info->tag).arg(info->value);
@@ -152,13 +152,13 @@ int CDbInterfaceMng::delPointLock(PointsInfoPtr info)
     if(m_pWriteDb->execute(sql1) && m_pWriteDb->execute(sql2))
     {
         m_pWriteDb->commit();
-        return kbdSuccess;
+        return iotSuccess;
     }else
     {
         m_pWriteDb->rollback();
-        return kbdFailed;
+        return iotFailed;
     }
-    return kbdFailed;
+    return iotFailed;
 }
 
 QString CDbInterfaceMng::getLocDescById(int loc)
@@ -277,7 +277,7 @@ int CDbInterfaceMng::addConditionLock(PointsInfoPtr pointInfo, ConditionInfoPtr
 {
     if(!m_pWriteDb->isOpen())
     {
-        return kbdFailed;
+        return iotFailed;
     }
     QString sqlQuery = QString();
     if(condInfo->table == "digital")
@@ -298,16 +298,16 @@ int CDbInterfaceMng::addConditionLock(PointsInfoPtr pointInfo, ConditionInfoPtr
     qDebug()<<sqlQuery;
     if(m_pWriteDb->execute(sqlQuery))
     {
-        return kbdSuccess;
+        return iotSuccess;
     }
-    return kbdFailed;
+    return iotFailed;
 }
 
 int CDbInterfaceMng::delConditionLock(PointsInfoPtr pointInfo, ConditionInfoPtr condInfo)
 {
     if(!m_pWriteDb->isOpen())
     {
-        return kbdFailed;
+        return iotFailed;
     }
 
     QString sql = QString("delete from  point_lock_condition_info where tag_name ='%1' and actual_value = %2 and condition_tag_name = '%3' ")
@@ -315,12 +315,12 @@ int CDbInterfaceMng::delConditionLock(PointsInfoPtr pointInfo, ConditionInfoPtr
 
     if(m_pWriteDb->execute(sql))
     {
-        return kbdSuccess;
+        return iotSuccess;
     }else
     {
-        return kbdFailed;
+        return iotFailed;
     }
-    return kbdFailed;
+    return iotFailed;
 }
 
 CDbInterfaceMng::CDbInterfaceMng()
diff --git a/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.h b/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.h
index 2582c84b..005f7803 100644
--- a/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.h
+++ b/product/src/gui/plugin/PointsLockWidget/CDbInterfaceMng.h
@@ -1,4 +1,4 @@
-#ifndef CDBINTERFACEMNG_H
+#ifndef CDBINTERFACEMNG_H
 #define CDBINTERFACEMNG_H
 
 #include <QMap>
diff --git a/product/src/gui/plugin/PointsLockWidget/CPointsInfo.cpp b/product/src/gui/plugin/PointsLockWidget/CPointsInfo.cpp
index da174a79..b887f279 100644
--- a/product/src/gui/plugin/PointsLockWidget/CPointsInfo.cpp
+++ b/product/src/gui/plugin/PointsLockWidget/CPointsInfo.cpp
@@ -1,4 +1,4 @@
-#include "CPointsInfo.h"
+#include "CPointsInfo.h"
 
 CPointsInfo::CPointsInfo()
 {
diff --git a/product/src/gui/plugin/PointsLockWidget/CPointsInfo.h b/product/src/gui/plugin/PointsLockWidget/CPointsInfo.h
index cd89ac96..3577689d 100644
--- a/product/src/gui/plugin/PointsLockWidget/CPointsInfo.h
+++ b/product/src/gui/plugin/PointsLockWidget/CPointsInfo.h
@@ -1,4 +1,4 @@
-#ifndef CPOINTSINFO_H
+#ifndef CPOINTSINFO_H
 #define CPOINTSINFO_H
 
 #include <QSharedPointer>
diff --git a/product/src/gui/plugin/PointsLockWidget/CPointsLockPluginWidget.cpp b/product/src/gui/plugin/PointsLockWidget/CPointsLockPluginWidget.cpp
index c8457117..1a97473a 100644
--- a/product/src/gui/plugin/PointsLockWidget/CPointsLockPluginWidget.cpp
+++ b/product/src/gui/plugin/PointsLockWidget/CPointsLockPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include "CPointsLockPluginWidget.h"
+#include "CPointsLockPluginWidget.h"
 #include <QWidget>
 #include "PointsLockWidget.h"
 #include "pub_logger_api/logger.h"
diff --git a/product/src/gui/plugin/PointsLockWidget/CPointsLockPluginWidget.h b/product/src/gui/plugin/PointsLockWidget/CPointsLockPluginWidget.h
index 1c4b6ef9..b2018e73 100644
--- a/product/src/gui/plugin/PointsLockWidget/CPointsLockPluginWidget.h
+++ b/product/src/gui/plugin/PointsLockWidget/CPointsLockPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CPOINTSLOCKPLUGINWIDGET_H
+#ifndef CPOINTSLOCKPLUGINWIDGET_H
 #define CPOINTSLOCKPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CPointsLockPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 public:
     CPointsLockPluginWidget(QObject *parent = 0);
diff --git a/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.cpp b/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.cpp
index dccd2275..a8fd6d7c 100644
--- a/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.cpp
+++ b/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.cpp
@@ -1,4 +1,4 @@
-#include "CPointsOptDialog.h"
+#include "CPointsOptDialog.h"
 #include "ui_CPointsOptDialog.h"
 #include "CDbInterfaceMng.h"
 #include "PointsLockCommon.h"
@@ -151,7 +151,7 @@ void CPointsOptDialog::okClicked()
     int value = ui->comboBox->currentData().toInt();
 
     int check = ui->checkBox->isChecked() ? 1:0;
-    if(CDbInterfaceMng::instance()->addPointLock(tag,value,check) == kbdSuccess)
+    if(CDbInterfaceMng::instance()->addPointLock(tag,value,check) == iotSuccess)
     {
         accept();
     }else
diff --git a/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.h b/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.h
index bedce5f5..1dde50ef 100644
--- a/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.h
+++ b/product/src/gui/plugin/PointsLockWidget/CPointsOptDialog.h
@@ -1,4 +1,4 @@
-#ifndef CPOINTSOPTDIALOG_H
+#ifndef CPOINTSOPTDIALOG_H
 #define CPOINTSOPTDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/PointsLockWidget/CPointsTableModel.cpp b/product/src/gui/plugin/PointsLockWidget/CPointsTableModel.cpp
index 502c0dd6..acb15007 100644
--- a/product/src/gui/plugin/PointsLockWidget/CPointsTableModel.cpp
+++ b/product/src/gui/plugin/PointsLockWidget/CPointsTableModel.cpp
@@ -1,4 +1,4 @@
-#include "CPointsTableModel.h"
+#include "CPointsTableModel.h"
 #include "CDbInterfaceMng.h"
 CPointsTableModel::CPointsTableModel(QObject *parent)
     : QAbstractTableModel(parent)
diff --git a/product/src/gui/plugin/PointsLockWidget/CPointsTableModel.h b/product/src/gui/plugin/PointsLockWidget/CPointsTableModel.h
index 33f86c02..223fd642 100644
--- a/product/src/gui/plugin/PointsLockWidget/CPointsTableModel.h
+++ b/product/src/gui/plugin/PointsLockWidget/CPointsTableModel.h
@@ -1,4 +1,4 @@
-#ifndef CPOINTSTABLEMODEL_H
+#ifndef CPOINTSTABLEMODEL_H
 #define CPOINTSTABLEMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/PointsLockWidget/CPointsView.cpp b/product/src/gui/plugin/PointsLockWidget/CPointsView.cpp
index 01286047..bf735ab9 100644
--- a/product/src/gui/plugin/PointsLockWidget/CPointsView.cpp
+++ b/product/src/gui/plugin/PointsLockWidget/CPointsView.cpp
@@ -1,4 +1,4 @@
-#include "CPointsView.h"
+#include "CPointsView.h"
 #include <QHeaderView>
 #include <QScrollBar>
 
diff --git a/product/src/gui/plugin/PointsLockWidget/CPointsView.h b/product/src/gui/plugin/PointsLockWidget/CPointsView.h
index a514282e..6c436254 100644
--- a/product/src/gui/plugin/PointsLockWidget/CPointsView.h
+++ b/product/src/gui/plugin/PointsLockWidget/CPointsView.h
@@ -1,4 +1,4 @@
-#ifndef CPOINTSVIEW_H
+#ifndef CPOINTSVIEW_H
 #define CPOINTSVIEW_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/PointsLockWidget/PointsLockCommon.h b/product/src/gui/plugin/PointsLockWidget/PointsLockCommon.h
index 821dda72..5f42b639 100644
--- a/product/src/gui/plugin/PointsLockWidget/PointsLockCommon.h
+++ b/product/src/gui/plugin/PointsLockWidget/PointsLockCommon.h
@@ -1,4 +1,4 @@
-#ifndef POINTSLOCKCOMMON_H
+#ifndef POINTSLOCKCOMMON_H
 #define POINTSLOCKCOMMON_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp b/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp
index 1e8064d2..c6d0675f 100644
--- a/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp
+++ b/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.cpp
@@ -1,4 +1,4 @@
-#include "PointsLockWidget.h"
+#include "PointsLockWidget.h"
 #include "ui_PointsLockWidget.h"
 #include "pub_utility_api/FileStyle.h"
 #include <QFile>
@@ -151,7 +151,7 @@ void PointsLockWidget::slotDelPoint()
         return ;
     }
     PointsInfoPtr info = m_pmodel->getDataByIndex(modelIndexList.at(0));
-    if(CDbInterfaceMng::instance()->delPointLock(info) == kbdSuccess)
+    if(CDbInterfaceMng::instance()->delPointLock(info) == iotSuccess)
     {
         m_pmodel->removeData(modelIndexList.at(0));
         ui->tableView->clearSelection();
@@ -189,7 +189,7 @@ void PointsLockWidget::slotDelCondition()
        return ;
    }
    ConditionInfoPtr info = m_pCondModel->getDataByIndex(modelIndexList.at(0));
-   if(m_curinfo != Q_NULLPTR && CDbInterfaceMng::instance()->delConditionLock(m_curinfo,info) == kbdSuccess)
+   if(m_curinfo != Q_NULLPTR && CDbInterfaceMng::instance()->delConditionLock(m_curinfo,info) == iotSuccess)
    {
        m_pCondModel->removeData(modelIndexList.at(0));
        //showMess(tr("提示"),tr("删除成功"));
diff --git a/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.h b/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.h
index 2835e195..12eb6fd8 100644
--- a/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.h
+++ b/product/src/gui/plugin/PointsLockWidget/PointsLockWidget.h
@@ -1,4 +1,4 @@
-#ifndef POINTSLOCKWIDGET_H
+#ifndef POINTSLOCKWIDGET_H
 #define POINTSLOCKWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp b/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp
index 898bc492..e0ac17b4 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp
+++ b/product/src/gui/plugin/RelaySettingWidget/CDbMng.cpp
@@ -1,4 +1,4 @@
-#include "CDbMng.h"
+#include "CDbMng.h"
 #include "pub_logger_api/logger.h"
 #include "pub_sysinfo_api/SysInfoApi.h"
 
@@ -346,8 +346,14 @@ QList<RelaySetting> CDbMng::getSetting()
         relaySetting.locDesc = query.value(22).toString();
         relaySetting.keyIdTag = QString("%1.%2.%3").arg("fes_const").arg(relaySetting.tagName).arg("value");
 
+        if(relaySetting.valueText.compare("Null", Qt::CaseInsensitive) == 0)
+        {
+            relaySetting.valueText = "";
+        }
+        relaySetting.valueText = relaySetting.valueText.replace(".ini","");
+
         iot_public::SAppInfo stAppInfo;
-        if(kbdSuccess != sysInfoPtr->getAppInfoBySubsystemId(relaySetting.subSystem, stAppInfo))
+        if(iotSuccess != sysInfoPtr->getAppInfoBySubsystemId(relaySetting.subSystem, stAppInfo))
         {
             relaySetting.nAppId = relaySetting.subSystem;
         }
diff --git a/product/src/gui/plugin/RelaySettingWidget/CDbMng.h b/product/src/gui/plugin/RelaySettingWidget/CDbMng.h
index 17dca323..f2292576 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CDbMng.h
+++ b/product/src/gui/plugin/RelaySettingWidget/CDbMng.h
@@ -1,4 +1,4 @@
-#ifndef CDBMNG_H
+#ifndef CDBMNG_H
 #define CDBMNG_H
 
 #include "dbms/rdb_api/CRdbAccess.h"
diff --git a/product/src/gui/plugin/RelaySettingWidget/CLogMng.cpp b/product/src/gui/plugin/RelaySettingWidget/CLogMng.cpp
index b6eba262..14307c9a 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CLogMng.cpp
+++ b/product/src/gui/plugin/RelaySettingWidget/CLogMng.cpp
@@ -1,4 +1,4 @@
-#include "CLogMng.h"
+#include "CLogMng.h"
 #include <QFile>
 #include <QDateTime>
 #include <QTextStream>
diff --git a/product/src/gui/plugin/RelaySettingWidget/CLogMng.h b/product/src/gui/plugin/RelaySettingWidget/CLogMng.h
index 2e019438..42b34b3b 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CLogMng.h
+++ b/product/src/gui/plugin/RelaySettingWidget/CLogMng.h
@@ -1,4 +1,4 @@
-#ifndef CLOGMNG_H
+#ifndef CLOGMNG_H
 #define CLOGMNG_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelayCommon.h b/product/src/gui/plugin/RelaySettingWidget/CRelayCommon.h
index ded4e68b..45057fd9 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelayCommon.h
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelayCommon.h
@@ -1,4 +1,4 @@
-#ifndef CRELAYCOMMON_H
+#ifndef CRELAYCOMMON_H
 #define CRELAYCOMMON_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelayFile.cpp b/product/src/gui/plugin/RelaySettingWidget/CRelayFile.cpp
index 43be57ca..60aa197b 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelayFile.cpp
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelayFile.cpp
@@ -1,4 +1,4 @@
-#include "CRelayFile.h"
+#include "CRelayFile.h"
 #include <QFile>
 #include <QDir>
 #include <QTextStream>
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelayFile.h b/product/src/gui/plugin/RelaySettingWidget/CRelayFile.h
index c659a524..da209466 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelayFile.h
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelayFile.h
@@ -1,4 +1,4 @@
-#ifndef CRELAYFILE_H
+#ifndef CRELAYFILE_H
 #define CRELAYFILE_H
 
 #include "CRelayCommon.h"
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingCommon.h b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingCommon.h
index 5648ded1..a1f97ec0 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingCommon.h
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingCommon.h
@@ -1,4 +1,4 @@
-#ifndef CRELAYSETTINGCOMMON_H
+#ifndef CRELAYSETTINGCOMMON_H
 #define CRELAYSETTINGCOMMON_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingDelegate.cpp b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingDelegate.cpp
index 65a33b83..b85bfb89 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingDelegate.cpp
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingDelegate.cpp
@@ -1,4 +1,4 @@
-#include "CRelaySettingDelegate.h"
+#include "CRelaySettingDelegate.h"
 #include <QDebug>
 #include <QComboBox>
 
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingDelegate.h b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingDelegate.h
index 4e8c2755..f782e660 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingDelegate.h
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingDelegate.h
@@ -1,4 +1,4 @@
-#ifndef CRELAYSETTINGDELEGATE_H
+#ifndef CRELAYSETTINGDELEGATE_H
 #define CRELAYSETTINGDELEGATE_H
 
 #include <QStyledItemDelegate>
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.cpp b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.cpp
index e86de10e..14828aec 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.cpp
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.cpp
@@ -1,4 +1,4 @@
-#include "CRelaySettingMsgMng.h"
+#include "CRelaySettingMsgMng.h"
 #include "pub_logger_api/logger.h"
 #include <QDateTime>
 #include "CDbMng.h"
@@ -44,14 +44,13 @@ void CRelaySettingMsgMng::slotcmd(const QList<QString> &keyList, const QList<QSt
     iot_net::CMbMessage msg;
     msg.setMsgType(MT_OPT_COMMON_DOWN);
     msg.setSubject(relaySetting.nAppId, CH_HMI_TO_OPT_OPTCMD_DOWN);
-    COptCustCtrlRequest cOptCustCtrlRequest;
     SOptCustCtrlRequest sOptCustCtrlRequest;
     sOptCustCtrlRequest.stHead = createReqHead(relaySetting);
     sOptCustCtrlRequest.strKeyIdTag = relaySetting.keyIdTag.toStdString();
     sOptCustCtrlRequest.strRtuTag = relaySetting.rtuTag.toStdString();
     sOptCustCtrlRequest.vecOptCustCtrlQueue = createCtrlQueue(keyList,valueList);
 
-    std::string content = cOptCustCtrlRequest.generate(sOptCustCtrlRequest);
+    std::string content = COptCustCtrlRequest::generate(sOptCustCtrlRequest);
     msg.setData(content);
     if(!m_communicator->sendMsgToDomain(msg, relaySetting.domainId))
     {
@@ -79,10 +78,9 @@ void CRelaySettingMsgMng::recvMessage()
             return;
         }
 
-        COptCustCtrlReply cOptCustCtrlReply;
         SOptCustCtrlReply sOptCustCtrlReply;
         std::string str((const char*)msg.getDataPtr(), msg.getDataSize());
-        cOptCustCtrlReply.parse(str, sOptCustCtrlReply);
+        COptCustCtrlReply::parse(str, sOptCustCtrlReply);
 
         if(parseMsg(sOptCustCtrlReply))
         {
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.h b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.h
index 5fd3a39b..3f06b3b1 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.h
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingMsgMng.h
@@ -1,4 +1,4 @@
-#ifndef CRELAYSETTINGMSGMNG_H
+#ifndef CRELAYSETTINGMSGMNG_H
 #define CRELAYSETTINGMSGMNG_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingPluginWidget.cpp b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingPluginWidget.cpp
index d55c7994..7052b18c 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingPluginWidget.cpp
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include "CRelaySettingPluginWidget.h"
+#include "CRelaySettingPluginWidget.h"
 #include "CRelaySettingWidget.h"
 #include <QWidget>
 
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingPluginWidget.h b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingPluginWidget.h
index 793d1a75..3789135a 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingPluginWidget.h
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CRELAYSETTINGPLUGINWIDGET_H
+#ifndef CRELAYSETTINGPLUGINWIDGET_H
 #define CRELAYSETTINGPLUGINWIDGET_H
 
 
@@ -8,7 +8,7 @@
 class CRelaySettingPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 public:
     CRelaySettingPluginWidget(QObject *parent = 0);
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp
index 441c482d..144d6bf2 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.cpp
@@ -1,4 +1,4 @@
-/**
+/**
 *@file        ConstWidget
 *@brief       保护定值插件
 *@author      jxd
@@ -97,7 +97,7 @@ void CRelaySettingWidget::initialize()
         LOGERROR("创建系统信息访问库失败!");
     }
     //2.获取节点信息
-    if(m_ptrSysInfo!=Q_NULLPTR && m_ptrSysInfo->getLocalNodeInfo(m_nodeInfo) == kbdSuccess)
+    if(m_ptrSysInfo!=Q_NULLPTR && m_ptrSysInfo->getLocalNodeInfo(m_nodeInfo) == iotSuccess)
     {
         LOGINFO("获取节点信息成功!");
     }else
@@ -752,7 +752,7 @@ void CRelaySettingWidget::setEnableBtnList(bool isSuccess)
 
 void CRelaySettingWidget::setCtrlBtnEnable(bool isEnable)
 {
-  //  ui->comboBox->setEnabled(isEnable);
+    ui->comboBox->setEnabled(isEnable);
     ui->change->setEnabled(isEnable);
     ui->edit->setEnabled(isEnable);
     ui->confirm->setEnabled(isEnable);
@@ -911,7 +911,7 @@ QString CRelaySettingWidget::getDisplayValue(RelaySetting &relaySetting, float &
         return QString::number(value);
     }
 
-    QString display_value = QString::number(value); //设置默认值
+    QString display_value = "";
     QMap<QString,QList<RelayDictState> >::const_iterator it  = m_dictMap.find(relaySetting.valueText);
     if(it != m_dictMap.end())
     {
@@ -940,7 +940,7 @@ QString CRelaySettingWidget::getDisplayValue(RelaySetting &relaySetting, float &
 bool CRelaySettingWidget::checkPermCtrl()
 {
     std::string str = "FUNC_NOM_CONST_CTRL";
-    if(PERM_PERMIT != m_permMng->PermCheck(PERM_NOM_FUNC_DEF,(char*)&str))
+    if(PERM_PERMIT != m_permMng->PermCheck(PERM_NOM_FUNC_DEF,&str))
     {
         QMessageBox::warning(this,tr("提示"),tr("无保护定值操作权限!"));
         return false;
@@ -1620,6 +1620,8 @@ void CRelaySettingWidget::slotRecvOuttime()
 
 void CRelaySettingWidget::slotCurrentIndexChanged(int curIndex)
 {
+    Q_UNUSED(curIndex);
+
     QString indexDev = ui->mGroupCb->currentData().toString();
     int filterType = EN_RELAY_DEV;
     if(indexDev.isEmpty())
diff --git a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.h b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.h
index 58ef26bd..8c68c54f 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.h
+++ b/product/src/gui/plugin/RelaySettingWidget/CRelaySettingWidget.h
@@ -1,4 +1,4 @@
-#ifndef CRELAYSETTINGWIDGET_H
+#ifndef CRELAYSETTINGWIDGET_H
 #define CRELAYSETTINGWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RelaySettingWidget/CWorker.cpp b/product/src/gui/plugin/RelaySettingWidget/CWorker.cpp
index f0249c4f..4da29af7 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CWorker.cpp
+++ b/product/src/gui/plugin/RelaySettingWidget/CWorker.cpp
@@ -1,4 +1,4 @@
-#include "CWorker.h"
+#include "CWorker.h"
 #include "CRelaySettingCommon.h"
 #include <QDebug>
 #include <QMessageBox>
diff --git a/product/src/gui/plugin/RelaySettingWidget/CWorker.h b/product/src/gui/plugin/RelaySettingWidget/CWorker.h
index ba8c7a18..1fd0fb3f 100644
--- a/product/src/gui/plugin/RelaySettingWidget/CWorker.h
+++ b/product/src/gui/plugin/RelaySettingWidget/CWorker.h
@@ -1,4 +1,4 @@
-#ifndef CWORKER_H
+#ifndef CWORKER_H
 #define CWORKER_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/RelaySettingWidget/ModbusTCP.cpp b/product/src/gui/plugin/RelaySettingWidget/ModbusTCP.cpp
index 7da42852..ab20739e 100644
--- a/product/src/gui/plugin/RelaySettingWidget/ModbusTCP.cpp
+++ b/product/src/gui/plugin/RelaySettingWidget/ModbusTCP.cpp
@@ -1,4 +1,4 @@
-//处理的方法有一点特殊，在数据库中增加一个MODBUS配置表，记录的是要发送的命令以及刷新周期，读表时按序号排序并给每一条记录排号
+//处理的方法有一点特殊，在数据库中增加一个MODBUS配置表，记录的是要发送的命令以及刷新周期，读表时按序号排序并给每一条记录排号
 //与遥测遥信的对应关系是：对于同一个地址的测量设备的记录，遥测时记录在前的放在前
 //比如：同是一号地址的两条03命令码记录前一条记录长度为8各，后一条记录的长度4个，那么前一条记录对应的遥测号为0-7，后一条记录
 //对应的遥测号为8-11，遥信时记录在前的也放在前，但有一点需特别注意，如果前一条记录长度不为8的倍数，那么后一条记录
diff --git a/product/src/gui/plugin/RelaySettingWidget/ModbusTCP.h b/product/src/gui/plugin/RelaySettingWidget/ModbusTCP.h
index 4f622516..a490061e 100644
--- a/product/src/gui/plugin/RelaySettingWidget/ModbusTCP.h
+++ b/product/src/gui/plugin/RelaySettingWidget/ModbusTCP.h
@@ -1,4 +1,4 @@
-#include "publicpara.h"
+#include "publicpara.h"
 #include <QList>
 #include "CRelayCommon.h"
 
diff --git a/product/src/gui/plugin/RelaySettingWidget/main.cpp b/product/src/gui/plugin/RelaySettingWidget/main.cpp
index 84295aae..cb6436eb 100644
--- a/product/src/gui/plugin/RelaySettingWidget/main.cpp
+++ b/product/src/gui/plugin/RelaySettingWidget/main.cpp
@@ -1,4 +1,4 @@
-#include "CRelaySettingWidget.h"
+#include "CRelaySettingWidget.h"
 #include <QApplication>
 #include "pub_logger_api/logger.h"
 #include "net_msg_bus_api/MsgBusApi.h"
@@ -19,7 +19,7 @@ int main(int argc, char *argv[])
         return -1;
     }
 
-    if(perm->SysLogin("admin", "kbdct", 1, 12*60*60, "hmi") != 0)
+    if(perm->SysLogin("admin", "admin", 1, 12*60*60, "hmi") != 0)
     {
         return -1;
     }
diff --git a/product/src/gui/plugin/RelaySettingWidget/publicpara.h b/product/src/gui/plugin/RelaySettingWidget/publicpara.h
index 7c93d7e6..04953667 100644
--- a/product/src/gui/plugin/RelaySettingWidget/publicpara.h
+++ b/product/src/gui/plugin/RelaySettingWidget/publicpara.h
@@ -1,4 +1,4 @@
-#ifndef PUBLICPARA_H
+#ifndef PUBLICPARA_H
 #define PUBLICPARA_H
 
 #define	CHAN_MAX_NUM               256	//通道数
diff --git a/product/src/gui/plugin/ReportApp/CReportPluginWidget.cpp b/product/src/gui/plugin/ReportApp/CReportPluginWidget.cpp
index 1807edbc..82b08a93 100644
--- a/product/src/gui/plugin/ReportApp/CReportPluginWidget.cpp
+++ b/product/src/gui/plugin/ReportApp/CReportPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CReportPluginWidget.h"
 #include "CReportWidget.h"
 
diff --git a/product/src/gui/plugin/ReportApp/CReportPluginWidget.h b/product/src/gui/plugin/ReportApp/CReportPluginWidget.h
index c4243eb7..1679e58b 100644
--- a/product/src/gui/plugin/ReportApp/CReportPluginWidget.h
+++ b/product/src/gui/plugin/ReportApp/CReportPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CREPORTPLUGINWIDGET_H
+#ifndef CREPORTPLUGINWIDGET_H
 #define CREPORTPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CReportPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/ReportApp/CReportStackedWidget.cpp b/product/src/gui/plugin/ReportApp/CReportStackedWidget.cpp
index b6862b75..04ce261a 100644
--- a/product/src/gui/plugin/ReportApp/CReportStackedWidget.cpp
+++ b/product/src/gui/plugin/ReportApp/CReportStackedWidget.cpp
@@ -1,4 +1,4 @@
-#include "CReportStackedWidget.h"
+#include "CReportStackedWidget.h"
 
 CReportStackedWidget::CReportStackedWidget(QWidget *parent)
     :QStackedWidget(parent)
diff --git a/product/src/gui/plugin/ReportApp/CReportStackedWidget.h b/product/src/gui/plugin/ReportApp/CReportStackedWidget.h
index 5591a847..d05f139e 100644
--- a/product/src/gui/plugin/ReportApp/CReportStackedWidget.h
+++ b/product/src/gui/plugin/ReportApp/CReportStackedWidget.h
@@ -1,4 +1,4 @@
-#ifndef CREPORTSTACKEDWIDGET_H
+#ifndef CREPORTSTACKEDWIDGET_H
 #define CREPORTSTACKEDWIDGET_H
 #include "CReportWebView.h"
 #include "CReportWidget.h"
diff --git a/product/src/gui/plugin/ReportApp/CReportWebView.cpp b/product/src/gui/plugin/ReportApp/CReportWebView.cpp
index 0193d1b3..d08ba7ac 100644
--- a/product/src/gui/plugin/ReportApp/CReportWebView.cpp
+++ b/product/src/gui/plugin/ReportApp/CReportWebView.cpp
@@ -1,4 +1,4 @@
-#include "CReportWebView.h"
+#include "CReportWebView.h"
 
 CReportWebView::CReportWebView(QWidget *parent)
    : QWebEngineView(parent)
diff --git a/product/src/gui/plugin/ReportApp/CReportWebView.h b/product/src/gui/plugin/ReportApp/CReportWebView.h
index fecafd47..4aefe7ed 100644
--- a/product/src/gui/plugin/ReportApp/CReportWebView.h
+++ b/product/src/gui/plugin/ReportApp/CReportWebView.h
@@ -1,4 +1,4 @@
-#ifndef CREPORTWEBVIEW_H
+#ifndef CREPORTWEBVIEW_H
 #define CREPORTWEBVIEW_H
 
 #include <QWebEngineView>
diff --git a/product/src/gui/plugin/ReportApp/CReportWidget.cpp b/product/src/gui/plugin/ReportApp/CReportWidget.cpp
index f83c74e6..94930abb 100644
--- a/product/src/gui/plugin/ReportApp/CReportWidget.cpp
+++ b/product/src/gui/plugin/ReportApp/CReportWidget.cpp
@@ -1,4 +1,4 @@
-#include "CReportWidget.h"
+#include "CReportWidget.h"
 #include <QSettings>
 #include <QFile>
 #include <QDomDocument>
diff --git a/product/src/gui/plugin/ReportApp/CReportWidget.h b/product/src/gui/plugin/ReportApp/CReportWidget.h
index 534b4b59..1710b05d 100644
--- a/product/src/gui/plugin/ReportApp/CReportWidget.h
+++ b/product/src/gui/plugin/ReportApp/CReportWidget.h
@@ -1,4 +1,4 @@
-#ifndef CREPORTWIDGET_H
+#ifndef CREPORTWIDGET_H
 #define CREPORTWIDGET_H
 
 #include <QCoreApplication>
diff --git a/product/src/gui/plugin/ReportApp/ReportEdit.ico b/product/src/gui/plugin/ReportApp/ReportEdit.ico
index 9ce1c9a9..6b2dbdc2 100644
Binary files a/product/src/gui/plugin/ReportApp/ReportEdit.ico and b/product/src/gui/plugin/ReportApp/ReportEdit.ico differ
diff --git a/product/src/gui/plugin/ReportApp/SingleApplication.cpp b/product/src/gui/plugin/ReportApp/SingleApplication.cpp
index 07e848a4..1fd0d5b0 100644
--- a/product/src/gui/plugin/ReportApp/SingleApplication.cpp
+++ b/product/src/gui/plugin/ReportApp/SingleApplication.cpp
@@ -1,4 +1,4 @@
-// The MIT License (MIT)
+// The MIT License (MIT)
 //
 // Copyright (c) Itay Grudev 2015 - 2018
 //
diff --git a/product/src/gui/plugin/ReportApp/SingleApplication.h b/product/src/gui/plugin/ReportApp/SingleApplication.h
index cb505971..493c6460 100644
--- a/product/src/gui/plugin/ReportApp/SingleApplication.h
+++ b/product/src/gui/plugin/ReportApp/SingleApplication.h
@@ -1,4 +1,4 @@
-// The MIT License (MIT)
+// The MIT License (MIT)
 //
 // Copyright (c) Itay Grudev 2015 - 2018
 //
diff --git a/product/src/gui/plugin/ReportApp/SingleApplication_p.cpp b/product/src/gui/plugin/ReportApp/SingleApplication_p.cpp
index 90fa199d..68475c9d 100644
--- a/product/src/gui/plugin/ReportApp/SingleApplication_p.cpp
+++ b/product/src/gui/plugin/ReportApp/SingleApplication_p.cpp
@@ -1,4 +1,4 @@
-// The MIT License (MIT)
+// The MIT License (MIT)
 //
 // Copyright (c) Itay Grudev 2015 - 2018
 //
diff --git a/product/src/gui/plugin/ReportApp/main.cpp b/product/src/gui/plugin/ReportApp/main.cpp
index 9c053141..3ef58d09 100644
--- a/product/src/gui/plugin/ReportApp/main.cpp
+++ b/product/src/gui/plugin/ReportApp/main.cpp
@@ -1,4 +1,4 @@
-#include <QApplication>
+#include <QApplication>
 #include <QDesktopWidget>
 #include "common/QtAppGlobalSet.h"
 #include "SingleApplication.h"
diff --git a/product/src/gui/plugin/ReportWidget/CReportPluginWidget.cpp b/product/src/gui/plugin/ReportWidget/CReportPluginWidget.cpp
index 9d375667..28baa439 100644
--- a/product/src/gui/plugin/ReportWidget/CReportPluginWidget.cpp
+++ b/product/src/gui/plugin/ReportWidget/CReportPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CReportPluginWidget.h"
 #include "CReportWidget.h"
 
diff --git a/product/src/gui/plugin/ReportWidget/CReportPluginWidget.h b/product/src/gui/plugin/ReportWidget/CReportPluginWidget.h
index c4243eb7..1679e58b 100644
--- a/product/src/gui/plugin/ReportWidget/CReportPluginWidget.h
+++ b/product/src/gui/plugin/ReportWidget/CReportPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CREPORTPLUGINWIDGET_H
+#ifndef CREPORTPLUGINWIDGET_H
 #define CREPORTPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CReportPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/ReportWidget/CReportStackedWidget.cpp b/product/src/gui/plugin/ReportWidget/CReportStackedWidget.cpp
index 31339ab0..72d2b40b 100644
--- a/product/src/gui/plugin/ReportWidget/CReportStackedWidget.cpp
+++ b/product/src/gui/plugin/ReportWidget/CReportStackedWidget.cpp
@@ -1,4 +1,4 @@
-#include "CReportStackedWidget.h"
+#include "CReportStackedWidget.h"
 
 CReportStackedWidget::CReportStackedWidget(QWidget *parent)
     : QStackedWidget(parent),
diff --git a/product/src/gui/plugin/ReportWidget/CReportStackedWidget.h b/product/src/gui/plugin/ReportWidget/CReportStackedWidget.h
index 0eaf354d..6c426a1e 100644
--- a/product/src/gui/plugin/ReportWidget/CReportStackedWidget.h
+++ b/product/src/gui/plugin/ReportWidget/CReportStackedWidget.h
@@ -1,4 +1,4 @@
-#ifndef CREPORTSTACKEDWIDGET_H
+#ifndef CREPORTSTACKEDWIDGET_H
 #define CREPORTSTACKEDWIDGET_H
 #include "CReportWebView.h"
 #include "CReportWidget.h"
diff --git a/product/src/gui/plugin/ReportWidget/CReportWebView.cpp b/product/src/gui/plugin/ReportWidget/CReportWebView.cpp
index 0193d1b3..d08ba7ac 100644
--- a/product/src/gui/plugin/ReportWidget/CReportWebView.cpp
+++ b/product/src/gui/plugin/ReportWidget/CReportWebView.cpp
@@ -1,4 +1,4 @@
-#include "CReportWebView.h"
+#include "CReportWebView.h"
 
 CReportWebView::CReportWebView(QWidget *parent)
    : QWebEngineView(parent)
diff --git a/product/src/gui/plugin/ReportWidget/CReportWebView.h b/product/src/gui/plugin/ReportWidget/CReportWebView.h
index fecafd47..4aefe7ed 100644
--- a/product/src/gui/plugin/ReportWidget/CReportWebView.h
+++ b/product/src/gui/plugin/ReportWidget/CReportWebView.h
@@ -1,4 +1,4 @@
-#ifndef CREPORTWEBVIEW_H
+#ifndef CREPORTWEBVIEW_H
 #define CREPORTWEBVIEW_H
 
 #include <QWebEngineView>
diff --git a/product/src/gui/plugin/ReportWidget/CReportWidget.cpp b/product/src/gui/plugin/ReportWidget/CReportWidget.cpp
index 93a5d1f4..4289522b 100644
--- a/product/src/gui/plugin/ReportWidget/CReportWidget.cpp
+++ b/product/src/gui/plugin/ReportWidget/CReportWidget.cpp
@@ -1,4 +1,4 @@
-#include "CReportWidget.h"
+#include "CReportWidget.h"
 #include "QDomDocument"
 #include "pub_utility_api/FileStyle.h"
 
diff --git a/product/src/gui/plugin/ReportWidget/CReportWidget.h b/product/src/gui/plugin/ReportWidget/CReportWidget.h
index e184bfcb..fb39c222 100644
--- a/product/src/gui/plugin/ReportWidget/CReportWidget.h
+++ b/product/src/gui/plugin/ReportWidget/CReportWidget.h
@@ -1,4 +1,4 @@
-#ifndef CREPORTWIDGET_H
+#ifndef CREPORTWIDGET_H
 #define CREPORTWIDGET_H
 
 #include <QCoreApplication>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotAVWidget.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotAVWidget.cpp
index 5092d0d6..30a6af56 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotAVWidget.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotAVWidget.cpp
@@ -1,4 +1,4 @@
-#include <QPushButton>
+#include <QPushButton>
 #include <QSlider>
 #include <QLayout>
 #include <QMessageBox>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotAVWidget.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotAVWidget.h
index cfdf6bd4..da5a57d5 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotAVWidget.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotAVWidget.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTAVWIDGET_H
+#ifndef CROBOTAVWIDGET_H
 #define CROBOTAVWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoForm.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoForm.cpp
index db8a5be3..109a7698 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoForm.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoForm.cpp
@@ -1,4 +1,4 @@
-#include "CRobotCCDVideoForm.h"
+#include "CRobotCCDVideoForm.h"
 #include "ui_CRobotCCDVideoForm.h"
 #include <QPushButton>
 #include "CRobotCCDVideoItemModel.h"
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoForm.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoForm.h
index deccdb59..e0929175 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoForm.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoForm.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTCCDVIDEOFORM_H
+#ifndef CROBOTCCDVIDEOFORM_H
 #define CROBOTCCDVIDEOFORM_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoItemModel.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoItemModel.cpp
index 2189037a..e450da2f 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoItemModel.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoItemModel.cpp
@@ -1,4 +1,4 @@
-#include "CRobotCCDVideoItemModel.h"
+#include "CRobotCCDVideoItemModel.h"
 #include <QDateTime>
 #include "CRobotFileInfo.h"
 #include "CRobotCommon.h"
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoItemModel.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoItemModel.h
index 64827df2..ed25d506 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoItemModel.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoItemModel.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTCCDVIDEOITEMMODEL_H
+#ifndef CROBOTCCDVIDEOITEMMODEL_H
 #define CROBOTCCDVIDEOITEMMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoView.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoView.cpp
index 43469bce..653e87f3 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoView.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoView.cpp
@@ -1,4 +1,4 @@
-#include "CRobotCCDVideoView.h"
+#include "CRobotCCDVideoView.h"
 #include <QHeaderView>
 #include <QMouseEvent>
 #include <QScrollBar>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoView.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoView.h
index 31dd7e18..ada137e2 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoView.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCCDVideoView.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTCCDVIDEOVIEW_H
+#ifndef CROBOTCCDVIDEOVIEW_H
 #define CROBOTCCDVIDEOVIEW_H
 #include <QTableView>
 
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCommon.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotCommon.h
index c7a7147d..4400e25f 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCommon.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCommon.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTLINKCOMMON_H
+#ifndef CROBOTLINKCOMMON_H
 #define CROBOTLINKCOMMON_H
 
 #include <QSharedPointer>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp
index a4cda44a..4e4a7acf 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp
@@ -1,4 +1,4 @@
-#include "CRobotCtrlWidget.h"
+#include "CRobotCtrlWidget.h"
 #include "SWitchButton.h"
 #include "ui_CRobotCtrlWidget.h"
 #include <QMap>
@@ -485,7 +485,7 @@ bool CRobotCtrlWidget::getSystemInfo()
         LOGERROR("创建系统信息访问库失败");
         return false;
     }
-    if(kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo))
+    if(iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo))
     {
         LOGERROR("获取系统信息失败");
         return false;
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.h
index bc0d3e3f..37c2bed0 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTCTRLWIDGET_H
+#ifndef CROBOTCTRLWIDGET_H
 #define CROBOTCTRLWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotDialog.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotDialog.cpp
index 2b1d1d3f..18a2db02 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotDialog.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotDialog.cpp
@@ -1,4 +1,4 @@
-#include "CRobotDialog.h"
+#include "CRobotDialog.h"
 #include "ui_CRobotDialog.h"
 #include "CRobotCCDVideoForm.h"
 #include "CRobotAVWidget.h"
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotDialog.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotDialog.h
index 4ff9235b..2d46d6f3 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotDialog.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotDialog.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTDIALOG_H
+#ifndef CROBOTDIALOG_H
 #define CROBOTDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp
index ebbf447e..78a3f970 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.cpp
@@ -1,4 +1,4 @@
-#include "CRobotFileCollect.h"
+#include "CRobotFileCollect.h"
 #include <QTimer>
 #include "Common.h"
 #include "pub_logger_api/logger.h"
@@ -51,7 +51,7 @@ void CRobotFileCollect::loadConfig()
     std::string loadFilePath;
     config.load(file);
     int error = config.getStringValue("robot_config","loadFilePath",loadFilePath);
-    if( error != kbdSuccess)
+    if( error != iotSuccess)
     {
         m_path = "../../data/test";;
         LOGERROR("机器人加载文件路径解析失败!文件[%s],错误码[%d]",file.c_str(),error);
@@ -84,7 +84,7 @@ void CRobotFileCollect::onTimeLoadFile()
     {
         QFileInfo fileInfo = fileList.at(i);
         RobotFilePtr robotFile(new CRobotFileInfo());
-        if(robotFile->initialize(fileInfo) == kbdSuccess)
+        if(robotFile->initialize(fileInfo) == iotSuccess)
         {
             map.insert(robotFile->m_execPath,robotFile);
 
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.h
index 3a523e55..5b88441d 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileCollect.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTFILECOLLECT_H
+#ifndef CROBOTFILECOLLECT_H
 #define CROBOTFILECOLLECT_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.cpp
index d0515038..d92ab4d0 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.cpp
@@ -1,4 +1,4 @@
-#include "CRobotFileInfo.h"
+#include "CRobotFileInfo.h"
 #include "QFileInfo"
 #include "pub_logger_api/logger.h"
 #include "Common.h"
@@ -105,7 +105,7 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo)
     if(list.size() != 3)
     {
         LOGERROR("文件[%s]命名格式有误!",m_fileName.toStdString().c_str());
-        return kbdFailed;
+        return iotFailed;
     }
     QString devInt = list.at(0);
     m_devgId = devInt.toInt();
@@ -124,7 +124,7 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo)
         }else
         {
             LOGERROR("文件[%s]后缀格式有误!",m_fileName.toStdString().c_str());
-            return kbdFailed;
+            return iotFailed;
         }
     }else if(timeList.size() == 3)
     {
@@ -134,15 +134,15 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo)
         }else
         {
             LOGERROR("文件[%s]后缀格式有误!",m_fileName.toStdString().c_str());
-            return kbdFailed;
+            return iotFailed;
         }
     }else
     {
         LOGERROR("文件[%s]命名格式有误!",m_fileName.toStdString().c_str());
-        return kbdFailed;
+        return iotFailed;
     }
     time_stamp = getTime(timeList.at(0));
-    return kbdSuccess;
+    return iotSuccess;
 }
 
 CRobotInfo::CRobotInfo()
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.h
index 7497eff4..0ed98aba 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileInfo.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTFILEINFO_H
+#ifndef CROBOTFILEINFO_H
 #define CROBOTFILEINFO_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileMng.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileMng.cpp
index e38e4111..344552a5 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileMng.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileMng.cpp
@@ -1,4 +1,4 @@
-#include "CRobotFileMng.h"
+#include "CRobotFileMng.h"
 
 CRobotFileMng::CRobotFileMng(QObject *parent):
     QObject(parent)
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileMng.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileMng.h
index f09466b8..7a0a7e37 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotFileMng.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotFileMng.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTFILEMNG_H
+#ifndef CROBOTFILEMNG_H
 #define CROBOTFILEMNG_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotPluginWidget.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotPluginWidget.cpp
index 7b5f7702..2fd6ecc3 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotPluginWidget.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include "CRobotPluginWidget.h"
+#include "CRobotPluginWidget.h"
 #include "CRobotWidget.h"
 #include <QWidget>
 CRobotPluginWidget::CRobotPluginWidget(QObject *parent) : QObject(parent)
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotPluginWidget.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotPluginWidget.h
index 2f2a30f8..9c502670 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotPluginWidget.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTPLUGINWIDGET_H
+#ifndef CROBOTPLUGINWIDGET_H
 #define CROBOTPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CRobotPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 public:
     CRobotPluginWidget(QObject *parent = nullptr);
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.cpp
index a068787c..b345a771 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.cpp
@@ -1,4 +1,4 @@
-#include "CRobotWidget.h"
+#include "CRobotWidget.h"
 #include "ui_CRobotWidget.h"
 #include "CRobotCCDVideoForm.h"
 #include "CRobotAVWidget.h"
diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.h b/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.h
index a0e18935..f7078d7c 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotWidget.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTLINKCTRLWIDGET_H
+#ifndef CROBOTLINKCTRLWIDGET_H
 #define CROBOTLINKCTRLWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/Label.cpp b/product/src/gui/plugin/RobotCtrlWidget/Label.cpp
index 6a90966d..a1bcdda2 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/Label.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/Label.cpp
@@ -1,4 +1,4 @@
-#include "Label.h"
+#include "Label.h"
 #include <QFileDialog>
 #include <QMenu>
 Label::Label(QWidget *parent):
diff --git a/product/src/gui/plugin/RobotCtrlWidget/Label.h b/product/src/gui/plugin/RobotCtrlWidget/Label.h
index 5e1b5dc4..73672aa5 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/Label.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/Label.h
@@ -1,4 +1,4 @@
-#ifndef LABEL_H
+#ifndef LABEL_H
 #define LABEL_H
 
 #include <QLabel>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.cpp b/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.cpp
index fc816178..a04d7680 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.cpp
@@ -1,4 +1,4 @@
-#include "OnTimeQueryThread.h"
+#include "OnTimeQueryThread.h"
 #include "pub_logger_api/logger.h"
 #include <QDebug>
 using namespace std;
diff --git a/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.h b/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.h
index 7cf97ab0..407ba602 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/OnTimeQueryThread.h
@@ -1,4 +1,4 @@
-#ifndef ONTIMEQUERYTHREAD_H
+#ifndef ONTIMEQUERYTHREAD_H
 #define ONTIMEQUERYTHREAD_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/Renderer.cpp b/product/src/gui/plugin/RobotCtrlWidget/Renderer.cpp
index 593e1d31..523a204b 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/Renderer.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/Renderer.cpp
@@ -1,4 +1,4 @@
-#include "Renderer.h"
+#include "Renderer.h"
 #include <QMenu>
 #include <QFileDialog>
 Renderer::Renderer(QWidget *parent):
diff --git a/product/src/gui/plugin/RobotCtrlWidget/Renderer.h b/product/src/gui/plugin/RobotCtrlWidget/Renderer.h
index 86d2a2ef..56481f8e 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/Renderer.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/Renderer.h
@@ -1,4 +1,4 @@
-#ifndef RENDERER_H
+#ifndef RENDERER_H
 #define RENDERER_H
 #include <QWidget>
 #include <QtAV>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.cpp b/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.cpp
index 0beec602..b198e9aa 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.cpp
@@ -1,4 +1,4 @@
-#include <QPainter>
+#include <QPainter>
 #include <QMouseEvent>
 #include <QPainterPath>
 #include "SWitchButton.h"
diff --git a/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.h b/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.h
index 59ee61ab..53bf971b 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/SWitchButton.h
@@ -1,4 +1,4 @@
-#ifndef SWITCHBUTTON_H
+#ifndef SWITCHBUTTON_H
 #define SWITCHBUTTON_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/Slider.cpp b/product/src/gui/plugin/RobotCtrlWidget/Slider.cpp
index 13981231..072a6ba5 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/Slider.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/Slider.cpp
@@ -1,4 +1,4 @@
-#include "Slider.h"
+#include "Slider.h"
 #include <QApplication>
 #include <QMouseEvent>
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/Slider.h b/product/src/gui/plugin/RobotCtrlWidget/Slider.h
index 0ce56d6a..a6d56bf8 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/Slider.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/Slider.h
@@ -1,4 +1,4 @@
-#ifndef SLIDER_H
+#ifndef SLIDER_H
 #define SLIDER_H
 #include <QSlider>
 
diff --git a/product/src/gui/plugin/RobotCtrlWidget/VoiceSlider.cpp b/product/src/gui/plugin/RobotCtrlWidget/VoiceSlider.cpp
index 5edc7320..abd1f848 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/VoiceSlider.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/VoiceSlider.cpp
@@ -1,4 +1,4 @@
-#include "VoiceSlider.h"
+#include "VoiceSlider.h"
 #include "ui_VoiceSlider.h"
 
 VoiceSlider::VoiceSlider(int voice,bool bo, QWidget *parent, Qt::WindowFlags f) :
diff --git a/product/src/gui/plugin/RobotCtrlWidget/VoiceSlider.h b/product/src/gui/plugin/RobotCtrlWidget/VoiceSlider.h
index 192c6bec..b6908cb2 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/VoiceSlider.h
+++ b/product/src/gui/plugin/RobotCtrlWidget/VoiceSlider.h
@@ -1,4 +1,4 @@
-#ifndef VOICESLIDER_H
+#ifndef VOICESLIDER_H
 #define VOICESLIDER_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotCtrlWidget/main.cpp b/product/src/gui/plugin/RobotCtrlWidget/main.cpp
index b180ffa8..9a7de17d 100644
--- a/product/src/gui/plugin/RobotCtrlWidget/main.cpp
+++ b/product/src/gui/plugin/RobotCtrlWidget/main.cpp
@@ -1,4 +1,4 @@
-#include "CRobotWidget.h"
+#include "CRobotWidget.h"
 #include <QApplication>
 #include "pub_logger_api/logger.h"
 #include "net_msg_bus_api/MsgBusApi.h"
diff --git a/product/src/gui/plugin/RobotWidget/CRobotAVWidget.cpp b/product/src/gui/plugin/RobotWidget/CRobotAVWidget.cpp
index 1a865922..52572c15 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotAVWidget.cpp
+++ b/product/src/gui/plugin/RobotWidget/CRobotAVWidget.cpp
@@ -1,4 +1,4 @@
-#include <QPushButton>
+#include <QPushButton>
 #include <QSlider>
 #include <QLayout>
 #include <QMessageBox>
diff --git a/product/src/gui/plugin/RobotWidget/CRobotAVWidget.h b/product/src/gui/plugin/RobotWidget/CRobotAVWidget.h
index cfdf6bd4..da5a57d5 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotAVWidget.h
+++ b/product/src/gui/plugin/RobotWidget/CRobotAVWidget.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTAVWIDGET_H
+#ifndef CROBOTAVWIDGET_H
 #define CROBOTAVWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoForm.cpp b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoForm.cpp
index db8a5be3..109a7698 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoForm.cpp
+++ b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoForm.cpp
@@ -1,4 +1,4 @@
-#include "CRobotCCDVideoForm.h"
+#include "CRobotCCDVideoForm.h"
 #include "ui_CRobotCCDVideoForm.h"
 #include <QPushButton>
 #include "CRobotCCDVideoItemModel.h"
diff --git a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoForm.h b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoForm.h
index deccdb59..e0929175 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoForm.h
+++ b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoForm.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTCCDVIDEOFORM_H
+#ifndef CROBOTCCDVIDEOFORM_H
 #define CROBOTCCDVIDEOFORM_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoItemModel.cpp b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoItemModel.cpp
index 2189037a..e450da2f 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoItemModel.cpp
+++ b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoItemModel.cpp
@@ -1,4 +1,4 @@
-#include "CRobotCCDVideoItemModel.h"
+#include "CRobotCCDVideoItemModel.h"
 #include <QDateTime>
 #include "CRobotFileInfo.h"
 #include "CRobotCommon.h"
diff --git a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoItemModel.h b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoItemModel.h
index 64827df2..ed25d506 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoItemModel.h
+++ b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoItemModel.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTCCDVIDEOITEMMODEL_H
+#ifndef CROBOTCCDVIDEOITEMMODEL_H
 #define CROBOTCCDVIDEOITEMMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoView.cpp b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoView.cpp
index 43469bce..653e87f3 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoView.cpp
+++ b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoView.cpp
@@ -1,4 +1,4 @@
-#include "CRobotCCDVideoView.h"
+#include "CRobotCCDVideoView.h"
 #include <QHeaderView>
 #include <QMouseEvent>
 #include <QScrollBar>
diff --git a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoView.h b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoView.h
index 31dd7e18..ada137e2 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotCCDVideoView.h
+++ b/product/src/gui/plugin/RobotWidget/CRobotCCDVideoView.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTCCDVIDEOVIEW_H
+#ifndef CROBOTCCDVIDEOVIEW_H
 #define CROBOTCCDVIDEOVIEW_H
 #include <QTableView>
 
diff --git a/product/src/gui/plugin/RobotWidget/CRobotCommon.h b/product/src/gui/plugin/RobotWidget/CRobotCommon.h
index c7a7147d..4400e25f 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotCommon.h
+++ b/product/src/gui/plugin/RobotWidget/CRobotCommon.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTLINKCOMMON_H
+#ifndef CROBOTLINKCOMMON_H
 #define CROBOTLINKCOMMON_H
 
 #include <QSharedPointer>
diff --git a/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp b/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp
index ed79d97c..c8352f3e 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp
+++ b/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.cpp
@@ -1,4 +1,4 @@
-#include "CRobotCtrlWidget.h"
+#include "CRobotCtrlWidget.h"
 #include "SWitchButton.h"
 #include "ui_CRobotCtrlWidget.h"
 #include <QMap>
@@ -507,7 +507,7 @@ bool CRobotCtrlWidget::getSystemInfo()
         LOGERROR("创建系统信息访问库失败");
         return false;
     }
-    if(kbdSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo))
+    if(iotSuccess != m_ptrSysInfo->getLocalNodeInfo(m_stLocalNodeInfo))
     {
         LOGERROR("获取系统信息失败");
         return false;
diff --git a/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.h b/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.h
index 47d6eb7d..d202c810 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.h
+++ b/product/src/gui/plugin/RobotWidget/CRobotCtrlWidget.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTCTRLWIDGET_H
+#ifndef CROBOTCTRLWIDGET_H
 #define CROBOTCTRLWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp b/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp
index e5fc3889..ba6ee631 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp
+++ b/product/src/gui/plugin/RobotWidget/CRobotFileCollect.cpp
@@ -1,4 +1,4 @@
-#include "CRobotFileCollect.h"
+#include "CRobotFileCollect.h"
 #include <QTimer>
 #include "Common.h"
 #include "pub_logger_api/logger.h"
@@ -51,7 +51,7 @@ void CRobotFileCollect::loadConfig()
     std::string loadFilePath;
     config.load(file);
     int error = config.getStringValue("robot_config","loadFilePath",loadFilePath);
-    if( error != kbdSuccess)
+    if( error != iotSuccess)
     {
         m_path = "../../data/test";;
         LOGERROR("机器人加载文件路径解析失败!文件[%s],错误码[%d]",file.c_str(),error);
@@ -84,7 +84,7 @@ void CRobotFileCollect::onTimeLoadFile()
     {
         QFileInfo fileInfo = fileList.at(i);
         RobotFilePtr robotFile(new CRobotFileInfo());
-        if(robotFile->initialize(fileInfo) == kbdSuccess)
+        if(robotFile->initialize(fileInfo) == iotSuccess)
         {
             map.insert(robotFile->m_execPath,robotFile);
 
diff --git a/product/src/gui/plugin/RobotWidget/CRobotFileCollect.h b/product/src/gui/plugin/RobotWidget/CRobotFileCollect.h
index 3a523e55..5b88441d 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotFileCollect.h
+++ b/product/src/gui/plugin/RobotWidget/CRobotFileCollect.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTFILECOLLECT_H
+#ifndef CROBOTFILECOLLECT_H
 #define CROBOTFILECOLLECT_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/RobotWidget/CRobotFileInfo.cpp b/product/src/gui/plugin/RobotWidget/CRobotFileInfo.cpp
index d0515038..d92ab4d0 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotFileInfo.cpp
+++ b/product/src/gui/plugin/RobotWidget/CRobotFileInfo.cpp
@@ -1,4 +1,4 @@
-#include "CRobotFileInfo.h"
+#include "CRobotFileInfo.h"
 #include "QFileInfo"
 #include "pub_logger_api/logger.h"
 #include "Common.h"
@@ -105,7 +105,7 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo)
     if(list.size() != 3)
     {
         LOGERROR("文件[%s]命名格式有误!",m_fileName.toStdString().c_str());
-        return kbdFailed;
+        return iotFailed;
     }
     QString devInt = list.at(0);
     m_devgId = devInt.toInt();
@@ -124,7 +124,7 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo)
         }else
         {
             LOGERROR("文件[%s]后缀格式有误!",m_fileName.toStdString().c_str());
-            return kbdFailed;
+            return iotFailed;
         }
     }else if(timeList.size() == 3)
     {
@@ -134,15 +134,15 @@ int CRobotFileInfo::initialize(const QFileInfo fileInfo)
         }else
         {
             LOGERROR("文件[%s]后缀格式有误!",m_fileName.toStdString().c_str());
-            return kbdFailed;
+            return iotFailed;
         }
     }else
     {
         LOGERROR("文件[%s]命名格式有误!",m_fileName.toStdString().c_str());
-        return kbdFailed;
+        return iotFailed;
     }
     time_stamp = getTime(timeList.at(0));
-    return kbdSuccess;
+    return iotSuccess;
 }
 
 CRobotInfo::CRobotInfo()
diff --git a/product/src/gui/plugin/RobotWidget/CRobotFileInfo.h b/product/src/gui/plugin/RobotWidget/CRobotFileInfo.h
index 7497eff4..0ed98aba 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotFileInfo.h
+++ b/product/src/gui/plugin/RobotWidget/CRobotFileInfo.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTFILEINFO_H
+#ifndef CROBOTFILEINFO_H
 #define CROBOTFILEINFO_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/RobotWidget/CRobotFileMng.cpp b/product/src/gui/plugin/RobotWidget/CRobotFileMng.cpp
index e38e4111..344552a5 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotFileMng.cpp
+++ b/product/src/gui/plugin/RobotWidget/CRobotFileMng.cpp
@@ -1,4 +1,4 @@
-#include "CRobotFileMng.h"
+#include "CRobotFileMng.h"
 
 CRobotFileMng::CRobotFileMng(QObject *parent):
     QObject(parent)
diff --git a/product/src/gui/plugin/RobotWidget/CRobotFileMng.h b/product/src/gui/plugin/RobotWidget/CRobotFileMng.h
index f09466b8..7a0a7e37 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotFileMng.h
+++ b/product/src/gui/plugin/RobotWidget/CRobotFileMng.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTFILEMNG_H
+#ifndef CROBOTFILEMNG_H
 #define CROBOTFILEMNG_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/RobotWidget/CRobotPluginWidget.cpp b/product/src/gui/plugin/RobotWidget/CRobotPluginWidget.cpp
index 7b5f7702..2fd6ecc3 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotPluginWidget.cpp
+++ b/product/src/gui/plugin/RobotWidget/CRobotPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include "CRobotPluginWidget.h"
+#include "CRobotPluginWidget.h"
 #include "CRobotWidget.h"
 #include <QWidget>
 CRobotPluginWidget::CRobotPluginWidget(QObject *parent) : QObject(parent)
diff --git a/product/src/gui/plugin/RobotWidget/CRobotPluginWidget.h b/product/src/gui/plugin/RobotWidget/CRobotPluginWidget.h
index 2f2a30f8..9c502670 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotPluginWidget.h
+++ b/product/src/gui/plugin/RobotWidget/CRobotPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTPLUGINWIDGET_H
+#ifndef CROBOTPLUGINWIDGET_H
 #define CROBOTPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CRobotPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 public:
     CRobotPluginWidget(QObject *parent = nullptr);
diff --git a/product/src/gui/plugin/RobotWidget/CRobotWidget.cpp b/product/src/gui/plugin/RobotWidget/CRobotWidget.cpp
index ff8a884a..7e1e838c 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotWidget.cpp
+++ b/product/src/gui/plugin/RobotWidget/CRobotWidget.cpp
@@ -1,4 +1,4 @@
-#include "CRobotWidget.h"
+#include "CRobotWidget.h"
 #include "ui_CRobotWidget.h"
 #include "CRobotCCDVideoForm.h"
 #include "CRobotAVWidget.h"
diff --git a/product/src/gui/plugin/RobotWidget/CRobotWidget.h b/product/src/gui/plugin/RobotWidget/CRobotWidget.h
index 60400b00..518451da 100644
--- a/product/src/gui/plugin/RobotWidget/CRobotWidget.h
+++ b/product/src/gui/plugin/RobotWidget/CRobotWidget.h
@@ -1,4 +1,4 @@
-#ifndef CROBOTLINKCTRLWIDGET_H
+#ifndef CROBOTLINKCTRLWIDGET_H
 #define CROBOTLINKCTRLWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotWidget/Label.cpp b/product/src/gui/plugin/RobotWidget/Label.cpp
index 6a90966d..a1bcdda2 100644
--- a/product/src/gui/plugin/RobotWidget/Label.cpp
+++ b/product/src/gui/plugin/RobotWidget/Label.cpp
@@ -1,4 +1,4 @@
-#include "Label.h"
+#include "Label.h"
 #include <QFileDialog>
 #include <QMenu>
 Label::Label(QWidget *parent):
diff --git a/product/src/gui/plugin/RobotWidget/Label.h b/product/src/gui/plugin/RobotWidget/Label.h
index 5e1b5dc4..73672aa5 100644
--- a/product/src/gui/plugin/RobotWidget/Label.h
+++ b/product/src/gui/plugin/RobotWidget/Label.h
@@ -1,4 +1,4 @@
-#ifndef LABEL_H
+#ifndef LABEL_H
 #define LABEL_H
 
 #include <QLabel>
diff --git a/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.cpp b/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.cpp
index fc816178..a04d7680 100644
--- a/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.cpp
+++ b/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.cpp
@@ -1,4 +1,4 @@
-#include "OnTimeQueryThread.h"
+#include "OnTimeQueryThread.h"
 #include "pub_logger_api/logger.h"
 #include <QDebug>
 using namespace std;
diff --git a/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.h b/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.h
index 7cf97ab0..407ba602 100644
--- a/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.h
+++ b/product/src/gui/plugin/RobotWidget/OnTimeQueryThread.h
@@ -1,4 +1,4 @@
-#ifndef ONTIMEQUERYTHREAD_H
+#ifndef ONTIMEQUERYTHREAD_H
 #define ONTIMEQUERYTHREAD_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp b/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp
index 8411eb0f..832c8d6e 100644
--- a/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp
+++ b/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.cpp
@@ -1,4 +1,4 @@
-#include "OnTimeRecvThread.h"
+#include "OnTimeRecvThread.h"
 #include "pub_logger_api/logger.h"
 #include <QMessageBox>
 #include "AlarmLinkMessage.pb.h"
@@ -29,13 +29,13 @@ void OnTimeRecvThread::loadConfig()
     CCommonConfigParse config;
     const std::string file = iot_public::CFileUtil::getPathOfCfgFile("robot_config.xml");
     int error = config.load(file);
-    if(error != kbdSuccess)
+    if(error != iotSuccess)
     {
         LOGERROR("机器人加载文件路径解析失败!文件[%s],错误码[%d]",file.c_str(),error);
         return ;
     }
     error = config.getIntValue("robot_config","outTime",m_outTime);
-    if( error != kbdSuccess)
+    if( error != iotSuccess)
     {
         m_outTime = 5;
         LOGERROR("机器人加载文件路径解析失败!文件[%s],错误码[%d]",file.c_str(),error);
diff --git a/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.h b/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.h
index fa75b256..51aad887 100644
--- a/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.h
+++ b/product/src/gui/plugin/RobotWidget/OnTimeRecvThread.h
@@ -1,4 +1,4 @@
-#ifndef ONTIMERECVTHREAD_H
+#ifndef ONTIMERECVTHREAD_H
 #define ONTIMERECVTHREAD_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/RobotWidget/Renderer.cpp b/product/src/gui/plugin/RobotWidget/Renderer.cpp
index 593e1d31..523a204b 100644
--- a/product/src/gui/plugin/RobotWidget/Renderer.cpp
+++ b/product/src/gui/plugin/RobotWidget/Renderer.cpp
@@ -1,4 +1,4 @@
-#include "Renderer.h"
+#include "Renderer.h"
 #include <QMenu>
 #include <QFileDialog>
 Renderer::Renderer(QWidget *parent):
diff --git a/product/src/gui/plugin/RobotWidget/Renderer.h b/product/src/gui/plugin/RobotWidget/Renderer.h
index 86d2a2ef..56481f8e 100644
--- a/product/src/gui/plugin/RobotWidget/Renderer.h
+++ b/product/src/gui/plugin/RobotWidget/Renderer.h
@@ -1,4 +1,4 @@
-#ifndef RENDERER_H
+#ifndef RENDERER_H
 #define RENDERER_H
 #include <QWidget>
 #include <QtAV>
diff --git a/product/src/gui/plugin/RobotWidget/SWitchButton.cpp b/product/src/gui/plugin/RobotWidget/SWitchButton.cpp
index 07fc49e0..78b4130c 100644
--- a/product/src/gui/plugin/RobotWidget/SWitchButton.cpp
+++ b/product/src/gui/plugin/RobotWidget/SWitchButton.cpp
@@ -1,4 +1,4 @@
-#include <QPainter>
+#include <QPainter>
 #include <QMouseEvent>
 #include <QPainterPath>
 #include "SWitchButton.h"
diff --git a/product/src/gui/plugin/RobotWidget/SWitchButton.h b/product/src/gui/plugin/RobotWidget/SWitchButton.h
index e53cc2e8..98b8a8cc 100644
--- a/product/src/gui/plugin/RobotWidget/SWitchButton.h
+++ b/product/src/gui/plugin/RobotWidget/SWitchButton.h
@@ -1,4 +1,4 @@
-#ifndef SWITCHBUTTON_H
+#ifndef SWITCHBUTTON_H
 #define SWITCHBUTTON_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotWidget/Slider.cpp b/product/src/gui/plugin/RobotWidget/Slider.cpp
index 13981231..072a6ba5 100644
--- a/product/src/gui/plugin/RobotWidget/Slider.cpp
+++ b/product/src/gui/plugin/RobotWidget/Slider.cpp
@@ -1,4 +1,4 @@
-#include "Slider.h"
+#include "Slider.h"
 #include <QApplication>
 #include <QMouseEvent>
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotWidget/Slider.h b/product/src/gui/plugin/RobotWidget/Slider.h
index 0ce56d6a..a6d56bf8 100644
--- a/product/src/gui/plugin/RobotWidget/Slider.h
+++ b/product/src/gui/plugin/RobotWidget/Slider.h
@@ -1,4 +1,4 @@
-#ifndef SLIDER_H
+#ifndef SLIDER_H
 #define SLIDER_H
 #include <QSlider>
 
diff --git a/product/src/gui/plugin/RobotWidget/VoiceSlider.cpp b/product/src/gui/plugin/RobotWidget/VoiceSlider.cpp
index 5edc7320..abd1f848 100644
--- a/product/src/gui/plugin/RobotWidget/VoiceSlider.cpp
+++ b/product/src/gui/plugin/RobotWidget/VoiceSlider.cpp
@@ -1,4 +1,4 @@
-#include "VoiceSlider.h"
+#include "VoiceSlider.h"
 #include "ui_VoiceSlider.h"
 
 VoiceSlider::VoiceSlider(int voice,bool bo, QWidget *parent, Qt::WindowFlags f) :
diff --git a/product/src/gui/plugin/RobotWidget/VoiceSlider.h b/product/src/gui/plugin/RobotWidget/VoiceSlider.h
index 192c6bec..b6908cb2 100644
--- a/product/src/gui/plugin/RobotWidget/VoiceSlider.h
+++ b/product/src/gui/plugin/RobotWidget/VoiceSlider.h
@@ -1,4 +1,4 @@
-#ifndef VOICESLIDER_H
+#ifndef VOICESLIDER_H
 #define VOICESLIDER_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/RobotWidget/main.cpp b/product/src/gui/plugin/RobotWidget/main.cpp
index b180ffa8..9a7de17d 100644
--- a/product/src/gui/plugin/RobotWidget/main.cpp
+++ b/product/src/gui/plugin/RobotWidget/main.cpp
@@ -1,4 +1,4 @@
-#include "CRobotWidget.h"
+#include "CRobotWidget.h"
 #include <QApplication>
 #include "pub_logger_api/logger.h"
 #include "net_msg_bus_api/MsgBusApi.h"
diff --git a/product/src/gui/plugin/ScheduleWidget/CDragListWidget.cpp b/product/src/gui/plugin/ScheduleWidget/CDragListWidget.cpp
index 0a615a2e..43787e02 100644
--- a/product/src/gui/plugin/ScheduleWidget/CDragListWidget.cpp
+++ b/product/src/gui/plugin/ScheduleWidget/CDragListWidget.cpp
@@ -1,4 +1,4 @@
-#include "CDragListWidget.h"
+#include "CDragListWidget.h"
 
 CDragListWidget::CDragListWidget( QWidget *parent )
     :QListWidget(parent)
diff --git a/product/src/gui/plugin/ScheduleWidget/CDragListWidget.h b/product/src/gui/plugin/ScheduleWidget/CDragListWidget.h
index efa9a9bd..41d4d2da 100644
--- a/product/src/gui/plugin/ScheduleWidget/CDragListWidget.h
+++ b/product/src/gui/plugin/ScheduleWidget/CDragListWidget.h
@@ -1,4 +1,4 @@
-#ifndef CDRAGLISTWIDGET_H
+#ifndef CDRAGLISTWIDGET_H
 #define CDRAGLISTWIDGET_H
 
 #include <QListWidget>
diff --git a/product/src/gui/plugin/ScheduleWidget/CDropListWidget.cpp b/product/src/gui/plugin/ScheduleWidget/CDropListWidget.cpp
index 9a47cd27..ac4fcd0c 100644
--- a/product/src/gui/plugin/ScheduleWidget/CDropListWidget.cpp
+++ b/product/src/gui/plugin/ScheduleWidget/CDropListWidget.cpp
@@ -1,4 +1,4 @@
-#include "CDropListWidget.h"
+#include "CDropListWidget.h"
 
 CDropListWidget::CDropListWidget()
 {
diff --git a/product/src/gui/plugin/ScheduleWidget/CDropListWidget.h b/product/src/gui/plugin/ScheduleWidget/CDropListWidget.h
index c76610f6..286659cb 100644
--- a/product/src/gui/plugin/ScheduleWidget/CDropListWidget.h
+++ b/product/src/gui/plugin/ScheduleWidget/CDropListWidget.h
@@ -1,4 +1,4 @@
-#ifndef CDROPLISTWIDGET_H
+#ifndef CDROPLISTWIDGET_H
 #define CDROPLISTWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.cpp b/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.cpp
index 97a6398d..0151e91f 100644
--- a/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.cpp
+++ b/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.cpp
@@ -1,4 +1,4 @@
-#include "CDutyDefineDialog.h"
+#include "CDutyDefineDialog.h"
 #include "ui_CDutyDefineDialog.h"
 
 using namespace iot_public;
diff --git a/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.h b/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.h
index 55f2acfd..593c122e 100644
--- a/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.h
+++ b/product/src/gui/plugin/ScheduleWidget/CDutyDefineDialog.h
@@ -1,4 +1,4 @@
-#ifndef CDUTYDEFINEDIALOG_H
+#ifndef CDUTYDEFINEDIALOG_H
 #define CDUTYDEFINEDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/ScheduleWidget/CDutySetting.cpp b/product/src/gui/plugin/ScheduleWidget/CDutySetting.cpp
index 3ff07260..03a0400d 100644
--- a/product/src/gui/plugin/ScheduleWidget/CDutySetting.cpp
+++ b/product/src/gui/plugin/ScheduleWidget/CDutySetting.cpp
@@ -1,4 +1,4 @@
-#include "CDutySetting.h"
+#include "CDutySetting.h"
 #include "ui_CDutySetting.h"
 #include <QMessageBox>
 #include "pub_utility_api/FileStyle.h"
diff --git a/product/src/gui/plugin/ScheduleWidget/CDutySetting.h b/product/src/gui/plugin/ScheduleWidget/CDutySetting.h
index 1d38a5ae..09ec8de8 100644
--- a/product/src/gui/plugin/ScheduleWidget/CDutySetting.h
+++ b/product/src/gui/plugin/ScheduleWidget/CDutySetting.h
@@ -1,4 +1,4 @@
-#ifndef CDUTYSETTING_H
+#ifndef CDUTYSETTING_H
 #define CDUTYSETTING_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/ScheduleWidget/CDutySettingPluginWidget.cpp b/product/src/gui/plugin/ScheduleWidget/CDutySettingPluginWidget.cpp
index d09438d4..40928eb0 100644
--- a/product/src/gui/plugin/ScheduleWidget/CDutySettingPluginWidget.cpp
+++ b/product/src/gui/plugin/ScheduleWidget/CDutySettingPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include "CDutySettingPluginWidget.h"
+#include "CDutySettingPluginWidget.h"
 #include "CDutySetting.h"
 
 CDutySettingPluginWidget::CDutySettingPluginWidget()
diff --git a/product/src/gui/plugin/ScheduleWidget/CDutySettingPluginWidget.h b/product/src/gui/plugin/ScheduleWidget/CDutySettingPluginWidget.h
index fda950c6..ba3e2a04 100644
--- a/product/src/gui/plugin/ScheduleWidget/CDutySettingPluginWidget.h
+++ b/product/src/gui/plugin/ScheduleWidget/CDutySettingPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CDUTYSETTINGPLUGINWIDGET_H
+#ifndef CDUTYSETTINGPLUGINWIDGET_H
 #define CDUTYSETTINGPLUGINWIDGET_H
 
 #include <QObject>
@@ -8,7 +8,7 @@
 class CDutySettingPluginWidget : public QWidget, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/ScheduleWidget/main.cpp b/product/src/gui/plugin/ScheduleWidget/main.cpp
index 2493ad9c..477b1566 100644
--- a/product/src/gui/plugin/ScheduleWidget/main.cpp
+++ b/product/src/gui/plugin/ScheduleWidget/main.cpp
@@ -1,4 +1,4 @@
-#include "CDutySetting.h"
+#include "CDutySetting.h"
 #include <QApplication>
 #include "pub_logger_api/logger.h"
 #include "net_msg_bus_api/MsgBusApi.h"
diff --git a/product/src/gui/plugin/SequenceManageWidget/CHistoryActionModel.cpp b/product/src/gui/plugin/SequenceManageWidget/CHistoryActionModel.cpp
index 0b891be0..3b4c71e9 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CHistoryActionModel.cpp
+++ b/product/src/gui/plugin/SequenceManageWidget/CHistoryActionModel.cpp
@@ -1,4 +1,4 @@
-#include "CHistoryActionModel.h"
+#include "CHistoryActionModel.h"
 
 CHistoryActionTreeModelItem::CHistoryActionTreeModelItem(CHistoryActionTreeModelItem *parent)
     : m_parent(parent)
diff --git a/product/src/gui/plugin/SequenceManageWidget/CHistoryActionModel.h b/product/src/gui/plugin/SequenceManageWidget/CHistoryActionModel.h
index e27d330d..7b706fed 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CHistoryActionModel.h
+++ b/product/src/gui/plugin/SequenceManageWidget/CHistoryActionModel.h
@@ -1,4 +1,4 @@
-#ifndef CHISTORYACTIONMODEL_H
+#ifndef CHISTORYACTIONMODEL_H
 #define CHISTORYACTIONMODEL_H
 
 #include <QAbstractItemModel>
diff --git a/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceFilterDialog.cpp b/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceFilterDialog.cpp
index f1eb4ba6..37316d4f 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceFilterDialog.cpp
+++ b/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceFilterDialog.cpp
@@ -1,4 +1,4 @@
-#include "CHistorySequenceFilterDialog.h"
+#include "CHistorySequenceFilterDialog.h"
 #include "ui_CHistorySequenceFilterDialog.h"
 
 CHistorySequenceFilterDialog::CHistorySequenceFilterDialog(QStringList locationList, QStringList userNameList, QWidget *parent) :
diff --git a/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceFilterDialog.h b/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceFilterDialog.h
index 413200fc..1836a173 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceFilterDialog.h
+++ b/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceFilterDialog.h
@@ -1,4 +1,4 @@
-#ifndef CHISTORYSEQUENCEFILTERDIALOG_H
+#ifndef CHISTORYSEQUENCEFILTERDIALOG_H
 #define CHISTORYSEQUENCEFILTERDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceModel.h b/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceModel.h
index 4ad79469..6a085dbf 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceModel.h
+++ b/product/src/gui/plugin/SequenceManageWidget/CHistorySequenceModel.h
@@ -1,4 +1,4 @@
-#ifndef CHISTORYSEQUENCEMODEL_H
+#ifndef CHISTORYSEQUENCEMODEL_H
 #define CHISTORYSEQUENCEMODEL_H
 
 #include <QAbstractItemModel>
diff --git a/product/src/gui/plugin/SequenceManageWidget/CHistroySequenceModel.cpp b/product/src/gui/plugin/SequenceManageWidget/CHistroySequenceModel.cpp
index 9c1158aa..9dea4d75 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CHistroySequenceModel.cpp
+++ b/product/src/gui/plugin/SequenceManageWidget/CHistroySequenceModel.cpp
@@ -1,4 +1,4 @@
-#include "CHistorySequenceModel.h"
+#include "CHistorySequenceModel.h"
 #include <QDateTime>
 
 CHistorySequenceModel::CHistorySequenceModel(QObject *parent)
diff --git a/product/src/gui/plugin/SequenceManageWidget/CRunSequenceFilterDialog.cpp b/product/src/gui/plugin/SequenceManageWidget/CRunSequenceFilterDialog.cpp
index a120aeab..c2c49012 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CRunSequenceFilterDialog.cpp
+++ b/product/src/gui/plugin/SequenceManageWidget/CRunSequenceFilterDialog.cpp
@@ -1,4 +1,4 @@
-#include "CRunSequenceFilterDialog.h"
+#include "CRunSequenceFilterDialog.h"
 #include "ui_CRunSequenceFilterDialog.h"
 
 CRunSequenceFilterDialog::CRunSequenceFilterDialog(QStringList locationList, QWidget *parent) :
diff --git a/product/src/gui/plugin/SequenceManageWidget/CRunSequenceFilterDialog.h b/product/src/gui/plugin/SequenceManageWidget/CRunSequenceFilterDialog.h
index d9eedd4d..54c722d2 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CRunSequenceFilterDialog.h
+++ b/product/src/gui/plugin/SequenceManageWidget/CRunSequenceFilterDialog.h
@@ -1,4 +1,4 @@
-#ifndef CRUNSEQUENCEFILTERDIALOG_H
+#ifndef CRUNSEQUENCEFILTERDIALOG_H
 #define CRUNSEQUENCEFILTERDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/SequenceManageWidget/CRunningSequenceModel.cpp b/product/src/gui/plugin/SequenceManageWidget/CRunningSequenceModel.cpp
index 686d0b7c..012d5c5b 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CRunningSequenceModel.cpp
+++ b/product/src/gui/plugin/SequenceManageWidget/CRunningSequenceModel.cpp
@@ -1,4 +1,4 @@
-#include "CRunningSequenceModel.h"
+#include "CRunningSequenceModel.h"
 #include <QDateTime>
 
 CRunningSequenceModel::CRunningSequenceModel(QObject *parent)
diff --git a/product/src/gui/plugin/SequenceManageWidget/CRunningSequenceModel.h b/product/src/gui/plugin/SequenceManageWidget/CRunningSequenceModel.h
index 93fe9313..9f73da7c 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CRunningSequenceModel.h
+++ b/product/src/gui/plugin/SequenceManageWidget/CRunningSequenceModel.h
@@ -1,4 +1,4 @@
-#ifndef CRUNNINGSEQUENCEMODEL_H
+#ifndef CRUNNINGSEQUENCEMODEL_H
 #define CRUNNINGSEQUENCEMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.cpp b/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.cpp
index 97ace779..81d9dad0 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.cpp
+++ b/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.cpp
@@ -1,4 +1,4 @@
-#include "CSequenceDBInterface.h"
+#include "CSequenceDBInterface.h"
 #include "public/pub_sysinfo_api/SysInfoApi.h"
 #include "../../idl_files/SequenceMessage.pb.h"
 #include "../../idl_files/RdbServerMessage.pb.h"
@@ -281,7 +281,7 @@ QList<Sequence> CSequenceDBInterface::queryRunSequenceNodeList()
     }
     //<查询顺控
     QSqlQuery query;
-    QString sqlSequenceQuery = QString("select name, description, seq_type, location_id, timeflag from %1").arg(SEQUENCE_SETTING);
+    QString sqlSequenceQuery = QString("select name, description, seq_type, location_id, timeflag from %1 order by name").arg(SEQUENCE_SETTING);
     m_pReadDb->execute(sqlSequenceQuery, query);
     if(query.isActive())
     {
diff --git a/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.h b/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.h
index 0588a4b6..1be9ef28 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.h
+++ b/product/src/gui/plugin/SequenceManageWidget/CSequenceDBInterface.h
@@ -1,4 +1,4 @@
-#ifndef CSEQUENCEDBINTERFACE_H
+#ifndef CSEQUENCEDBINTERFACE_H
 #define CSEQUENCEDBINTERFACE_H
 
 #include "sequence_history_def.h"
diff --git a/product/src/gui/plugin/SequenceManageWidget/CSequenceManagePluginWidget.cpp b/product/src/gui/plugin/SequenceManageWidget/CSequenceManagePluginWidget.cpp
index aa5d8b9a..a1d98108 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CSequenceManagePluginWidget.cpp
+++ b/product/src/gui/plugin/SequenceManageWidget/CSequenceManagePluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CSequenceManagePluginWidget.h"
 #include "CSequenceManageWidget.h"
 
diff --git a/product/src/gui/plugin/SequenceManageWidget/CSequenceManagePluginWidget.h b/product/src/gui/plugin/SequenceManageWidget/CSequenceManagePluginWidget.h
index 3ada2956..77c7192e 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CSequenceManagePluginWidget.h
+++ b/product/src/gui/plugin/SequenceManageWidget/CSequenceManagePluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CSEQUENCEMANAGEPLUGINWIDGET_H
+#ifndef CSEQUENCEMANAGEPLUGINWIDGET_H
 #define CSEQUENCEMANAGEPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CSequenceManagePluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.cpp b/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.cpp
index 8dc6180f..f796b9a1 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.cpp
+++ b/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.cpp
@@ -1,4 +1,4 @@
-#include <QHBoxLayout>
+#include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QPrinter>
 #include <QThread>
diff --git a/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.h b/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.h
index fbc276ad..92f7c214 100644
--- a/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.h
+++ b/product/src/gui/plugin/SequenceManageWidget/CSequenceManageWidget.h
@@ -1,4 +1,4 @@
-#ifndef CSEQUENCEMANAGEWIDGET_H
+#ifndef CSEQUENCEMANAGEWIDGET_H
 #define CSEQUENCEMANAGEWIDGET_H
 
 #include "CRunSequenceFilterDialog.h"
diff --git a/product/src/gui/plugin/SequenceManageWidget/main.cpp b/product/src/gui/plugin/SequenceManageWidget/main.cpp
index b727db70..a5167b44 100644
--- a/product/src/gui/plugin/SequenceManageWidget/main.cpp
+++ b/product/src/gui/plugin/SequenceManageWidget/main.cpp
@@ -1,4 +1,4 @@
-#include "CSequenceManageWidget.h"
+#include "CSequenceManageWidget.h"
 #include <QApplication>
 #include "pub_logger_api/logger.h"
 #include "net_msg_bus_api/MsgBusApi.h"
diff --git a/product/src/gui/plugin/SequenceManageWidget/sequence_history_def.h b/product/src/gui/plugin/SequenceManageWidget/sequence_history_def.h
index d7ffdd95..46a3b6e3 100644
--- a/product/src/gui/plugin/SequenceManageWidget/sequence_history_def.h
+++ b/product/src/gui/plugin/SequenceManageWidget/sequence_history_def.h
@@ -1,4 +1,4 @@
-#ifndef SEQUENCE_HISTORY_DEF_H
+#ifndef SEQUENCE_HISTORY_DEF_H
 #define SEQUENCE_HISTORY_DEF_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/SequenceWidget/CActionSequModel.cpp b/product/src/gui/plugin/SequenceWidget/CActionSequModel.cpp
index f927c6de..0ed7a838 100644
--- a/product/src/gui/plugin/SequenceWidget/CActionSequModel.cpp
+++ b/product/src/gui/plugin/SequenceWidget/CActionSequModel.cpp
@@ -1,4 +1,4 @@
-#include "CActionSequModel.h"
+#include "CActionSequModel.h"
 
 CActionSequModel::CActionSequModel(QObject *parent)
     : QAbstractTableModel(parent)
diff --git a/product/src/gui/plugin/SequenceWidget/CActionSequModel.h b/product/src/gui/plugin/SequenceWidget/CActionSequModel.h
index b65745aa..c96d42ce 100644
--- a/product/src/gui/plugin/SequenceWidget/CActionSequModel.h
+++ b/product/src/gui/plugin/SequenceWidget/CActionSequModel.h
@@ -1,4 +1,4 @@
-#ifndef CACTIONSEQUMODEL_H
+#ifndef CACTIONSEQUMODEL_H
 #define CACTIONSEQUMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/SequenceWidget/CLocationSequModel.cpp b/product/src/gui/plugin/SequenceWidget/CLocationSequModel.cpp
index 85c5a56e..89fd7e42 100644
--- a/product/src/gui/plugin/SequenceWidget/CLocationSequModel.cpp
+++ b/product/src/gui/plugin/SequenceWidget/CLocationSequModel.cpp
@@ -1,4 +1,4 @@
-#include "CLocationSequModel.h"
+#include "CLocationSequModel.h"
 
 CLocationSequModel::CLocationSequModel(QObject *parent)
     : QAbstractTableModel(parent)
diff --git a/product/src/gui/plugin/SequenceWidget/CLocationSequModel.h b/product/src/gui/plugin/SequenceWidget/CLocationSequModel.h
index 0ebac724..ba3273da 100644
--- a/product/src/gui/plugin/SequenceWidget/CLocationSequModel.h
+++ b/product/src/gui/plugin/SequenceWidget/CLocationSequModel.h
@@ -1,4 +1,4 @@
-#ifndef CLOCATIONSEQUMODEL_H
+#ifndef CLOCATIONSEQUMODEL_H
 #define CLOCATIONSEQUMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp
index e250d977..fd33d666 100644
--- a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp
+++ b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApi.cpp
@@ -1,4 +1,4 @@
-#include "application/sequence_server_api/CSeqForHmiApi.h"
+#include "application/sequence_server_api/CSeqForHmiApi.h"
 #include "CSeqForHmiApiImpl.h"
 
 using namespace iot_app;
diff --git a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp
index b61d2f32..f4005a7a 100644
--- a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp
+++ b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.cpp
@@ -1,4 +1,4 @@
-#include "public/pub_logger_api/logger.h"
+#include "public/pub_logger_api/logger.h"
 #include "MessageChannel.h"
 #include "Common.h"
 
diff --git a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h
index b9a74e00..d35e9e87 100644
--- a/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h
+++ b/product/src/gui/plugin/SequenceWidget/CSeqForHmiApiImpl.h
@@ -1,4 +1,4 @@
-#ifndef CSEQUENCEFORHMIAPIIMPL_H
+#ifndef CSEQUENCEFORHMIAPIIMPL_H
 #define CSEQUENCEFORHMIAPIIMPL_H
 
 #include <string>
diff --git a/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.cpp b/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.cpp
index 887c6999..08def238 100644
--- a/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.cpp
+++ b/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.cpp
@@ -1,4 +1,4 @@
-#include "CSeqPermDialog.h"
+#include "CSeqPermDialog.h"
 #include "ui_CSeqPermDialog.h"
 #include <QMessageBox>
 #include <vector>
@@ -282,6 +282,8 @@ void CSeqPermDialog::slotGuardUserGrpChange(int index)
 
 void CSeqPermDialog::slotGuardUserChange(int index)
 {
+    Q_UNUSED(index);
+
     slotGuardUserChange();
 }
 
diff --git a/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.h b/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.h
index 6bcf5421..d3db29dd 100644
--- a/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.h
+++ b/product/src/gui/plugin/SequenceWidget/CSeqPermDialog.h
@@ -1,4 +1,4 @@
-#ifndef CSEQPERMDIALOG_H
+#ifndef CSEQPERMDIALOG_H
 #define CSEQPERMDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.cpp b/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.cpp
index 54ba0d5e..239e4aad 100644
--- a/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.cpp
+++ b/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.cpp
@@ -1,4 +1,4 @@
-#include "CSequenceDataManage.h"
+#include "CSequenceDataManage.h"
 #include "public/pub_sysinfo_api/SysInfoApi.h"
 #include "../../idl_files/SequenceMessage.pb.h"
 #include "../../idl_files/RdbServerMessage.pb.h"
@@ -269,37 +269,39 @@ QList<Sequence> CSequenceDataManage::querySequenceList(const QStringList &seqNam
         return sequenceList;
     }
 
-    QStringList strLoaclDomainSequenceName;
     if(!m_pReadDb->isOpen())
     {
         return sequenceList;
     }
+
+    QString strSeqNameFilter = QString("in('%1')").arg(seqNameList.join("','"));
     //<查询顺控
     QSqlQuery query;
-    QString sqlSequenceQuery = QString("select name, description, seq_type, location_id, timeflag from %1").arg(SEQUENCE_SETTING);
+    QString sqlSequenceQuery = QString("select name, description, seq_type, location_id, timeflag from %1 where name %2 order by name asc").arg(SEQUENCE_SETTING).arg(strSeqNameFilter);
     m_pReadDb->execute(sqlSequenceQuery, query);
     if(query.isActive())
     {
         while(query.next())
         {
             QString seqName = query.value(0).toString();
-            if(seqNameList.contains(seqName))
-            {
-                Sequence sequence;
-                sequence.seqName = seqName;
-                sequence.seqDescription = query.value(1).toString();
-                sequence.seqType = query.value(2).toInt();
-                sequence.locationID = query.value(3).toInt();
-                sequence.location = queryLocationName(sequence.locationID);
-                sequence.timeFlag = query.value(4).toULongLong();
-                sequence.nodeType = E_Node_Sequence;
-                sequenceList.append(sequence);
-                strLoaclDomainSequenceName.append(seqName);
-            }
+            Sequence sequence;
+            sequence.seqName = seqName;
+            sequence.seqDescription = query.value(1).toString();
+            sequence.seqType = query.value(2).toInt();
+            sequence.locationID = query.value(3).toInt();
+            sequence.location = queryLocationName(sequence.locationID);
+            sequence.timeFlag = query.value(4).toULongLong();
+            sequence.nodeType = E_Node_Sequence;
+            sequenceList.append(sequence);
         }
     }
 
-        //<查询功能
+    if(sequenceList.empty())
+    {
+        return sequenceList;
+    }
+
+    //<查询功能
     QList<Sequence> functionList;
     QString sqlFunctionQuery = QString("SELECT DISTINCT\
                                         %1.seq_name, \
@@ -307,115 +309,94 @@ QList<Sequence> CSequenceDataManage::querySequenceList(const QStringList &seqNam
                                         %2.description, \
                                         %1.func_no, \
                                         %1.timeflag \
-                                      FROM \
-                                        %1 LEFT JOIN %2 ON    \
-                                        %1.func_name = %2.name").arg(SEQUENCE_DEFINE).arg(SEQUENCE_FUNCTION);
+                                        FROM \
+                                        %1 INNER JOIN %2 ON \
+                                        %1.seq_name %3 AND \
+                                        %1.func_name = %2.name \
+                                        ORDER BY seq_name ASC,func_no ASC").arg(SEQUENCE_DEFINE).arg(SEQUENCE_FUNCTION).arg(strSeqNameFilter);
     m_pReadDb->execute(sqlFunctionQuery, query);
     if(query.isActive())
     {
         while(query.next())
         {
-                QString seqName = query.value(0).toString();
-                if(seqNameList.contains(seqName) && strLoaclDomainSequenceName.contains(seqName))
-                {
-                    Sequence function;
-                    function.seqName = seqName;
-                    function.funcName = query.value(1).toString();
-                    function.funcDescription = query.value(2).toString();
-                    function.funcNo = query.value(3).toInt();
-                    function.timeFlag = query.value(4).toULongLong();
-                    function.nodeType = E_Node_Function;
+            QString seqName = query.value(0).toString();
+            Sequence function;
+            function.seqName = seqName;
+            function.funcName = query.value(1).toString();
+            function.funcDescription = query.value(2).toString();
+            function.funcNo = query.value(3).toInt();
+            function.timeFlag = query.value(4).toULongLong();
+            function.nodeType = E_Node_Function;
 
-                    bool result = false;
-                    for (int nIndex(0); nIndex < functionList.size(); nIndex++)
-                    {
-                        if (function.funcNo < functionList[nIndex].funcNo)
-                        {
-                            functionList.insert(nIndex, function);
-                            result = true;
-                            break;
-                        }
-                    }
-                    if (!result)
-                    {
-                        functionList.append(function);
-                    }
-                }
+            functionList.append(function);
          }
          sequenceList.append(functionList);
      }
 
-        //<查询动作
-     for(int functionIndex(0); functionIndex < functionList.size(); functionIndex++)
-     {
-            QList<Sequence> actionList;
-            QString sqlActionQuery = QString("SELECT            \
-                                             %1.seq_name,       \
-                                             %1.func_name,      \
-                                             %1.func_no,        \
-                                             %2.action_name,    \
-                                             %2.action_no,      \
-                                             %2.delaytime,      \
-                                             %3.key_id_tag,     \
-                                             %3.timeflag,       \
-                                             %3.target_value,   \
-                                             %3.location_id,    \
-                                             %3.sub_system,     \
-                                             %3.description     \
-                                         FROM   \
-                                             %1, %2, %3    \
-                                         WHERE  \
-                                             %1.func_name = '%4'      \
-                                         AND %1.func_name = %2.name     \
-                                         AND %2.action_name = %3.name").arg(SEQUENCE_DEFINE).arg(SEQUENCE_FUNCTION).arg(SEQUENCE_ACTION).arg(functionList[functionIndex].funcName);
+    if(functionList.empty())
+    {
+       return sequenceList;
+    }
 
-            m_pReadDb->execute(sqlActionQuery, query);
-            if(query.isActive())
-            {
-                while(query.next())
-                {
-                    QString seqName = query.value(0).toString();
-                    if(seqNameList.contains(seqName) && strLoaclDomainSequenceName.contains(seqName))
-                    {
-                        Sequence action;
-                        action.seqName = seqName;
-                        action.funcName = query.value(1).toString();
-                        action.funcNo = query.value(2).toInt();
-                        action.actionName = query.value(3).toString();
-                        action.actionNo = query.value(4).toInt();
-                        action.delay = query.value(5).toInt();
-                        action.tagInfo = query.value(6).toString();
-                        QStringList strListTagInfo = action.tagInfo.split(".");
-                        action.tagName = queryTagName(strListTagInfo.first(), action.tagInfo.section(".", 1, strListTagInfo.size() - 2));
-                        action.timeFlag = query.value(7).toULongLong();
-                        QString strTagTextName = queryTagTextName(strListTagInfo.first(), action.tagInfo.section(".", 1, strListTagInfo.size() - 2));
-                        action.targetState = queryStateName(strTagTextName, query.value(8).toInt());
-                        action.locationID = query.value(9).toInt();
-                        action.location = queryLocationName(action.locationID);
-                        action.subSystemID = query.value(10).toInt();
-                        action.actionDescription = query.value(11).toString();
-                        action.nodeType = E_Node_Action;
+    //查询动作
+    QStringList listFuncName;
+    foreach(Sequence seq , functionList)
+    {
+        listFuncName << seq.funcName;
+    }
+
+    QString strFuncNameFilter = QString("in('%1')").arg(listFuncName.join("','"));
+    QList<Sequence> actionList;
+    QString sqlActionQuery = QString("SELECT            \
+                                     %1.seq_name,       \
+                                     %1.func_name,      \
+                                     %1.func_no,        \
+                                     %2.action_name,    \
+                                     %2.action_no,      \
+                                     %2.delaytime,      \
+                                     %3.key_id_tag,     \
+                                     %3.timeflag,       \
+                                     %3.target_value,   \
+                                     %3.location_id,    \
+                                     %3.sub_system,     \
+                                     %3.description     \
+                                     FROM   \
+                                     %1, %2, %3    \
+                                     WHERE  \
+                                     %1.func_name %4      \
+                                     AND %1.func_name = %2.name     \
+                                     AND %2.action_name = %3.name \
+                                     ORDER BY func_no ASC,action_no ASC").arg(SEQUENCE_DEFINE).arg(SEQUENCE_FUNCTION).arg(SEQUENCE_ACTION).arg(strFuncNameFilter);
+
+    m_pReadDb->execute(sqlActionQuery, query);
+    if(query.isActive())
+    {
+        while(query.next())
+        {
+            QString seqName = query.value(0).toString();
+            Sequence action;
+            action.seqName = seqName;
+            action.funcName = query.value(1).toString();
+            action.funcNo = query.value(2).toInt();
+            action.actionName = query.value(3).toString();
+            action.actionNo = query.value(4).toInt();
+            action.delay = query.value(5).toInt();
+            action.tagInfo = query.value(6).toString();
+            QStringList strListTagInfo = action.tagInfo.split(".");
+            action.tagName = queryTagName(strListTagInfo.first(), action.tagInfo.section(".", 1, strListTagInfo.size() - 2));
+            action.timeFlag = query.value(7).toULongLong();
+            QString strTagTextName = queryTagTextName(strListTagInfo.first(), action.tagInfo.section(".", 1, strListTagInfo.size() - 2));
+            action.targetState = queryStateName(strTagTextName, query.value(8).toInt());
+            action.locationID = query.value(9).toInt();
+            action.location = queryLocationName(action.locationID);
+            action.subSystemID = query.value(10).toInt();
+            action.actionDescription = query.value(11).toString();
+            action.nodeType = E_Node_Action;
+
+            actionList.append(action);
+        }
+        sequenceList.append(actionList);
+    }
 
-                        bool result = false;
-                        for (int nIndex(0); nIndex < actionList.size(); nIndex++)
-                        {
-                            if (action.actionNo < actionList[nIndex].actionNo)
-                            {
-                                actionList.insert(nIndex, action);
-                                result = true;
-                                break;
-                            }
-                        }
-                        if (!result)
-                        {
-                            actionList.append(action);
-                        }
-                    }
-                }
-                sequenceList.append(actionList);
-            }
-     }
      return sequenceList;
 }
-
-
diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.h b/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.h
index 328b4cd4..efdf5253 100644
--- a/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.h
+++ b/product/src/gui/plugin/SequenceWidget/CSequenceDataManage.h
@@ -1,4 +1,4 @@
-#ifndef CSEQUENCEDATAMANAGE_H
+#ifndef CSEQUENCEDATAMANAGE_H
 #define CSEQUENCEDATAMANAGE_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.cpp b/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.cpp
index d0766bf0..7a8d0815 100644
--- a/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.cpp
+++ b/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.cpp
@@ -1,4 +1,4 @@
-#include "CSequenceMsgHandle.h"
+#include "CSequenceMsgHandle.h"
 #include "CSequenceDataManage.h"
 #include "../../idl_files/SequenceMessage.pb.h"
 
diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h b/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h
index 50a46c62..d1ab88b6 100644
--- a/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h
+++ b/product/src/gui/plugin/SequenceWidget/CSequenceMsgHandle.h
@@ -1,4 +1,4 @@
-#ifndef CSEQUENCEMSGHANDLE_H
+#ifndef CSEQUENCEMSGHANDLE_H
 #define CSEQUENCEMSGHANDLE_H
 
 #include "application/sequence_server_api/CSeqForHmiApi.h"
diff --git a/product/src/gui/plugin/SequenceWidget/CSequencePluginWidget.cpp b/product/src/gui/plugin/SequenceWidget/CSequencePluginWidget.cpp
index 7b9a3ea3..1d4e6e76 100644
--- a/product/src/gui/plugin/SequenceWidget/CSequencePluginWidget.cpp
+++ b/product/src/gui/plugin/SequenceWidget/CSequencePluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CSequencePluginWidget.h"
 #include "CSequenceWidget.h"
 
diff --git a/product/src/gui/plugin/SequenceWidget/CSequencePluginWidget.h b/product/src/gui/plugin/SequenceWidget/CSequencePluginWidget.h
index 6546287b..5aec4b05 100644
--- a/product/src/gui/plugin/SequenceWidget/CSequencePluginWidget.h
+++ b/product/src/gui/plugin/SequenceWidget/CSequencePluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CSEQUENCEPLUGINWIDGET_H
+#ifndef CSEQUENCEPLUGINWIDGET_H
 #define CSEQUENCEPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CSequencePluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.cpp b/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.cpp
index 900f8b5b..7847d045 100644
--- a/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.cpp
+++ b/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.cpp
@@ -1,4 +1,4 @@
-#include "CSequenceStateManage.h"
+#include "CSequenceStateManage.h"
 #include "public/pub_sysinfo_api/SysInfoApi.h"
 #include "../../idl_files/SequenceMessage.pb.h"
 #include "../../idl_files/RdbServerMessage.pb.h"
@@ -308,7 +308,7 @@ QString CSequenceStateManage::queryTagTextName(const QString &strTableName, cons
         return QString();
     }
     QSqlQuery query;
-    QString sqlQuery = QString("select state_text_name from %1 where tag_name = '%2'").arg(strTableName.toLower()).arg(strTaginfo.toLower());
+    QString sqlQuery = QString("select state_text_name from %1 where tag_name = '%2'").arg(strTableName.toLower()).arg(strTaginfo);
     m_pReadDb->execute(sqlQuery, query);
     if(query.isActive())
     {
diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.h b/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.h
index a76fd177..033d7fe9 100644
--- a/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.h
+++ b/product/src/gui/plugin/SequenceWidget/CSequenceStateManage.h
@@ -1,4 +1,4 @@
-#ifndef CSEQUENCESTATEMANAGE_H
+#ifndef CSEQUENCESTATEMANAGE_H
 #define CSEQUENCESTATEMANAGE_H
 
 #include <QObject>
diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceWidget.cpp b/product/src/gui/plugin/SequenceWidget/CSequenceWidget.cpp
index 1599f40b..5f99172a 100644
--- a/product/src/gui/plugin/SequenceWidget/CSequenceWidget.cpp
+++ b/product/src/gui/plugin/SequenceWidget/CSequenceWidget.cpp
@@ -1,4 +1,4 @@
-#include "CSequenceWidget.h"
+#include "CSequenceWidget.h"
 #include "ui_CSequenceWidget.h"
 #include <QThread>
 #include <QMessageBox>
diff --git a/product/src/gui/plugin/SequenceWidget/CSequenceWidget.h b/product/src/gui/plugin/SequenceWidget/CSequenceWidget.h
index 326a2749..e21d6e04 100644
--- a/product/src/gui/plugin/SequenceWidget/CSequenceWidget.h
+++ b/product/src/gui/plugin/SequenceWidget/CSequenceWidget.h
@@ -1,4 +1,4 @@
-#ifndef CSEQUENCEWIDGET_H
+#ifndef CSEQUENCEWIDGET_H
 #define CSEQUENCEWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/SequenceWidget/main.cpp b/product/src/gui/plugin/SequenceWidget/main.cpp
index 32d911d5..37b25da6 100644
--- a/product/src/gui/plugin/SequenceWidget/main.cpp
+++ b/product/src/gui/plugin/SequenceWidget/main.cpp
@@ -1,4 +1,4 @@
-#include "CSequenceWidget.h"
+#include "CSequenceWidget.h"
 #include <QApplication>
 #include "pub_logger_api/logger.h"
 #include "net_msg_bus_api/MsgBusApi.h"
diff --git a/product/src/gui/plugin/SequenceWidget/sequence_def.h b/product/src/gui/plugin/SequenceWidget/sequence_def.h
index 78a4ccbf..324cd1f8 100644
--- a/product/src/gui/plugin/SequenceWidget/sequence_def.h
+++ b/product/src/gui/plugin/SequenceWidget/sequence_def.h
@@ -1,4 +1,4 @@
-#ifndef SEQUENCE_DEF_H
+#ifndef SEQUENCE_DEF_H
 #define SEQUENCE_DEF_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/SequenceWidget/sequence_global.h b/product/src/gui/plugin/SequenceWidget/sequence_global.h
index 0f5c2e65..651c2f71 100644
--- a/product/src/gui/plugin/SequenceWidget/sequence_global.h
+++ b/product/src/gui/plugin/SequenceWidget/sequence_global.h
@@ -1,4 +1,4 @@
-#ifndef SEQUENCE_GLOBAL_H
+#ifndef SEQUENCE_GLOBAL_H
 #define SEQUENCE_GLOBAL_H
 
 #if defined(SEQUENCE_LIBRARY)
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.cpp b/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.cpp
index 9d9d64fa..c1d8da74 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.cpp
+++ b/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.cpp
@@ -1,4 +1,4 @@
-#include "CDataManage.h"
+#include "CDataManage.h"
 #include "pub_logger_api/logger.h"
 
 CDataManage *CDataManage::m_pInstance = NULL;
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.h b/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.h
index 1776e1f8..113f34a2 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.h
+++ b/product/src/gui/plugin/SerialDevStatusWidget/CDataManage.h
@@ -1,4 +1,4 @@
-#ifndef CDATAMANAGE_H
+#ifndef CDATAMANAGE_H
 #define CDATAMANAGE_H
 
 #include <QMap>
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.cpp b/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.cpp
index b6a16ce8..fac8e7ff 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.cpp
+++ b/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.cpp
@@ -1,4 +1,4 @@
-#include "CRealDataCollect.h"
+#include "CRealDataCollect.h"
 #include <QTimer>
 #include <QVariant>
 
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.h b/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.h
index 00e67155..1c28a8c9 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.h
+++ b/product/src/gui/plugin/SerialDevStatusWidget/CRealDataCollect.h
@@ -1,4 +1,4 @@
-#ifndef CREALDATACOLLECT_H
+#ifndef CREALDATACOLLECT_H
 #define CREALDATACOLLECT_H
 
 #include <QMap>
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CSeriaCommon.h b/product/src/gui/plugin/SerialDevStatusWidget/CSeriaCommon.h
index 3f701890..64ba6cf9 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/CSeriaCommon.h
+++ b/product/src/gui/plugin/SerialDevStatusWidget/CSeriaCommon.h
@@ -1,4 +1,4 @@
-#ifndef CSERIACOMMON_H
+#ifndef CSERIACOMMON_H
 #define CSERIACOMMON_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevPluginWidget.cpp b/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevPluginWidget.cpp
index 3a25eef2..3ec000ea 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevPluginWidget.cpp
+++ b/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include "CSeriaDevPluginWidget.h"
+#include "CSeriaDevPluginWidget.h"
 #include "CSerialDevStatusWidget.h"
 
 CSeriaDevPluginWidget::CSeriaDevPluginWidget(QObject *parent) : QObject(parent)
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevPluginWidget.h b/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevPluginWidget.h
index d9b6ca4f..a3bf6c73 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevPluginWidget.h
+++ b/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CSERIADEVPLUGINWIDGET_H
+#ifndef CSERIADEVPLUGINWIDGET_H
 #define CSERIADEVPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CSeriaDevPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 
 public:
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevTableModel.cpp b/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevTableModel.cpp
index b382b8f9..50c238cb 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevTableModel.cpp
+++ b/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevTableModel.cpp
@@ -1,4 +1,4 @@
-#include "CSeriaDevTableModel.h"
+#include "CSeriaDevTableModel.h"
 #include <QBrush>
 
 CSeriaDevTableModel::CSeriaDevTableModel(QObject *parent)
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevTableModel.h b/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevTableModel.h
index 92577db5..8c987505 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevTableModel.h
+++ b/product/src/gui/plugin/SerialDevStatusWidget/CSeriaDevTableModel.h
@@ -1,4 +1,4 @@
-#ifndef CSERIADEVTABLEMODEL_H
+#ifndef CSERIADEVTABLEMODEL_H
 #define CSERIADEVTABLEMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.cpp b/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.cpp
index aa282340..e9ac5cc8 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.cpp
+++ b/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.cpp
@@ -1,4 +1,4 @@
-#include "CSerialDevStatusWidget.h"
+#include "CSerialDevStatusWidget.h"
 #include "CSeriaDevTableModel.h"
 #include "CDataManage.h"
 #include "CRealDataCollect.h"
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.h b/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.h
index 5cdf736f..ab1af11b 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.h
+++ b/product/src/gui/plugin/SerialDevStatusWidget/CSerialDevStatusWidget.h
@@ -1,4 +1,4 @@
-#ifndef CSERIALDEVSTATUSWIDGET_H
+#ifndef CSERIALDEVSTATUSWIDGET_H
 #define CSERIALDEVSTATUSWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/SerialDevStatusWidget/main.cpp b/product/src/gui/plugin/SerialDevStatusWidget/main.cpp
index 81c6e4f4..171aa3c1 100644
--- a/product/src/gui/plugin/SerialDevStatusWidget/main.cpp
+++ b/product/src/gui/plugin/SerialDevStatusWidget/main.cpp
@@ -1,4 +1,4 @@
-#include "CSerialDevStatusWidget.h"
+#include "CSerialDevStatusWidget.h"
 #include <QApplication>
 #include "pub_logger_api/logger.h"
 #include "dp_chg_data_api/CDpcdaForApp.h"
diff --git a/product/src/gui/plugin/SimOptWidget/CSimOptCommon.h b/product/src/gui/plugin/SimOptWidget/CSimOptCommon.h
index 62190716..1ae024d3 100644
--- a/product/src/gui/plugin/SimOptWidget/CSimOptCommon.h
+++ b/product/src/gui/plugin/SimOptWidget/CSimOptCommon.h
@@ -1,4 +1,4 @@
-#ifndef CSIMOPTCOMMON_H
+#ifndef CSIMOPTCOMMON_H
 #define CSIMOPTCOMMON_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/SimOptWidget/CSimOptPluginWidget.cpp b/product/src/gui/plugin/SimOptWidget/CSimOptPluginWidget.cpp
index ec2fe03e..19452082 100644
--- a/product/src/gui/plugin/SimOptWidget/CSimOptPluginWidget.cpp
+++ b/product/src/gui/plugin/SimOptWidget/CSimOptPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include "CSimOptPluginWidget.h"
+#include "CSimOptPluginWidget.h"
 #include "CSimOptWidget.h"
 CSimOptPluginWidget::CSimOptPluginWidget(QObject *parent): QObject(parent)
 {
diff --git a/product/src/gui/plugin/SimOptWidget/CSimOptPluginWidget.h b/product/src/gui/plugin/SimOptWidget/CSimOptPluginWidget.h
index 47e79bc1..8b6940ee 100644
--- a/product/src/gui/plugin/SimOptWidget/CSimOptPluginWidget.h
+++ b/product/src/gui/plugin/SimOptWidget/CSimOptPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CSIMOPTPLUGINWIDGET_H
+#ifndef CSIMOPTPLUGINWIDGET_H
 #define CSIMOPTPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CSimOptPluginWidget : public QObject, public CPluginWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
+    Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
     Q_INTERFACES(CPluginWidgetInterface)
 public:
     CSimOptPluginWidget(QObject *parent = 0);
diff --git a/product/src/gui/plugin/SimOptWidget/CSimOptWidget.cpp b/product/src/gui/plugin/SimOptWidget/CSimOptWidget.cpp
index 93cf85de..d8349551 100644
--- a/product/src/gui/plugin/SimOptWidget/CSimOptWidget.cpp
+++ b/product/src/gui/plugin/SimOptWidget/CSimOptWidget.cpp
@@ -1,4 +1,4 @@
-#include "CSimOptWidget.h"
+#include "CSimOptWidget.h"
 #include "ui_CSimOptWidget.h"
 #include "pub_utility_api/FileStyle.h"
 #include <QFile>
@@ -73,6 +73,9 @@ void CSimOptWidget::initView()
 
 bool CSimOptWidget::permCheck(int location, int region)
 {
+    Q_UNUSED(location);
+    Q_UNUSED(region);
+
 //    iot_service::CPermMngApiPtr permMngPtr = iot_service::getPermMngInstance("base");
 //    QString mess;
 //    if(permMngPtr != NULL)
@@ -233,6 +236,9 @@ void CSimOptWidget::slotAddFilter(const QString &path)
 
 void CSimOptWidget::slotItemDoubleClicked(QTreeWidgetItem *item, int cl)
 {
+    Q_UNUSED(item);
+    Q_UNUSED(cl);
+
     slotStartBtn();
 }
 
diff --git a/product/src/gui/plugin/SimOptWidget/CSimOptWidget.h b/product/src/gui/plugin/SimOptWidget/CSimOptWidget.h
index 6060b1cb..5ec7ca1d 100644
--- a/product/src/gui/plugin/SimOptWidget/CSimOptWidget.h
+++ b/product/src/gui/plugin/SimOptWidget/CSimOptWidget.h
@@ -1,4 +1,4 @@
-#ifndef CSIMOPTWIDGET_H
+#ifndef CSIMOPTWIDGET_H
 #define CSIMOPTWIDGET_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/SimOptWidget/main.cpp b/product/src/gui/plugin/SimOptWidget/main.cpp
index 719d7734..6fc89e44 100644
--- a/product/src/gui/plugin/SimOptWidget/main.cpp
+++ b/product/src/gui/plugin/SimOptWidget/main.cpp
@@ -1,4 +1,4 @@
-
+
 #include <QApplication>
 
 #include "pub_logger_api/logger.h"
@@ -19,7 +19,7 @@ int main(int argc, char *argv[])
         return -1;
     }
 
-    if(perm->SysLogin("admin", "kbdct", 1, 12*60*60, "hmi") != 0)
+    if(perm->SysLogin("admin", "admin", 1, 12*60*60, "hmi") != 0)
     {
         return -1;
     }