Browse Source

推送消息中没有倒计时不显示

pull/4/head
zhangsan 4 years ago
parent
commit
c639eb632e
  1. 21
      mainwidget.cpp
  2. 2
      mainwidget.h
  3. 2
      patientemergencyinfo.h
  4. 2
      websocketservice.cpp
  5. 2
      websocketservice.h

21
mainwidget.cpp

@ -99,13 +99,18 @@ void MainWidget::updateUi()
ui->textLabel->setText(pInfo->text); ui->textLabel->setText(pInfo->text);
//显示倒计时 //显示倒计时
int hour,min,sec,nTotalSecs; QString str = "";
nTotalSecs = pInfo->realCountDownInSeconds; if(pInfo->realCountDownInSeconds < 0){
sec = nTotalSecs % 60; str = "";
// min = nTotalSecs / 60 % 60; }else{
min = nTotalSecs / 60 ; //min显示大于60 int hour,min,sec,nTotalSecs;
hour = nTotalSecs / 3600; nTotalSecs = pInfo->realCountDownInSeconds;
QString str = QString("%1:%2").arg(min,2,10,QLatin1Char('0')).arg(sec,2,10,QLatin1Char('0')); sec = nTotalSecs % 60;
// min = nTotalSecs / 60 % 60;
min = nTotalSecs / 60 ; //min显示大于60
hour = nTotalSecs / 3600;
str = QString("%1:%2").arg(min,2,10,QLatin1Char('0')).arg(sec,2,10,QLatin1Char('0'));
}
ui->countdownLabel->setText(str); ui->countdownLabel->setText(str);
} }
@ -156,7 +161,7 @@ void MainWidget::onWsConnectedStatusChanged(int status)
updateUi(); updateUi();
} }
void MainWidget::onNewPatientMergencyInfo(QString firstAidId, QString name, QString content, quint64 realCountDownInSeconds) void MainWidget::onNewPatientMergencyInfo(QString firstAidId, QString name, QString content, qint64 realCountDownInSeconds)
{ {
//TODO 此处是否需要加锁处理 //TODO 此处是否需要加锁处理
PatientEmergencyInfo *pInfo = new PatientEmergencyInfo(firstAidId,name,content,realCountDownInSeconds); PatientEmergencyInfo *pInfo = new PatientEmergencyInfo(firstAidId,name,content,realCountDownInSeconds);

2
mainwidget.h

@ -36,7 +36,7 @@ private:
public slots: public slots:
void updateUi(); void updateUi();
void onWsConnectedStatusChanged(int); void onWsConnectedStatusChanged(int);
void onNewPatientMergencyInfo(QString firstAidId,QString name,QString content,quint64 realCountDownInSeconds); void onNewPatientMergencyInfo(QString firstAidId,QString name,QString content,qint64 realCountDownInSeconds);
void onPatientMergencyStatusChanged(QString firstAidId,QString time,QString status); void onPatientMergencyStatusChanged(QString firstAidId,QString time,QString status);
void addPatientToList(PatientEmergencyInfo *); void addPatientToList(PatientEmergencyInfo *);
void deletePatientFromList(QString firstAidId); void deletePatientFromList(QString firstAidId);

2
patientemergencyinfo.h

@ -13,7 +13,7 @@ public:
QString id; QString id;
QString name; QString name;
QString text; QString text;
quint64 realCountDownInSeconds; qint64 realCountDownInSeconds;
signals: signals:

2
websocketservice.cpp

@ -120,7 +120,7 @@ void WebsocketService::handleWsButtonStartMsg(QJsonObject jobj)
QString firstAidId = jobj.take("firstAidId").toString(); QString firstAidId = jobj.take("firstAidId").toString();
QString name = jobj.take("name").toString(); QString name = jobj.take("name").toString();
QString content = jobj.take("content").toString(); QString content = jobj.take("content").toString();
quint64 realCountdown = jobj.take("realCountdown").toString().toInt(0) / 1000; qint64 realCountdown = jobj.take("realCountdown").toString("-1000").toInt(0) / 1000;
emit newPatientMergencyInfo(firstAidId,name,content,realCountdown); emit newPatientMergencyInfo(firstAidId,name,content,realCountdown);
} }

2
websocketservice.h

@ -25,7 +25,7 @@ private:
signals: signals:
void wsConnectedStatusChanged(int); void wsConnectedStatusChanged(int);
//void newPatientMergencyInfo(PatientEmergencyInfo *); //void newPatientMergencyInfo(PatientEmergencyInfo *);
void newPatientMergencyInfo(QString firstAidId,QString name,QString content,quint64 realCountDownInSeconds); void newPatientMergencyInfo(QString firstAidId,QString name,QString content,qint64 realCountDownInSeconds);
void patientMergencyStatusChanged(QString firstAidId,QString time,QString status); void patientMergencyStatusChanged(QString firstAidId,QString time,QString status);
public slots: public slots:
void onConnected(); void onConnected();

Loading…
Cancel
Save