From 97879123b5e1e99c163b0f9749ad50e89e1dbf60 Mon Sep 17 00:00:00 2001
From: Bai <bailijun@ccsens.com>
Date: Tue, 19 Oct 2021 19:56:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20void?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mainwidget.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mainwidget.h b/mainwidget.h
index e4d6280..f07e920 100644
--- a/mainwidget.h
+++ b/mainwidget.h
@@ -38,7 +38,7 @@ public slots:
     void deletePatientFromList(QString firstAidId);
 
 signals:
-    statusChanged(QString firstAidId,QString status);
+    void statusChanged(QString firstAidId,QString status);
 };
 
 #endif // MAINWIDGET_H
-- 
2.47.0.windows.2


From b4e6ef7d510c67ecbb854df7264dc1570bd9d668 Mon Sep 17 00:00:00 2001
From: Bai <bailijun@ccsens.com>
Date: Tue, 19 Oct 2021 20:40:53 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20&?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp       | 6 +++---
 mainwidget.cpp | 9 ++++-----
 mainwidget.ui  | 6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/main.cpp b/main.cpp
index 31d9c45..d5f10a2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -25,11 +25,11 @@ int main(int argc, char *argv[])
 
     //绑定信号与槽
     QObject::connect(&websocketService,&WebsocketService::wsConnectedStatusChanged,
-            &w,MainWidget::onWsConnectedStatusChanged);
+            &w,&MainWidget::onWsConnectedStatusChanged);
     QObject::connect(&websocketService,&WebsocketService::newPatientMergencyInfo,
-            &w,MainWidget::onNewPatientMergencyInfo);
+            &w,&MainWidget::onNewPatientMergencyInfo);
     QObject::connect(&websocketService,&WebsocketService::patientMergencyStatusChanged,
-            &w,MainWidget::onPatientMergencyStatusChanged);
+            &w,&MainWidget::onPatientMergencyStatusChanged);
 
     QObject::connect(&w,&MainWidget::statusChanged,&httpService,&HttpService::updateStatus);
 
diff --git a/mainwidget.cpp b/mainwidget.cpp
index e0b2b41..d0f7c4b 100644
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -50,10 +50,9 @@ MainWidget::MainWidget(QWidget *parent) :
     ui->textLabel->setAlignment(Qt::AlignHCenter);
     ui->countdownLabel->setAlignment(Qt::AlignHCenter);
     ui->statusLabel->setAlignment(Qt::AlignRight);
-    ui->textLabel->setAlignment(Qt::AlignCenter);
-    ui->countdownLabel->setAlignment(Qt::AlignCenter);
-    ui->statusLabel->setAlignment(Qt::AlignCenter);
-
+    ui->textLabel->setAlignment(Qt::AlignVCenter);
+    ui->countdownLabel->setAlignment(Qt::AlignVCenter);
+    ui->statusLabel->setAlignment(Qt::AlignVCenter);
 }
 
 MainWidget::~MainWidget()
@@ -113,7 +112,7 @@ void MainWidget::resizeEvent(QResizeEvent *event)
     //标题
     ui->textLabel->setGeometry(0,0,this->width(),(this->height()-20)/2);
     ui->countdownLabel->setGeometry(0,(this->height()-20)/2,this->width(),(this->height()-20)/2);
-    ui->statusLabel->setGeometry(0,this->height()-16,this->width(),20);
+    ui->statusLabel->setGeometry(0,this->height()-20,this->width(),20);
 }
 
 void MainWidget::onWsConnectedStatusChanged(int status)
diff --git a/mainwidget.ui b/mainwidget.ui
index 7da9a5c..e7af632 100644
--- a/mainwidget.ui
+++ b/mainwidget.ui
@@ -42,10 +42,10 @@
   <widget class="QLabel" name="statusLabel">
    <property name="geometry">
     <rect>
-     <x>1010</x>
+     <x>870</x>
      <y>390</y>
-     <width>91</width>
-     <height>20</height>
+     <width>231</width>
+     <height>21</height>
     </rect>
    </property>
    <property name="font">
-- 
2.47.0.windows.2


From a863e3fe57ff4c436052d8ca8446f910c68e69fa Mon Sep 17 00:00:00 2001
From: Bai <bailijun@ccsens.com>
Date: Wed, 20 Oct 2021 17:21:56 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=8C=87=E7=A4=BA=E7=81=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QCPShow.pro.user     |  24 ++++++++++++------------
 image/1LED_gray.png  | Bin 0 -> 4196 bytes
 image/1LED_green.png | Bin 0 -> 4331 bytes
 mainwidget.cpp       |  26 +++++++++++++++-----------
 mainwidget.ui        |  28 +++++++++++++++++++++++++---
 resource.qrc         |   2 ++
 6 files changed, 54 insertions(+), 26 deletions(-)
 create mode 100644 image/1LED_gray.png
 create mode 100644 image/1LED_green.png

diff --git a/QCPShow.pro.user b/QCPShow.pro.user
index d46a439..0302d36 100644
--- a/QCPShow.pro.user
+++ b/QCPShow.pro.user
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.1, 2021-10-19T16:47:12. -->
+<!-- Written by QtCreator 4.2.1, 2021-10-20T17:07:05. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{fe03815e-74e2-457e-b60c-e66368cd4ce4}</value>
+  <value type="QByteArray">{0d351c1e-abb6-427c-8d0b-30ca23826ed5}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -66,7 +66,7 @@
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Qt/QtSpace/build-QcpShow-Desktop_Qt_5_8_0_MinGW_32bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:/Qt/QtSpace/build-QcpShow-Desktop_Qt_5_8_0_MinGW_32bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -90,7 +90,7 @@
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
     </valuemap>
@@ -106,7 +106,7 @@
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清理</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
     </valuemap>
@@ -144,7 +144,7 @@
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
     </valuemap>
@@ -160,7 +160,7 @@
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清理</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
     </valuemap>
@@ -198,7 +198,7 @@
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
     </valuemap>
@@ -214,7 +214,7 @@
       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清理</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
     </valuemap>
@@ -231,7 +231,7 @@
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
     </valuemap>
@@ -286,13 +286,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">QCPShow</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QCPShow2</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:E:/Qt/QtSpace/QCPShow/QCPShow.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Qt/QtSpace/qt_qcp_show/QCPShow.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">QCPShow.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">E:/Qt/QtSpace/build-QcpShow-Desktop_Qt_5_8_0_MinGW_32bit-Debug</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">D:/Qt/QtSpace/build-QcpShow-Desktop_Qt_5_8_0_MinGW_32bit-Debug</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
diff --git a/image/1LED_gray.png b/image/1LED_gray.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd580f604226df039cb919e577d68c43a0579519
GIT binary patch
literal 4196
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
O0N{<yaZe1L@BI%JCyu%R

literal 0
HcmV?d00001

diff --git a/image/1LED_green.png b/image/1LED_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2b005c87f2efc2f769bd800424e7ccf65861e49
GIT binary patch
literal 4331
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
X$(CG&C>eS=!~mgGwN=WMEJObTp*RMs

literal 0
HcmV?d00001

diff --git a/mainwidget.cpp b/mainwidget.cpp
index d0f7c4b..391e64a 100644
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -47,12 +47,9 @@ MainWidget::MainWidget(QWidget *parent) :
     ui->textLabel->setStyleSheet("QLabel {color: rgb(255,0,0);}");//设置文本红色
     ui->countdownLabel->setStyleSheet("QLabel {color: rgb(255,0,0);}");//设置文本红色
     ui->statusLabel->setStyleSheet("QLabel {color: rgb(85,255,0);}");//设置文本绿色
-    ui->textLabel->setAlignment(Qt::AlignHCenter);
-    ui->countdownLabel->setAlignment(Qt::AlignHCenter);
-    ui->statusLabel->setAlignment(Qt::AlignRight);
-    ui->textLabel->setAlignment(Qt::AlignVCenter);
-    ui->countdownLabel->setAlignment(Qt::AlignVCenter);
-    ui->statusLabel->setAlignment(Qt::AlignVCenter);
+//    ui->textLabel->setAlignment(Qt::AlignHCenter);
+//    ui->countdownLabel->setAlignment(Qt::AlignHCenter);
+//    ui->statusLabel->setAlignment(Qt::AlignRight);
 }
 
 MainWidget::~MainWidget()
@@ -63,10 +60,16 @@ MainWidget::~MainWidget()
 void MainWidget::updateUi()
 {
     //更新statusLabel
-    ui->statusLabel->setText(QString("%1 | %2")
-                             .arg(m_wsConnectedStatus == 0 ? "未连接" : "已连接")
-                             .arg(m_patientEmergencyInfos.length())
-                    );
+//    ui->statusLabel->setText(QString("%1 | %2")
+//                             .arg(m_wsConnectedStatus == 0 ? "未连接" : "已连接")
+//                             .arg(m_patientEmergencyInfos.length())
+//                    );
+    if(m_wsConnectedStatus){
+        ui->LEDLabel->setStyleSheet("border-image: url(:/image/1LED_green.png);");
+    }else{
+        ui->LEDLabel->setStyleSheet("border-image: url(::/image/1LED_gray.png);");
+    }
+    ui->statusLabel->setText(QString::number(m_patientEmergencyInfos.length()));
 
     if(m_patientEmergencyInfos.length() == 0){
         //不显示
@@ -112,7 +115,8 @@ void MainWidget::resizeEvent(QResizeEvent *event)
     //标题
     ui->textLabel->setGeometry(0,0,this->width(),(this->height()-20)/2);
     ui->countdownLabel->setGeometry(0,(this->height()-20)/2,this->width(),(this->height()-20)/2);
-    ui->statusLabel->setGeometry(0,this->height()-20,this->width(),20);
+    ui->LEDLabel->setGeometry(this->width()-120,this->height()-20,20,20);
+    ui->statusLabel->setGeometry(this->width()-80,this->height()-20,20,20);
 }
 
 void MainWidget::onWsConnectedStatusChanged(int status)
diff --git a/mainwidget.ui b/mainwidget.ui
index e7af632..3d243cc 100644
--- a/mainwidget.ui
+++ b/mainwidget.ui
@@ -25,11 +25,14 @@
    <property name="text">
     <string>textLabel</string>
    </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
   </widget>
   <widget class="QLabel" name="countdownLabel">
    <property name="geometry">
     <rect>
-     <x>390</x>
+     <x>210</x>
      <y>160</y>
      <width>721</width>
      <height>61</height>
@@ -38,13 +41,16 @@
    <property name="text">
     <string>countdownLabel</string>
    </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
   </widget>
   <widget class="QLabel" name="statusLabel">
    <property name="geometry">
     <rect>
-     <x>870</x>
+     <x>950</x>
      <y>390</y>
-     <width>231</width>
+     <width>151</width>
      <height>21</height>
     </rect>
    </property>
@@ -56,6 +62,22 @@
    <property name="text">
     <string>statusLabel</string>
    </property>
+   <property name="alignment">
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="LEDLabel">
+   <property name="geometry">
+    <rect>
+     <x>790</x>
+     <y>400</y>
+     <width>54</width>
+     <height>12</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>TextLabel</string>
+   </property>
   </widget>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
diff --git a/resource.qrc b/resource.qrc
index de84d0a..f85b807 100644
--- a/resource.qrc
+++ b/resource.qrc
@@ -2,5 +2,7 @@
     <qresource prefix="/">
         <file>image/header.png</file>
         <file>image/black_bg.jpg</file>
+        <file>image/1LED_gray.png</file>
+        <file>image/1LED_green.png</file>
     </qresource>
 </RCC>
-- 
2.47.0.windows.2


From 812af8bf8f3ea78ab6e62cd7c1d1e36114c19df3 Mon Sep 17 00:00:00 2001
From: Bai <bailijun@ccsens.com>
Date: Wed, 20 Oct 2021 17:39:51 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mainwidget.cpp | 10 +++++-----
 mainwidget.ui  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mainwidget.cpp b/mainwidget.cpp
index 391e64a..346f394 100644
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -39,7 +39,7 @@ MainWidget::MainWidget(QWidget *parent) :
 
     //显示设置
     QFont font1, font2;
-    font1.setPointSize(150);
+    font1.setPointSize(240);
     font2.setPointSize(20);
     ui->textLabel->setFont(font1);
     ui->countdownLabel->setFont(font1);
@@ -113,10 +113,10 @@ void MainWidget::resizeEvent(QResizeEvent *event)
     QWidget::resizeEvent(event);
 
     //标题
-    ui->textLabel->setGeometry(0,0,this->width(),(this->height()-20)/2);
-    ui->countdownLabel->setGeometry(0,(this->height()-20)/2,this->width(),(this->height()-20)/2);
-    ui->LEDLabel->setGeometry(this->width()-120,this->height()-20,20,20);
-    ui->statusLabel->setGeometry(this->width()-80,this->height()-20,20,20);
+    ui->textLabel->setGeometry(0,0,this->width(),(this->height()-30)/2);
+    ui->countdownLabel->setGeometry(0,(this->height()-30)/2,this->width(),(this->height()-30)/2);
+    ui->LEDLabel->setGeometry(this->width()-120,this->height()-30,20,30);
+    ui->statusLabel->setGeometry(this->width()-80,this->height()-30,20,30);
 }
 
 void MainWidget::onWsConnectedStatusChanged(int status)
diff --git a/mainwidget.ui b/mainwidget.ui
index 3d243cc..5a81ad5 100644
--- a/mainwidget.ui
+++ b/mainwidget.ui
@@ -76,7 +76,7 @@
     </rect>
    </property>
    <property name="text">
-    <string>TextLabel</string>
+    <string/>
    </property>
   </widget>
  </widget>
-- 
2.47.0.windows.2


From f18927a82f4ee69b3c300de453f4fdcffcf5c9c5 Mon Sep 17 00:00:00 2001
From: Bai <bailijun@ccsens.com>
Date: Wed, 20 Oct 2021 18:25:36 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QCPShow.pro.user     | 2 +-
 mainwidget.cpp       | 1 +
 websocketservice.cpp | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/QCPShow.pro.user b/QCPShow.pro.user
index 0302d36..7310f0d 100644
--- a/QCPShow.pro.user
+++ b/QCPShow.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.1, 2021-10-20T17:07:05. -->
+<!-- Written by QtCreator 4.2.1, 2021-10-20T18:01:26. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/mainwidget.cpp b/mainwidget.cpp
index 346f394..f5a30b5 100644
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -22,6 +22,7 @@ MainWidget::MainWidget(QWidget *parent) :
                 info->realCountDownInSeconds--;
             }
         }
+        updateUi();
     });
 
     //切换病人
diff --git a/websocketservice.cpp b/websocketservice.cpp
index 772a87d..a6b9a83 100644
--- a/websocketservice.cpp
+++ b/websocketservice.cpp
@@ -115,10 +115,11 @@ void WebsocketService::onTextMessageReceived(const QString &message)
 
 void WebsocketService::handleWsButtonStartMsg(QJsonObject jobj)
 {
+    qDebug()<<jobj;
     QString firstAidId = jobj.take("firstAidId").toString();
     QString name = jobj.take("name").toString();
     QString content = jobj.take("content").toString();
-    quint64 realCountdown =  jobj.take("realCountdown").toInt(0) / 1000;
+    quint64 realCountdown =  jobj.take("realCountdown").toString().toInt(0) / 1000;
     emit newPatientMergencyInfo(firstAidId,name,content,realCountdown);
 }
 
-- 
2.47.0.windows.2


From e43c7c7a475cb36398bd412f0afeeb6e212cabcb Mon Sep 17 00:00:00 2001
From: Bai <bailijun@ccsens.com>
Date: Thu, 21 Oct 2021 10:17:19 +0800
Subject: [PATCH 6/6] =?UTF-8?q?textLable=20=E6=BB=9A=E5=8A=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QCPShow.pro.user |  2 +-
 mainwidget.cpp   | 37 +++++++++++++++++++++++++++++++------
 mainwidget.h     |  4 ++++
 mainwidget.ui    |  2 +-
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/QCPShow.pro.user b/QCPShow.pro.user
index 7310f0d..d4f0342 100644
--- a/QCPShow.pro.user
+++ b/QCPShow.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.1, 2021-10-20T18:01:26. -->
+<!-- Written by QtCreator 4.2.1, 2021-10-21T10:14:57. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/mainwidget.cpp b/mainwidget.cpp
index f5a30b5..08a9305 100644
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -39,18 +39,22 @@ MainWidget::MainWidget(QWidget *parent) :
     ui->statusLabel->setText("Not Connected");
 
     //显示设置
-    QFont font1, font2;
     font1.setPointSize(240);
-    font2.setPointSize(20);
+    font2.setPointSize(240);
+    font3.setPointSize(20);
     ui->textLabel->setFont(font1);
-    ui->countdownLabel->setFont(font1);
-    ui->statusLabel->setFont(font2);
+    ui->countdownLabel->setFont(font2);
+    ui->statusLabel->setFont(font3);
     ui->textLabel->setStyleSheet("QLabel {color: rgb(255,0,0);}");//设置文本红色
     ui->countdownLabel->setStyleSheet("QLabel {color: rgb(255,0,0);}");//设置文本红色
     ui->statusLabel->setStyleSheet("QLabel {color: rgb(85,255,0);}");//设置文本绿色
 //    ui->textLabel->setAlignment(Qt::AlignHCenter);
 //    ui->countdownLabel->setAlignment(Qt::AlignHCenter);
 //    ui->statusLabel->setAlignment(Qt::AlignRight);
+
+    m_curX = 0;
+    connect(&m_lableScrollTimer,SIGNAL(timeout()),this,SLOT(lableScrollDisplay()));
+    m_lableScrollTimer.start(10);
 }
 
 MainWidget::~MainWidget()
@@ -60,6 +64,8 @@ MainWidget::~MainWidget()
 
 void MainWidget::updateUi()
 {
+    m_curX = 0;//内容超出显示区域时，更新患者信息显示从头开始滚动
+
     //更新statusLabel
 //    ui->statusLabel->setText(QString("%1 | %2")
 //                             .arg(m_wsConnectedStatus == 0 ? "未连接" : "已连接")
@@ -92,7 +98,8 @@ void MainWidget::updateUi()
     int hour,min,sec,nTotalSecs;
     nTotalSecs = pInfo->realCountDownInSeconds;
     sec  = nTotalSecs % 60;
-    min  = nTotalSecs / 60 % 60;
+//    min  = nTotalSecs / 60 % 60;
+    min  = nTotalSecs / 60 ;  //min显示大于60
     hour = nTotalSecs / 3600;
     QString str = QString("%1:%2").arg(min,2,10,QLatin1Char('0')).arg(sec,2,10,QLatin1Char('0'));
     ui->countdownLabel->setText(str);
@@ -114,12 +121,30 @@ void MainWidget::resizeEvent(QResizeEvent *event)
     QWidget::resizeEvent(event);
 
     //标题
-    ui->textLabel->setGeometry(0,0,this->width(),(this->height()-30)/2);
+//    ui->textLabel->setGeometry(0,0,this->width(),(this->height()-30)/2);
     ui->countdownLabel->setGeometry(0,(this->height()-30)/2,this->width(),(this->height()-30)/2);
     ui->LEDLabel->setGeometry(this->width()-120,this->height()-30,20,30);
     ui->statusLabel->setGeometry(this->width()-80,this->height()-30,20,30);
 }
 
+void MainWidget::lableScrollDisplay()
+{
+    QFontMetrics fm(font1);
+    m_width = fm.width(ui->textLabel->text());
+    if(this->width() > m_width){
+        ui->textLabel->setGeometry((this->width()-m_width)/2, 0,m_width,(this->height()-30)/2);
+    }
+    else{
+        m_curX ++;
+        ui->textLabel->setGeometry(20-m_curX,0,m_width,(this->height()-30)/2);
+//        qDebug()<<"move" <<m_curX;
+    }
+    if(m_curX > (m_width - this->width())){
+        m_curX = 0;
+    }
+
+}
+
 void MainWidget::onWsConnectedStatusChanged(int status)
 {
     qDebug() << "MainWidget::onWsConnectedStatusChanged " << status;
diff --git a/mainwidget.h b/mainwidget.h
index f07e920..4c7e2a2 100644
--- a/mainwidget.h
+++ b/mainwidget.h
@@ -28,6 +28,9 @@ private:
     QTimer m_countDownTimer;
     QTimer m_switchPatientTimer;
     int m_wsConnectedStatus;
+    QFont font1, font2, font3;
+    QTimer m_lableScrollTimer;
+    int m_width, m_curX;
 
 public slots:
     void updateUi();
@@ -36,6 +39,7 @@ public slots:
     void onPatientMergencyStatusChanged(QString firstAidId,QString time,QString status);
     void addPatientToList(PatientEmergencyInfo *);
     void deletePatientFromList(QString firstAidId);
+    void lableScrollDisplay();
 
 signals:
     void statusChanged(QString firstAidId,QString status);
diff --git a/mainwidget.ui b/mainwidget.ui
index 5a81ad5..e86e9db 100644
--- a/mainwidget.ui
+++ b/mainwidget.ui
@@ -23,7 +23,7 @@
     </rect>
    </property>
    <property name="text">
-    <string>textLabel</string>
+    <string>传控科技优先做CT</string>
    </property>
    <property name="alignment">
     <set>Qt::AlignCenter</set>
-- 
2.47.0.windows.2