From db4a437bd441c7a1f79ae5f844a5f6a2a007914c Mon Sep 17 00:00:00 2001
From: shi_jq <shi_jq@sina.com>
Date: Mon, 17 Mar 2025 11:21:34 +0800
Subject: [PATCH] =?UTF-8?q?[ref]=E5=90=8C=E6=AD=A5711=20=E8=BF=99=E4=B8=80?=
 =?UTF-8?q?=E4=BB=BD=E5=A4=9A=E4=B8=80=E4=B8=AA=E5=AF=BC=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/ChanStatusWidget/CRealDataCollect.cpp |  2 +-
 .../plugin/ChanStatusWidget/CRealDataCollect.h   |  2 +-
 .../src/gui/plugin/ChanStatusWidget/ChanCommon.h |  2 +-
 .../plugin/ChanStatusWidget/ChanPluginWidget.cpp |  2 +-
 .../plugin/ChanStatusWidget/ChanPluginWidget.h   |  4 ++--
 .../plugin/ChanStatusWidget/ChanStatusWidget.cpp |  2 +-
 .../plugin/ChanStatusWidget/ChanStatusWidget.h   |  2 +-
 .../plugin/ChanStatusWidget/ChanTableModel.cpp   |  2 +-
 .../gui/plugin/ChanStatusWidget/ChanTableModel.h | 16 ++++++++++------
 product/src/gui/plugin/ChanStatusWidget/main.cpp |  2 +-
 10 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.cpp b/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.cpp
index e396f988..80676375 100644
--- a/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.cpp
+++ b/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.cpp
@@ -1,4 +1,4 @@
-#include "CRealDataCollect.h"
+#include "CRealDataCollect.h"
 #include <QTimer>
 #include <QVariant>
 
diff --git a/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.h b/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.h
index 00e67155..1c28a8c9 100644
--- a/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.h
+++ b/product/src/gui/plugin/ChanStatusWidget/CRealDataCollect.h
@@ -1,4 +1,4 @@
-#ifndef CREALDATACOLLECT_H
+#ifndef CREALDATACOLLECT_H
 #define CREALDATACOLLECT_H
 
 #include <QMap>
diff --git a/product/src/gui/plugin/ChanStatusWidget/ChanCommon.h b/product/src/gui/plugin/ChanStatusWidget/ChanCommon.h
index 55710e83..c892df8b 100644
--- a/product/src/gui/plugin/ChanStatusWidget/ChanCommon.h
+++ b/product/src/gui/plugin/ChanStatusWidget/ChanCommon.h
@@ -1,4 +1,4 @@
-#ifndef CHANCOMMON_H
+#ifndef CHANCOMMON_H
 #define CHANCOMMON_H
 
 #include <QString>
diff --git a/product/src/gui/plugin/ChanStatusWidget/ChanPluginWidget.cpp b/product/src/gui/plugin/ChanStatusWidget/ChanPluginWidget.cpp
index 3d1218d6..04b2b110 100644
--- a/product/src/gui/plugin/ChanStatusWidget/ChanPluginWidget.cpp
+++ b/product/src/gui/plugin/ChanStatusWidget/ChanPluginWidget.cpp
@@ -1,4 +1,4 @@
-#include "ChanPluginWidget.h"
+#include "ChanPluginWidget.h"
 #include "ChanStatusWidget.h"
 
 ChanPluginWidget::ChanPluginWidget(QObject *parent) : QObject(parent)
diff --git a/product/src/gui/plugin/ChanStatusWidget/ChanPluginWidget.h b/product/src/gui/plugin/ChanStatusWidget/ChanPluginWidget.h
index d399eaf2..25136129 100644
--- a/product/src/gui/plugin/ChanStatusWidget/ChanPluginWidget.h
+++ b/product/src/gui/plugin/ChanStatusWidget/ChanPluginWidget.h
@@ -1,4 +1,4 @@
-#ifndef CHANPLUGINWIDGET_H
+#ifndef CHANPLUGINWIDGET_H
 #define CHANPLUGINWIDGET_H
 
 #include <QObject>
@@ -7,7 +7,7 @@
 class ChanPluginWidget : 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/ChanStatusWidget/ChanStatusWidget.cpp b/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.cpp
index 56212972..e0b24fa7 100644
--- a/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.cpp
+++ b/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.cpp
@@ -1,4 +1,4 @@
-#include "ChanStatusWidget.h"
+#include "ChanStatusWidget.h"
 #include "CRealDataCollect.h"
 #include "ChanTableModel.h"
 #include "db_api_ex/CDbApi.h"
diff --git a/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.h b/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.h
index 5c555d85..ab503ba2 100644
--- a/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.h
+++ b/product/src/gui/plugin/ChanStatusWidget/ChanStatusWidget.h
@@ -1,4 +1,4 @@
-#ifndef CHANSTATUSWIDGET_H
+#ifndef CHANSTATUSWIDGET_H
 #define CHANSTATUSWIDGET_H
 
 #include "ChanCommon.h"
diff --git a/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.cpp b/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.cpp
index 9e703c47..7ae24c36 100644
--- a/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.cpp
+++ b/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.cpp
@@ -1,4 +1,4 @@
-#include "ChanTableModel.h"
+#include "ChanTableModel.h"
 #include <QBrush>
 
 ChanTableModel::ChanTableModel(QObject *parent)
diff --git a/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.h b/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.h
index 6fef4d20..bf4845a2 100644
--- a/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.h
+++ b/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.h
@@ -1,4 +1,4 @@
-#ifndef CHANTABLEMODEL_H
+#ifndef CHANTABLEMODEL_H
 #define CHANTABLEMODEL_H
 
 #include <QAbstractTableModel>
@@ -13,14 +13,18 @@ public:
     void updateRealData(const QList<SChanStatus> &dataList);
 
     void updateRealValue(QList<SChanStatus> &dataList);
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    QVariant headerData(int section, Qt::Orientation orientation,
-                                                                                                      int role = Qt::DisplayRole) const;
+
 private:
     void update();
 
+    QVariant headerData(int section, Qt::Orientation orientation,
+                                int role = Qt::DisplayRole) const;
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+
 private:
     QString getChanStatusDesc(const int &status) const;
 
diff --git a/product/src/gui/plugin/ChanStatusWidget/main.cpp b/product/src/gui/plugin/ChanStatusWidget/main.cpp
index 199906d8..703ef1b1 100644
--- a/product/src/gui/plugin/ChanStatusWidget/main.cpp
+++ b/product/src/gui/plugin/ChanStatusWidget/main.cpp
@@ -1,4 +1,4 @@
-#include "ChanStatusWidget.h"
+#include "ChanStatusWidget.h"
 #include <QApplication>
 #include "pub_logger_api/logger.h"
 #include "dp_chg_data_api/CDpcdaForApp.h"