更新代码

devicebutton/devicebutton.cpp

@@ -202,6 +202,10 @@ void DeviceButton::setButtonColor(const DeviceButton::ButtonColor &buttonColor)
         imgName = QString(":/image/devicebutton/devicebutton_gray_%1.png").arg(type);
     } else if (buttonColor == ButtonColor_Black) {
         imgName = QString(":/image/devicebutton/devicebutton_black_%1.png").arg(type);
+    } else if (buttonColor == ButtonColor_Purple) {
+        imgName = QString(":/image/devicebutton/devicebutton_purple_%1.png").arg(type);
+    } else if (buttonColor == ButtonColor_Yellow) {
+        imgName = QString(":/image/devicebutton/devicebutton_yellow_%1.png").arg(type);
     } else if (buttonColor == ButtonColor_Red) {
         checkAlarm();
         if (!timer->isActive()) {

devicebutton/devicebutton.h

@@ -43,11 +43,13 @@ public:
 
     //设备按钮颜色
     enum ButtonColor {
-        ButtonColor_Green = 0,      //绿色 设备激活状态
-        ButtonColor_Blue = 1,       //蓝色 设备在线状态
-        ButtonColor_Red = 2,        //红色 设备报警状态
-        ButtonColor_Gray = 3,       //灰色 设备离线状态
-        ButtonColor_Black = 4       //黑色 设备故障状态
+        ButtonColor_Green = 0,      //绿色 激活状态
+        ButtonColor_Blue = 1,       //蓝色 在线状态
+        ButtonColor_Red = 2,        //红色 报警状态
+        ButtonColor_Gray = 3,       //灰色 离线状态
+        ButtonColor_Black = 4,      //黑色 故障状态
+        ButtonColor_Purple = 5,     //紫色 其他状态
+        ButtonColor_Yellow = 6      //黄色 其他状态
     };
 
     explicit DeviceButton(QWidget *parent = 0);

devicebutton/devicebutton.pro

@@ -1,11 +1,4 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2018-07-04T09:39:27
-#
-#-------------------------------------------------
-
-QT       += core gui
-
+QT += core gui
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 

devicebutton/frmdevicebutton.cpp

@@ -36,7 +36,7 @@ void frmDeviceButton::initForm()
         connect(btn, SIGNAL(clicked(bool)), this, SLOT(changeStyle()));
     }
 
-    btnColor << ui->btnGreen << ui->btnBlue << ui->btnRed << ui->btnGray << ui->btnBlack;
+    btnColor << ui->btnGreen << ui->btnBlue << ui->btnRed << ui->btnGray << ui->btnBlack << ui->btnPurple << ui->btnYellow;
     foreach (QPushButton *btn, btnColor) {
         connect(btn, SIGNAL(clicked(bool)), this, SLOT(changeColor()));
     }

devicebutton/frmdevicebutton.ui

@@ -129,6 +129,20 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QPushButton" name="btnPurple">
+        <property name="text">
+         <string>紫色</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="btnYellow">
+        <property name="text">
+         <string>黄色</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QCheckBox" name="ckCanMove">
         <property name="text">

devicebutton/main.cpp

@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     a.setFont(QFont("Microsoft Yahei", 9));
 
-#if (QT_VERSION <= QT_VERSION_CHECK(5,0,0))
+#if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
 #if _MSC_VER
     QTextCodec *codec = QTextCodec::codecForName("gbk");
 #else

devicebutton/main.qrc

@@ -31,5 +31,17 @@
         <file>image/devicebutton/devicebutton_red_msg.png</file>
         <file>image/devicebutton/devicebutton_red_msg2.png</file>
         <file>image/devicebutton/devicebutton_red_police.png</file>
+        <file>image/devicebutton/devicebutton_purple_bubble.png</file>
+        <file>image/devicebutton/devicebutton_purple_bubble2.png</file>
+        <file>image/devicebutton/devicebutton_purple_circle.png</file>
+        <file>image/devicebutton/devicebutton_purple_msg.png</file>
+        <file>image/devicebutton/devicebutton_purple_msg2.png</file>
+        <file>image/devicebutton/devicebutton_purple_police.png</file>
+        <file>image/devicebutton/devicebutton_yellow_bubble.png</file>
+        <file>image/devicebutton/devicebutton_yellow_bubble2.png</file>
+        <file>image/devicebutton/devicebutton_yellow_circle.png</file>
+        <file>image/devicebutton/devicebutton_yellow_msg.png</file>
+        <file>image/devicebutton/devicebutton_yellow_msg2.png</file>
+        <file>image/devicebutton/devicebutton_yellow_police.png</file>
     </qresource>
 </RCC>