Commit 1dca6140 by ss.dai

修复自提单没有声音提醒、改为提醒20秒后自动停止

parent cb49a17d
...@@ -40,6 +40,7 @@ MainForm::MainForm(QWidget *parent) : ...@@ -40,6 +40,7 @@ MainForm::MainForm(QWidget *parent) :
qRegisterMetaType< QMap<QString,QString> >("QMap<QString,int>"); qRegisterMetaType< QMap<QString,QString> >("QMap<QString,int>");
// 连接信号槽 // 连接信号槽
connect(&m_timerZT, &QTimer::timeout, this, &MainForm::stopRemind);
connect(&m_timeTimer, &QTimer::timeout, this, &MainForm::onSetCurrentTime); connect(&m_timeTimer, &QTimer::timeout, this, &MainForm::onSetCurrentTime);
connect(this, &MainForm::processOrder, &FlowControl::GetInstance(), &FlowControl::onProcessOrder); connect(this, &MainForm::processOrder, &FlowControl::GetInstance(), &FlowControl::onProcessOrder);
connect(this, &MainForm::getOrderDetails, &FlowControl::GetInstance(), &FlowControl::onGetOrderDetails); connect(this, &MainForm::getOrderDetails, &FlowControl::GetInstance(), &FlowControl::onGetOrderDetails);
...@@ -325,6 +326,7 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool ...@@ -325,6 +326,7 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool
if(orderObject->order_type==3) if(orderObject->order_type==3)
{ {
tabBtn = ui->mainBtnZTD; tabBtn = ui->mainBtnZTD;
}else if(orderObject->order_type==4) }else if(orderObject->order_type==4)
{ {
tabBtn = ui->mainBtnTSD; tabBtn = ui->mainBtnTSD;
...@@ -401,6 +403,12 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool ...@@ -401,6 +403,12 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool
emit stopRemind(); emit stopRemind();
} }
if(orderObject->order_type==4||orderObject->order_type==3)
{
emit startRemind(0);
m_timerZT.start(20000);
}
_SetTablesSortEnable(true); _SetTablesSortEnable(true);
} }
......
...@@ -64,7 +64,7 @@ private: ...@@ -64,7 +64,7 @@ private:
int m_raiseIndex; int m_raiseIndex;
// 自提堂食订单的提示定时器 // 自提堂食订单的提示定时器
QTimer * m_timerZT; QTimer m_timerZT;
// 托盘图标 // 托盘图标
SysTray m_tray; SysTray m_tray;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment