Merge with zhangsan 添加了MainWidget内部逻辑

Reviewed-on: https://dd.tall.wiki/gitea/ccsens_hardware/qt_qcp_show/pulls/2

QCPShow.pro

@@ -9,6 +9,8 @@ QT       += serialport network websockets
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
+CONFIG += C++11
+
 TARGET = QCPShow
 TEMPLATE = app
 

QCPShow.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.1, 2021-10-19T07:53:12. -->
+<!-- Written by QtCreator 4.2.1, 2021-10-19T16:47:12. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

httpservice.cpp

@@ -153,7 +153,7 @@ void HttpService::updateStatus(QString firstAidId, QString status)
     jdoc = QJsonDocument::fromJson(result, &jerror);
     if (jerror.error != QJsonParseError::NoError || !jdoc.isObject() || !jdoc.object().contains("code"))
     {
-        qDebug() << QString::fromUtf8("请求失败");
+        qDebug() << QString::fromUtf8("updateStatus请求失败");
         return;
     }
     jobj = jdoc.object();
@@ -164,3 +164,61 @@ void HttpService::updateStatus(QString firstAidId, QString status)
         qDebug() << "updateStatus失败：" << resCode;
     }
 }
+
+void HttpService::sendIdcardInfo(QString idcard,QString name, QString sex, QString nation)
+{
+    //构造参数
+    QString rawJson = "{\"param\":{\"idcard\":\"%1\",\"name\":\"%2\",\"sex\":\"%3\",\"nation\":\"%4\"}}";
+    QString json = rawJson.arg(idcard).arg(name).arg(sex).arg(nation);
+
+    //发送请求
+    QByteArray result = postJson(MainConfig::sendUserInfoUrl,json.toUtf8());
+    qDebug() << result;
+
+    //解析响应
+    QJsonParseError jerror;
+    QJsonDocument jdoc;
+    QJsonObject jobj;
+    jdoc = QJsonDocument::fromJson(result, &jerror);
+    if (jerror.error != QJsonParseError::NoError || !jdoc.isObject() || !jdoc.object().contains("code"))
+    {
+        qDebug() << QString::fromUtf8("sendIdcardInfo请求失败");
+        return;
+    }
+    jobj = jdoc.object();
+    int resCode = jobj.take("code").toInt();
+    if(resCode == 200){
+        qDebug() << "sendIdcardInfo请求成功";
+    }else{
+        qDebug() << "sendIdcardInfo失败：" << resCode;
+    }
+}
+
+void HttpService::oneKeyStart(QString idcard)
+{
+    //构造参数
+    QString rawJson = "{\"param\":{\"idcard\":\"%1\"}}";
+    QString json = rawJson.arg(idcard);
+
+    //发送请求
+    QByteArray result = postJson(MainConfig::sendUserInfoUrl,json.toUtf8());
+    qDebug() << result;
+
+    //解析响应
+    QJsonParseError jerror;
+    QJsonDocument jdoc;
+    QJsonObject jobj;
+    jdoc = QJsonDocument::fromJson(result, &jerror);
+    if (jerror.error != QJsonParseError::NoError || !jdoc.isObject() || !jdoc.object().contains("code"))
+    {
+        qDebug() << QString::fromUtf8("oneKeyStart请求失败");
+        return;
+    }
+    jobj = jdoc.object();
+    int resCode = jobj.take("code").toInt();
+    if(resCode == 200){
+        qDebug() << "oneKeyStart请求成功";
+    }else{
+        qDebug() << "oneKeyStart失败：" << resCode;
+    }
+}

httpservice.h

@@ -11,7 +11,6 @@ public:
     explicit HttpService(QObject *parent = 0);
     QByteArray get(QUrl url, quint32 timeoutInMs = 5000);
     QByteArray postJson(QUrl url,const QByteArray &json, quint32 timeoutInMs = 5000);
-//    void sendIdcardInfo();
 
 private:
     QNetworkAccessManager *mManager;
@@ -20,6 +19,8 @@ signals:
 public slots:
     void login(QString username,QString password);
     void updateStatus(QString firstAidId,QString status);
+    void sendIdcardInfo(QString idcard,QString name,QString sex,QString nation);
+    void oneKeyStart(QString idcard);
 };
 
 #endif // HTTPSERVICE_H

mainconfig.cpp

@@ -13,6 +13,8 @@ QString MainConfig::oneKeyStartUrl = "https://test.tall.wiki/gateway/qcp/v3.0/bu
 QString MainConfig::serviceStatusChangedUrl = "https://test.tall.wiki/gateway/qcp/v3.0/button/updateStatus";
 QString MainConfig::wsUrl = "wss://test.tall.wiki/websocket/message/v4.0/ws";
 QString MainConfig::wsHeartInterval = "10";
+QString MainConfig::maxPatientNum = "5";
+QString MainConfig::switchPatientInterval = "5";
 
 MainConfig::MainConfig(QObject *parent) : QObject(parent)
 {
@@ -39,7 +41,11 @@ void MainConfig::createConfigFileWithDefaultValues()
 //    iniFile->setValue("password", password);
 //    iniFile->endGroup();
 
-    QString content = "[USER]\n";
+    QString content = "[MAIN]\n";
+    content.append(";最大患者数量\n").append("maxPatientNum = ").append(maxPatientNum).append("\n");
+    content.append(";切换病人时间(s)\n").append("switchPatientInterval = ").append(switchPatientInterval).append("\n");
+    content.append("\n");
+    content.append("[USER]\n");
     content.append(";登录用户名\n").append("username = ").append(username).append("\n");
     content.append(";登录密码\n").append("password = ").append(password).append("\n");
     content.append("\n");
@@ -70,6 +76,12 @@ void MainConfig::readConfigFile(){
     qDebug().noquote()<<"fileName:"<<fileName;
 
     //判断键是否存在
+    if(iniFile->contains("MAIN/maxPatientNum")){
+        maxPatientNum =  iniFile->value("MAIN/maxPatientNum").toString();
+    }
+    if(iniFile->contains("MAIN/switchPatientInterval")){
+        switchPatientInterval =  iniFile->value("MAIN/switchPatientInterval").toString();
+    }
     if(iniFile->contains("USER/username")){
         username =  iniFile->value("USER/username").toString();
     }
@@ -94,7 +106,8 @@ void MainConfig::readConfigFile(){
     if(iniFile->contains("WEBSOCKET/wsHeartInterval")){
         wsHeartInterval =  iniFile->value("WEBSOCKET/wsHeartInterval").toString();
     }
-    qDebug() << username << password << "\n"
+    qDebug() << maxPatientNum << "\n"
+             << username << password << "\n"
              << loginUrl  << sendUserInfoUrl  << oneKeyStartUrl << serviceStatusChangedUrl << "\n"
              << wsUrl  << wsHeartInterval ;
 }

mainconfig.h

@@ -25,6 +25,8 @@ public:
     static QString serviceStatusChangedUrl;
     static QString wsUrl;
     static QString wsHeartInterval;
+    static QString maxPatientNum;
+    static QString switchPatientInterval;
 signals:
 
 public slots:

mainwidget.cpp

@@ -1,13 +1,41 @@
 #include "mainwidget.h"
 #include "ui_mainwidget.h"
 #include <QtCore>
-#include "httpservice.h"
+#include "mainconfig.h"
 
 MainWidget::MainWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::MainWidget)
 {
     ui->setupUi(this);
+    m_patientIndex = 0;
+    m_wsConnectedStatus = 0;
+    m_maxPatientNum = MainConfig::maxPatientNum.toInt();
+    m_switchPatientInterval = MainConfig::switchPatientInterval.toInt();
+
+    //1s倒计时
+    m_countDownTimer.setInterval(1000);
+    m_countDownTimer.start();
+    connect(&m_countDownTimer, &QTimer::timeout,[=](){
+        for(PatientEmergencyInfo *info : m_patientEmergencyInfos){
+            if(info->realCountDownInSeconds > 0){
+                info->realCountDownInSeconds--;
+            }
+        }
+    });
+
+    //切换病人
+    m_switchPatientTimer.setInterval(5000);
+    m_switchPatientTimer.start();
+    connect(&m_switchPatientTimer, &QTimer::timeout,[=](){
+        if(++m_patientIndex >= m_patientEmergencyInfos.length()){
+            m_patientIndex = 0;
+        }
+        updateUi();
+    });
+
+    //显示连接状态
+    ui->statusLabel->setText("Not Connected");
 }
 
 MainWidget::~MainWidget()
@@ -15,13 +43,50 @@ MainWidget::~MainWidget()
     delete ui;
 }
 
+void MainWidget::updateUi()
+{
+    ui->statusLabel->setText(QString("%1 | %2")
+                             .arg(m_wsConnectedStatus == 0 ? "未连接" : "已经连")
+                             .arg(m_patientEmergencyInfos.length())
+                    );
+
+    if(m_patientEmergencyInfos.length() == 0){
+        //不显示
+        ui->textLabel->setText("");
+        ui->countdownLabel->setText("");
+        return;
+    }
+
+    //获取当前病人
+    if(m_patientIndex >= m_patientEmergencyInfos.length()){
+        m_patientIndex = 0;
+    }
+    PatientEmergencyInfo *pInfo = m_patientEmergencyInfos[m_patientIndex];
+
+    //显示文本
+    ui->textLabel->setText(pInfo->text);
+
+    //显示倒计时
+    int hour,min,sec,nTotalSecs;
+    nTotalSecs = pInfo->realCountDownInSeconds;
+    sec  = nTotalSecs % 60;
+    min  = nTotalSecs / 60 % 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);
+}
+
 void MainWidget::onWsConnectedStatusChanged(int status)
 {
     qDebug() << "MainWidget::onWsConnectedStatusChanged " << status;
+    updateUi();
 }
 
 void MainWidget::onNewPatientMergencyInfo(QString firstAidId, QString name, QString content, quint64 realCountDownInSeconds)
 {
+    //TODO 此处是否需要加锁处理
+    PatientEmergencyInfo *pInfo = new PatientEmergencyInfo(firstAidId,name,content,realCountDownInSeconds);
+    addPatientToList(pInfo);
     qDebug() << "MainWidget::onNewPatientMergencyInfo " << firstAidId << name << content << realCountDownInSeconds;
 }
 
@@ -42,6 +107,32 @@ void MainWidget::onPatientMergencyStatusChanged(QString firstAidId,QString time,
     if(status == 1){ //进行中（拍了一下按键）
 
     }else if(status == 2){//服务环节结束
+        deletePatientFromList(firstAidId);
+    }
+}
+
+void MainWidget::addPatientToList(PatientEmergencyInfo *info)
+{
+    //1.如果有就删除，以保证同一个病人按两次应该重新开始计时
+    deletePatientFromList(info->id);
 
+    //2.如果超过长度，就删除第一个，取后来的
+    if(m_patientEmergencyInfos.length() >= m_maxPatientNum){
+        delete m_patientEmergencyInfos[0];
+        m_patientEmergencyInfos.pop_front();
+    }
+
+    //3.加入链表
+    m_patientEmergencyInfos.push_back(info);
+}
+
+void MainWidget::deletePatientFromList(QString firstAidId)
+{
+    for(int i=0;i<m_patientEmergencyInfos.length();i++){
+        if(m_patientEmergencyInfos[i]->id == firstAidId){
+            delete m_patientEmergencyInfos[i];
+            m_patientEmergencyInfos.removeAt(i);
+            break;
+        }
     }
 }

mainwidget.h

@@ -2,6 +2,8 @@
 #define MAINWIDGET_H
 
 #include <QWidget>
+#include "patientemergencyinfo.h"
+#include <QTimer>
 
 namespace Ui {
 class MainWidget;
@@ -17,11 +19,20 @@ public:
 
 private:
     Ui::MainWidget *ui;
+    QList<PatientEmergencyInfo *> m_patientEmergencyInfos;
+    qint32 m_maxPatientNum,m_switchPatientInterval;
+    qint32 m_patientIndex;
+    QTimer m_countDownTimer;
+    QTimer m_switchPatientTimer;
+    int m_wsConnectedStatus;
 
 public slots:
+    void updateUi();
     void onWsConnectedStatusChanged(int);
     void onNewPatientMergencyInfo(QString firstAidId,QString name,QString content,quint64 realCountDownInSeconds);
     void onPatientMergencyStatusChanged(QString firstAidId,QString time,QString status);
+    void addPatientToList(PatientEmergencyInfo *);
+    void deletePatientFromList(QString firstAidId);
 
 signals:
     statusChanged(QString firstAidId,QString status);

mainwidget.h.G10556

@@ -0,0 +1,34 @@
+#ifndef MAINWIDGET_H
+#define MAINWIDGET_H
+
+#include <QWidget>
+#include "patientemergencyinfo.h"
+
+namespace Ui {
+class MainWidget;
+}
+
+class MainWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit MainWidget(QWidget *parent = 0);
+    ~MainWidget();
+
+private:
+    Ui::MainWidget *ui;
+    QList<PatientEmergencyInfo *> m_patientEmergencyInfos;
+    int m_maxPatientNum;
+
+public slots:
+    void onWsConnectedStatusChanged(int);
+    void onNewPatientMergencyInfo(QString firstAidId,QString name,QString content,quint64 realCountDownInSeconds);
+    void onPatientMergencyStatusChanged(QString firstAidId,QString time,QString status);
+    void addPatientToList(const PatientEmergencyInfo *);
+    void deletePatientFromList(QString firstAidId);
+signals:
+    statusChanged(QString firstAidId,QString status);
+};
+
+#endif // MAINWIDGET_H

mainwidget.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MainWidget</class>
  <widget class="QWidget" name="MainWidget">
@@ -5,16 +6,54 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>1135</width>
+    <height>426</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWidget</string>
   </property>
+  <widget class="QLabel" name="textLabel">
+   <property name="geometry">
+    <rect>
+     <x>210</x>
+     <y>75</y>
+     <width>721</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>textLabel</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="countdownLabel">
+   <property name="geometry">
+    <rect>
+     <x>390</x>
+     <y>160</y>
+     <width>721</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>countdownLabel</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="statusLabel">
+   <property name="geometry">
+    <rect>
+     <x>1010</x>
+     <y>390</y>
+     <width>91</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>statusLabel</string>
+   </property>
+  </widget>
  </widget>
- <layoutDefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
+ <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections/>
 </ui>

patientemergencyinfo.cpp

@@ -6,3 +6,9 @@ PatientEmergencyInfo::PatientEmergencyInfo(
 {
 
 }
+
+PatientEmergencyInfo::PatientEmergencyInfo(QString id,QObject *parent)
+    :id(id),QObject(parent)
+{
+
+}

patientemergencyinfo.h

@@ -9,6 +9,7 @@ class PatientEmergencyInfo : public QObject
 public:
     explicit PatientEmergencyInfo(
             QString id,QString name,QString text,quint64 realCountDownInSeconds,QObject *parent = 0);
+    PatientEmergencyInfo(QString id,QObject *parent = 0);
     QString id;
     QString name;
     QString text;