diff --git a/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.cpp b/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.cpp
index 3def149c..658a7072 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.cpp
+++ b/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.cpp
@@ -1,4 +1,4 @@
-#include "CAddShieldDialog.h"
+#include "CAddShieldDialog.h"
 #include "ui_CAddShieldDialog.h"
 #include "CDbInfoManage.h"
 #include "service/perm_mng_api/PermMngApi.h"
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.h b/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.h
index f23daf2d..2e331482 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.h
+++ b/product/src/gui/plugin/AlarmShieldWidget/CAddShieldDialog.h
@@ -1,4 +1,4 @@
-#ifndef CADDSHIELDDIALOG_H
+#ifndef CADDSHIELDDIALOG_H
 #define CADDSHIELDDIALOG_H
 
 #include <QDialog>
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.cpp b/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.cpp
index ada10da3..dff13099 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.cpp
+++ b/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmShield.h"
+#include "CAlarmShield.h"
 #include "ui_CAlarmShield.h"
 #include "CDbInfoManage.h"
 #include "CShieldTableDelegate.h"
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.h b/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.h
index 2496ba71..a4c29340 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.h
+++ b/product/src/gui/plugin/AlarmShieldWidget/CAlarmShield.h
@@ -1,4 +1,4 @@
-#ifndef CALARMSHIELD_H
+#ifndef CALARMSHIELD_H
 #define CALARMSHIELD_H
 
 #include <QWidget>
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CAlarmShieldPluginWidget.cpp b/product/src/gui/plugin/AlarmShieldWidget/CAlarmShieldPluginWidget.cpp
index c65368bf..9bd4103a 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CAlarmShieldPluginWidget.cpp
+++ b/product/src/gui/plugin/AlarmShieldWidget/CAlarmShieldPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include <QWidget>
+#include <QWidget>
 #include "CAlarmShieldPluginWidget.h"
 #include "CAlarmShield.h"
 
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CAlarmShieldPluginWidget.h b/product/src/gui/plugin/AlarmShieldWidget/CAlarmShieldPluginWidget.h
index 6571d3e1..54453fcb 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CAlarmShieldPluginWidget.h
+++ b/product/src/gui/plugin/AlarmShieldWidget/CAlarmShieldPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CALARMSHIELDPLUGINWIDGET_H
+#ifndef CALARMSHIELDPLUGINWIDGET_H
 #define CALARMSHIELDPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class CAlarmShieldPluginWidget : 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/AlarmShieldWidget/CDbInfoManage.cpp b/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.cpp
index b2557297..29647b97 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.cpp
+++ b/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.cpp
@@ -1,4 +1,4 @@
-#include "CDbInfoManage.h"
+#include "CDbInfoManage.h"
 #include "pub_logger_api/logger.h"
 #include <QSqlQuery>
 
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.h b/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.h
index 7112be36..84f669b9 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.h
+++ b/product/src/gui/plugin/AlarmShieldWidget/CDbInfoManage.h
@@ -1,4 +1,4 @@
-#ifndef CDBINFOMANAGE_H
+#ifndef CDBINFOMANAGE_H
 #define CDBINFOMANAGE_H
 
 #include "dbms/rdb_api/CRdbAccess.h"
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CDevTreeModel.cpp b/product/src/gui/plugin/AlarmShieldWidget/CDevTreeModel.cpp
index 0a2d324c..5025b820 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CDevTreeModel.cpp
+++ b/product/src/gui/plugin/AlarmShieldWidget/CDevTreeModel.cpp
@@ -1,4 +1,4 @@
-#include "CDevTreeModel.h"
+#include "CDevTreeModel.h"
 #include "CDbInfoManage.h"
 #include "CDevTreeView.h"
 
@@ -86,6 +86,8 @@ E_Tree_ItemType CDevTreeModel::currentType()
 
 QVariant CDevTreeModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
+    Q_UNUSED(section);
+
     if(role == Qt::DisplayRole)
     {
         if(orientation == Qt::Horizontal)
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CDevTreeModel.h b/product/src/gui/plugin/AlarmShieldWidget/CDevTreeModel.h
index c1663c51..d6ce6840 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CDevTreeModel.h
+++ b/product/src/gui/plugin/AlarmShieldWidget/CDevTreeModel.h
@@ -1,4 +1,4 @@
-#ifndef CDEVTREEMODEL_H
+#ifndef CDEVTREEMODEL_H
 #define CDEVTREEMODEL_H
 
 #include <QAbstractItemModel>
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CDevTreeView.cpp b/product/src/gui/plugin/AlarmShieldWidget/CDevTreeView.cpp
index c26a1083..076bab75 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CDevTreeView.cpp
+++ b/product/src/gui/plugin/AlarmShieldWidget/CDevTreeView.cpp
@@ -1,4 +1,4 @@
-#include "CDevTreeView.h"
+#include "CDevTreeView.h"
 #include "CDevTreeModel.h"
 #include <QContextMenuEvent>
 #include <QMenu>
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CDevTreeView.h b/product/src/gui/plugin/AlarmShieldWidget/CDevTreeView.h
index b3e7d12d..6355c18e 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CDevTreeView.h
+++ b/product/src/gui/plugin/AlarmShieldWidget/CDevTreeView.h
@@ -1,4 +1,4 @@
-#ifndef CDEVTREEVIEW_H
+#ifndef CDEVTREEVIEW_H
 #define CDEVTREEVIEW_H
 
 #include <QTreeView>
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.cpp b/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.cpp
index 1483228f..7d2533c2 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.cpp
+++ b/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.cpp
@@ -1,4 +1,4 @@
-#include "CHeaderView.h"
+#include "CHeaderView.h"
 #include <QPainter>
 #include <QCheckBox>
 #include <QApplication>
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.h b/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.h
index ba4f3ed0..d01e0421 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.h
+++ b/product/src/gui/plugin/AlarmShieldWidget/CHeaderView.h
@@ -1,4 +1,4 @@
-#ifndef CHEADERVIEW_H
+#ifndef CHEADERVIEW_H
 #define CHEADERVIEW_H
 
 #include <QHeaderView>
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CShieldTableDelegate.cpp b/product/src/gui/plugin/AlarmShieldWidget/CShieldTableDelegate.cpp
index efad7b18..542283f2 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CShieldTableDelegate.cpp
+++ b/product/src/gui/plugin/AlarmShieldWidget/CShieldTableDelegate.cpp
@@ -1,4 +1,4 @@
-#include "CShieldTableDelegate.h"
+#include "CShieldTableDelegate.h"
 #include "CShieldTableModel.h"
 #include "CDbInfoManage.h"
 #include <QPainter>
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CShieldTableDelegate.h b/product/src/gui/plugin/AlarmShieldWidget/CShieldTableDelegate.h
index 959cbf15..1029eab7 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CShieldTableDelegate.h
+++ b/product/src/gui/plugin/AlarmShieldWidget/CShieldTableDelegate.h
@@ -1,4 +1,4 @@
-#ifndef CSHIELDTABLEDELEGATE_H
+#ifndef CSHIELDTABLEDELEGATE_H
 #define CSHIELDTABLEDELEGATE_H
 
 #include <QStyledItemDelegate>
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CShieldTableModel.cpp b/product/src/gui/plugin/AlarmShieldWidget/CShieldTableModel.cpp
index 1ca65ccf..e8886c0e 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CShieldTableModel.cpp
+++ b/product/src/gui/plugin/AlarmShieldWidget/CShieldTableModel.cpp
@@ -1,4 +1,4 @@
-#include "CShieldTableModel.h"
+#include "CShieldTableModel.h"
 #include "CDbInfoManage.h"
 
 CShieldTableModel::CShieldTableModel(QObject *parent)
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CShieldTableModel.h b/product/src/gui/plugin/AlarmShieldWidget/CShieldTableModel.h
index 3d90b49f..3e934608 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CShieldTableModel.h
+++ b/product/src/gui/plugin/AlarmShieldWidget/CShieldTableModel.h
@@ -1,4 +1,4 @@
-#ifndef CSHIELDTABLEMODEL_H
+#ifndef CSHIELDTABLEMODEL_H
 #define CSHIELDTABLEMODEL_H
 
 #include <QAbstractTableModel>
diff --git a/product/src/gui/plugin/AlarmShieldWidget/CShieldinfo.h b/product/src/gui/plugin/AlarmShieldWidget/CShieldinfo.h
index 085b58af..d190fa3f 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/CShieldinfo.h
+++ b/product/src/gui/plugin/AlarmShieldWidget/CShieldinfo.h
@@ -1,4 +1,4 @@
-#ifndef CSHIELDINFO_H
+#ifndef CSHIELDINFO_H
 #define CSHIELDINFO_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/AlarmShieldWidget/main.cpp b/product/src/gui/plugin/AlarmShieldWidget/main.cpp
index cdb1110e..df59d478 100644
--- a/product/src/gui/plugin/AlarmShieldWidget/main.cpp
+++ b/product/src/gui/plugin/AlarmShieldWidget/main.cpp
@@ -1,4 +1,4 @@
-#include "CAlarmShield.h"
+#include "CAlarmShield.h"
 #include <QApplication>
 #include "pub_logger_api/logger.h"
 #include "service/perm_mng_api/PermMngApi.h"