Skip to content

F
fmtakeout
Commit 3fa69aff by 李定达
Options

1.添加登录界面并测试

parent 427e28cc
Showing with 455 additions and 96 deletions
takeout/control/ordergetwork.cpp
......@@ -24,6 +24,8 @@ OrderGetWork::OrderGetWork(QObject *parent) : QObject(parent)
FMApplication::subscibeEvent(this, PosEvent::s_need_get_order);
//订阅操作订单的事件
FMApplication::subscibeEvent(this, PosEvent::s_opt_order);
//
FMApplication::subscibeEvent(this, PosEvent::s_login_storeinfo);
}
void OrderGetWork::workStart()
......@@ -38,53 +40,7 @@ void OrderGetWork::workStart()
do
{
if(!OrderGetDataProcess::isBind())
{
QVariantMap tmpmap;
tmpmap.insert(EVENT_KEY_ORDERSTATUS, 0);
tmpmap.insert(EVENT_KEY_MSG, QString::fromLocal8Bit("绑定中..."));
POSTEVENTTYPE(PosEvent::s_opt_status,tmpmap,QVariantMap);
if(!bingToServer(error))
{
QLOG_ERROR() << QThread::currentThreadId() << "loginToServer failed";
tmptime = TIMEOUT_TRY_LOGING;
QVariantMap map;
map.insert(EVENT_KEY_STATUS, false);
map.insert(EVENT_KEY_MSG, error);
POSTEVENTTYPE(PosEvent::s_opt_status,map,QVariantMap);
break;
}
QVariantMap bmap;
bmap.insert(EVENT_KEY_STATUS, true);
bmap.insert(EVENT_KEY_MSG, QString::fromLocal8Bit("绑定成功"));
POSTEVENTTYPE(PosEvent::s_opt_status,bmap,QVariantMap);
}
if(!_islogin)
{
QVariantMap tmpmap;
tmpmap.insert(EVENT_KEY_ORDERSTATUS, 0);
tmpmap.insert(EVENT_KEY_MSG, QString::fromLocal8Bit("登录中..."));
POSTEVENTTYPE(PosEvent::s_opt_status,tmpmap,QVariantMap);
if(!loginToServer(error))
{
QLOG_ERROR() << QThread::currentThreadId() << "loginToServer failed";
tmptime = TIMEOUT_TRY_LOGING;
QVariantMap map;
map.insert(EVENT_KEY_STATUS, false);
map.insert(EVENT_KEY_MSG, error);
POSTEVENTTYPE(PosEvent::s_login_status,map,QVariantMap);
break;
}
QVariantMap map;
map.insert(EVENT_KEY_STATUS, true);
POSTEVENTTYPE(PosEvent::s_login_status,map,QVariantMap);
}
if(!PullOrder(nexttime, error))
if(_islogin && !PullOrder(nexttime, error))
{
QLOG_ERROR() << QThread::currentThreadId() << "PullOrder failed";
tmptime = _timeout;
......@@ -108,7 +64,6 @@ void OrderGetWork::workStart()
connect(this, &OrderGetWork::quit, &loop, &QEventLoop::quit);
loop.exec();
}
}
......@@ -687,6 +642,59 @@ void OrderGetWork::setAutoconfirm(const QString &autoconfirm)
_autoconfirm = autoconfirm;
}
void OrderGetWork::loginStart()
{
QString error;
do
{
if(!OrderGetDataProcess::isBind())
{
QVariantMap tmpmap;
tmpmap.insert(EVENT_KEY_ORDERSTATUS, 0);
tmpmap.insert(EVENT_KEY_MSG, QString::fromLocal8Bit("绑定中..."));
POSTEVENTTYPE(PosEvent::s_opt_status,tmpmap,QVariantMap);
if(!bingToServer(error))
{
QLOG_ERROR() << QThread::currentThreadId() << "loginToServer failed";
QVariantMap map;
map.insert(EVENT_KEY_STATUS, false);
map.insert(EVENT_KEY_MSG, error);
POSTEVENTTYPE(PosEvent::s_opt_status,map,QVariantMap);
break;
}
QVariantMap bmap;
bmap.insert(EVENT_KEY_STATUS, true);
bmap.insert(EVENT_KEY_MSG, QString::fromLocal8Bit("绑定成功"));
POSTEVENTTYPE(PosEvent::s_opt_status,bmap,QVariantMap);
}
if(!_islogin)
{
QVariantMap tmpmap;
tmpmap.insert(EVENT_KEY_ORDERSTATUS, 0);
tmpmap.insert(EVENT_KEY_MSG, QString::fromLocal8Bit("登录中..."));
POSTEVENTTYPE(PosEvent::s_opt_status,tmpmap,QVariantMap);
if(!loginToServer(error))
{
QLOG_ERROR() << QThread::currentThreadId() << "loginToServer failed";
QVariantMap map;
map.insert(EVENT_KEY_STATUS, false);
map.insert(EVENT_KEY_MSG, error);
POSTEVENTTYPE(PosEvent::s_login_status,map,QVariantMap);
break;
}
QVariantMap map;
map.insert(EVENT_KEY_STATUS, true);
POSTEVENTTYPE(PosEvent::s_login_status,map,QVariantMap);
emit quit();
}
}while(0);
}
#endif
void OrderGetWork::optOrder(const QJsonArray &orders)
......@@ -734,5 +742,18 @@ bool OrderGetWork::event(QEvent *e)
return true;
}
if(e->type() == PosEvent::s_login_storeinfo)
{
QVariantMap map;
GETEVENTINFO(map, e, QVariantMap);
_storeinfo = map;
loginStart();
return true;
}
return QObject::event(e);
}
takeout/control/ordergetwork.h
......@@ -65,6 +65,9 @@ public:
void setUrl(const QString &url);
void setAutoconfirm(const QString &autoconfirm);
void loginStart();
signals:
void quit();
......
takeout/control/orderpushwork.cpp
......@@ -23,6 +23,7 @@ OrderPushWork::OrderPushWork(QObject *parent) : QObject(parent)
_serurl.clear();
FMApplication::subscibeEvent(this, PosEvent::s_token_change);
FMApplication::subscibeEvent(this, PosEvent::s_login_storeinfo);
}
OrderPushWork::~OrderPushWork()
......@@ -78,6 +79,18 @@ bool OrderPushWork::event(QEvent *e)
return true;
}
if(e->type() == PosEvent::s_login_storeinfo)
{
QVariantMap map;
GETEVENTINFO(map, e, QVariantMap);
_storeinfo = map;
return true;
}
return QObject::event(e);
}
......@@ -394,8 +407,6 @@ void OrderPushWork::workStart()
delete _socket;
_socket = NULL;
qDebug() << ")))))))))))))))))))))))))))))))))))))";
EVENTWAIT(60000);
}
}
......
takeout/event/posevent.cpp
......@@ -15,6 +15,7 @@ QEvent::Type PosEvent::s_token_change = static_cast<QEvent::Type>(QEvent::regist
QEvent::Type PosEvent::s_inset_orderpool = static_cast<QEvent::Type>(QEvent::registerEventType());
QEvent::Type PosEvent::s_change_orderpool = static_cast<QEvent::Type>(QEvent::registerEventType());
QEvent::Type PosEvent::s_location_orderpool = static_cast<QEvent::Type>(QEvent::registerEventType());
QEvent::Type PosEvent::s_login_storeinfo = static_cast<QEvent::Type>(QEvent::registerEventType());
PosEvent::PosEvent(Type e):QEvent(e)
{
......
takeout/event/posevent.h
......@@ -86,6 +86,8 @@ public:
static Type s_change_orderpool;
//改变本地订单状态
static Type s_location_orderpool;
//登陆并设置门店信息
static Type s_login_storeinfo;
private:
//事件携带的信息,该内存你应当在堆中分配
......
takeout/main.cpp
......@@ -9,6 +9,7 @@
#include "control/orderpushwork.h"
#include "control/orderprintwork.h"
#include "base/Dump/dump.h"
#include "view/loginform.h"
#include <QVariantMap>
#include <QThread>
#include <QDir>
......@@ -19,49 +20,86 @@
#ifdef FM_MAIN_TEST
void LoadTheme(const QString& theme)
{
QString rccPath = QString("%1/skin/%2.rcc").arg(qApp->applicationDirPath()).arg(theme);
if(!QFile(rccPath).exists())
{
return;
}
QResource::registerResource(rccPath);
QFile qssFile(QString(":/%1.qss").arg(theme));
if(!qssFile.open(QFile::ReadOnly))
{
qDebug() << "failed";
return;
}
qDebug() << "success";
qApp->setStyleSheet(qssFile.readAll());
qssFile.close();
}
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
QApplication a(argc, argv);
QsLogging::Logger &logger = QsLogging::Logger::instance();
logger.setLoggingLevel(QsLogging::TraceLevel);
QsLogging::DestinationPtr consleDest(QsLogging::DestinationFactory::MakeDebugOutputDestination());
logger.addDestination(consleDest);
LoadTheme(QString("deaufult"));
OrderPushWork pwork;
QThread thread;
LoginForm form;
pwork.setToken("fff72b80-e745-4a2e-8ecb-9c184999d01c");
//pwork.setToken("1");
form.show();
QVariantMap map;
return a.exec();
}
map.insert(JSON_STOREID, "1036");
map.insert(JSON_STATIONID, "saas_bf_pos");
map.insert(JSON_KEY_USERID, "beiguo_saas");
map.insert(JSON_KEY_PWD, "beiguo_saas");
map.insert(JSON_KEY_PARTNERID, "1585");
//int main(int argc, char *argv[])
//{
// QApplication a(argc, argv);
//map.insert(JSON_KEY_PARTNERID, "song_test");
//map.insert(JSON_STOREID, "test");
// QsLogging::Logger &logger = QsLogging::Logger::instance();
// logger.setLoggingLevel(QsLogging::TraceLevel);
// QsLogging::DestinationPtr consleDest(QsLogging::DestinationFactory::MakeDebugOutputDestination());
// logger.addDestination(consleDest);
pwork.setStoreinfo(map);
// OrderPushWork pwork;
// QThread thread;
//QStringList list;
// pwork.setToken("fff72b80-e745-4a2e-8ecb-9c184999d01c");
// //pwork.setToken("1");
//list.append("118.89.167.51:9083");
// QVariantMap map;
//pwork.setServicelist(list);
pwork.setSerurl("http://118.89.167.51:9100/gateway?redirect_url=http://10.20.10.106:9140/queryIdleServer&access_token=7705bf51-0832-49e3-8a3d-ac9a57ff0d4b&bf_ver=1");
// map.insert(JSON_STOREID, "1036");
// map.insert(JSON_STATIONID, "saas_bf_pos");
// map.insert(JSON_KEY_USERID, "beiguo_saas");
// map.insert(JSON_KEY_PWD, "beiguo_saas");
// map.insert(JSON_KEY_PARTNERID, "1585");
QObject::connect(&thread, &QThread::started, &pwork, &OrderPushWork::workStart);
// //map.insert(JSON_KEY_PARTNERID, "song_test");
// //map.insert(JSON_STOREID, "test");
pwork.moveToThread(&thread);
// pwork.setStoreinfo(map);
thread.start();
// //QStringList list;
return a.exec();
}
// //list.append("118.89.167.51:9083");
// //pwork.setServicelist(list);
// pwork.setSerurl("http://118.89.167.51:9100/gateway?redirect_url=http://10.20.10.106:9140/queryIdleServer&access_token=7705bf51-0832-49e3-8a3d-ac9a57ff0d4b&bf_ver=1");
// QObject::connect(&thread, &QThread::started, &pwork, &OrderPushWork::workStart);
// pwork.moveToThread(&thread);
// thread.start();
// return a.exec();
//}
#else
......@@ -130,6 +168,7 @@ int main(int argc, char *argv[])
orderprintwork printwork;
MainForm mainform;
LoginForm loginform;
PosOrderPool::InitOrderPool();
......@@ -144,7 +183,12 @@ int main(int argc, char *argv[])
QObject::connect(&mainform, &MainForm::showFloatForm, &floatform, &FloatForm::onShow);
QObject::connect(&mainform, &MainForm::startRemind, &floatform, &FloatForm::onStartRemind);
QObject::connect(&mainform, &MainForm::stopRemind, &floatform, &FloatForm::onStopRemind);
QObject::connect(&floatform, &FloatForm::showMainForm, &mainform, &MainForm::show);
//QObject::connect(&floatform, &FloatForm::showMainForm, &mainform, &MainForm::show);
QObject::connect(&loginform, &LoginForm::showmainform, &mainform, &MainForm::showFullScreen);
QObject::connect(&loginform, &LoginForm::showfloat, &floatform, &FloatForm::onShow);
QObject::connect(&floatform, &FloatForm::showMainForm, &loginform, &LoginForm::showfull);
QString configfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
......@@ -171,19 +215,19 @@ int main(int argc, char *argv[])
// map.insert(JSON_KEY_PWD, "beiguo_saas");
// map.insert(JSON_KEY_PARTNERID, "1585");
map.insert(JSON_STOREID, storeid);
map.insert(JSON_STATIONID, stationid);
map.insert(JSON_KEY_USERID, userid);
map.insert(JSON_KEY_PWD, pwd);
map.insert(JSON_KEY_PARTNERID, partnerid);
// map.insert(JSON_STOREID, storeid);
// map.insert(JSON_STATIONID, stationid);
// map.insert(JSON_KEY_USERID, userid);
// map.insert(JSON_KEY_PWD, pwd);
// map.insert(JSON_KEY_PARTNERID, partnerid);
mainform.setStoreinfo(map);
//mainform.setStoreinfo(map);
//work.setUrl(QString("http://118.89.167.51:9100//gateway?action=%1&access_token=%2&ver=%3&sign=%4"));
work.setUrl(geturl);
//work.setSerurl(pushurl);
work.setAutoconfirm(autoconf);
work.setStoreinfo(map);
//work.setStoreinfo(map);
work.setTimeout(180000);
//QStringList list;
......@@ -191,7 +235,7 @@ int main(int argc, char *argv[])
//list.append("118.89.167.51:9083");
//list.append(pushurl);
pwork.setStoreinfo(map);
//pwork.setStoreinfo(map);
pwork.setSerurl(pushurl);
loac.moveToThread(&thread);
......@@ -207,6 +251,8 @@ int main(int argc, char *argv[])
threadt.start();
mainform.MyShow();
loginform.showfull();
return a.exec();
}
......
takeout/takeout.pro
......@@ -59,7 +59,8 @@ SOURCES += main.cpp \
base/Arithmetic/util.cpp \
base/DB/fm_database.cpp \
control/orderlocalizework.cpp \
control/orderprintwork.cpp
control/orderprintwork.cpp \
view/loginform.cpp
HEADERS += \
event/fmapplication.h \
......@@ -92,7 +93,8 @@ HEADERS += \
base/Arithmetic/util.h \
base/DB/fm_database.h \
control/orderlocalizework.h \
control/orderprintwork.h
control/orderprintwork.h \
view/loginform.h
DISTFILES += takeout.rc
......@@ -104,4 +106,5 @@ FORMS += \
view/pickForm.ui \
view/RejectForm.ui \
view/settingForm.ui \
view/detailForm.ui
view/detailForm.ui \
view/loginform.ui
takeout/view/loginform.cpp 0 → 100644
#include "loginform.h"
#include "ui_loginform.h"
#include "event/posevent.h"
#include "event/fmapplication.h"
#include "preDefine.h"
#include <QDebug>
#include <QVariantMap>
#include <QsLog.h>
LoginForm::LoginForm(QWidget *parent) :
QDialog(parent),
ui(new Ui::LoginForm)
{
ui->setupUi(this);
is_login = false;
ui->label_logotitle->setText(QString::fromLocal8Bit("非码SaaS点餐小程序门店管理"));
connect(ui->lineEdit_account, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
connect(ui->lineEdit_partnerid, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
connect(ui->lineEdit_pwd, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
connect(ui->pushButton_0, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_1, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_2, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_3, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_4, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_5, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_6, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_7, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_8, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_9, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_clear, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_del, &QPushButton::clicked, this, &LoginForm::number_btn_click);
_curr_lineedit = ui->lineEdit_partnerid;
_curr_lineedit->setFocus();
setWindowFlags(Qt::FramelessWindowHint);
m_alertForm = new AlertForm(this);
FMApplication::subscibeEvent(this, PosEvent::s_login_status);
FMApplication::subscibeEvent(this, PosEvent::s_opt_status);
}
void LoginForm::onHideAlert()
{
m_alertForm->hide();
}
void LoginForm::onShowAlert(AlertForm::Type type, const QString &msg)
{
if(this->isVisible())
{
m_alertForm->SetContent(type, msg);
m_alertForm->show();
}
}
LoginForm::~LoginForm()
{
delete ui;
}
void LoginForm::showfull()
{
if(!is_login)
{
// ui->lineEdit_account->clear();
// ui->lineEdit_partnerid->clear();
// ui->lineEdit_pwd->clear();
this->showFullScreen();
return ;
}
this->hide();
emit showmainform();
}
bool LoginForm::event(QEvent *e)
{
if(e->type() == PosEvent::s_opt_status)
{
QVariantMap value;
GETEVENTINFO(value,e,QVariantMap);
if(value.contains(EVENT_KEY_ORDERSTATUS) && value[EVENT_KEY_ORDERSTATUS].toInt() == 0)
{
if(!this->isHidden())
onShowAlert(AlertForm::LOADING, value[EVENT_KEY_MSG].toString());
return true;
}
if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == false)
{
QLOG_INFO() << value[EVENT_KEY_MSG].toString();
if(!this->isHidden())
onShowAlert(AlertForm::ERROR, value[EVENT_KEY_MSG].toString());
}
else if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == true)
{
if(!this->isHidden())
onShowAlert(AlertForm::SUCCESS, value[EVENT_KEY_MSG].toString());
}
return true;
}
if(e->type() == PosEvent::s_login_status)
{
QVariantMap value;
GETEVENTINFO(value,e,QVariantMap);
if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == false)
{
QLOG_INFO() << value[EVENT_KEY_MSG].toString();
if(!this->isHidden())
onShowAlert(AlertForm::ERROR, value[EVENT_KEY_MSG].toString());
}
else if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == true)
{
this->hide();
onHideAlert();
is_login -= true;
emit showmainform();
}
return true;
}
return QDialog::event(e);
}
void LoginForm::GetCurrLineEdit()
{
_curr_lineedit = qobject_cast<ClickedLineEdit*>(sender());
}
void LoginForm::on_pushButton_login_clicked()
{
QVariantMap map;
if(ui->lineEdit_account->text().isEmpty() ||
ui->lineEdit_pwd->text().isEmpty() ||
ui->lineEdit_partnerid->text().isEmpty())
{
onShowAlert(AlertForm::ERROR, QString::fromLocal8Bit("门店号/账号/密码均不能为空"));
return ;
}
map.insert(JSON_STOREID, "1036");
map.insert(JSON_STATIONID, "saas_bf_pos");
map.insert(JSON_KEY_USERID, ui->lineEdit_account->text());
map.insert(JSON_KEY_PWD, ui->lineEdit_pwd->text());
map.insert(JSON_KEY_PARTNERID, ui->lineEdit_partnerid->text());
POSTEVENTTYPE(PosEvent::s_login_storeinfo, map, QVariantMap);
}
void LoginForm::number_btn_click()
{
QPushButton *btn = qobject_cast<QPushButton*>(sender());
if(btn == ui->pushButton_clear)
{
_curr_lineedit->clear();
}
else if(btn == ui->pushButton_del)
{
QString text = _curr_lineedit->text();
_curr_lineedit->setText(text.left(text.size() - 1));
}
else
{
_curr_lineedit->setText(_curr_lineedit->text() + btn->property("number").toString());
}
}
void LoginForm::on_pushButton_close_clicked()
{
this->hide();
emit showfloat();
}
takeout/view/loginform.h 0 → 100644
#ifndef LOGINFORM_H
#define LOGINFORM_H
#include <QDialog>
#include <QVariantMap>
#include "clickedLineEdit.h"
#include "alertForm.h"
namespace Ui {
class LoginForm;
}
class LoginForm : public QDialog
{
Q_OBJECT
public:
explicit LoginForm(QWidget *parent = 0);
~LoginForm();
void showfull();
virtual bool event(QEvent *e);
void onShowAlert(AlertForm::Type type, const QString &msg);
void onHideAlert();
signals:
void showfloat();
void showmainform();
void login(QVariantMap storeinfo);
public slots:
void GetCurrLineEdit();
private slots:
void on_pushButton_login_clicked();
void number_btn_click();
void on_pushButton_close_clicked();
private:
Ui::LoginForm *ui;
ClickedLineEdit *_curr_lineedit;
bool is_login;
// 通知窗口
AlertForm *m_alertForm;
};
#endif // LOGINFORM_H
takeout/view/mainForm.cpp
......@@ -71,7 +71,7 @@ MainForm::MainForm(QWidget *parent) :
FMApplication::subscibeEvent(this, PosEvent::s_change_order);
FMApplication::subscibeEvent(this, PosEvent::s_get_order_status);
FMApplication::subscibeEvent(this, PosEvent::s_delete_order);
FMApplication::subscibeEvent(this, PosEvent::s_login_storeinfo);
// 初始化界面
_Init();
......@@ -96,10 +96,14 @@ void MainForm::MyShow()
// else{
// this->hide();
// }
this->show();
//this->show();
//ui->mainBtnDayReport->hide();
// 考虑到坐标问题放到这里构建
this->showFullScreen();
this->hide();
m_alertForm = new AlertForm(this);
m_pickForm = new PickForm(this);
......@@ -147,6 +151,17 @@ bool MainForm::event(QEvent *e)
return true;
}
if(e->type() == PosEvent::s_login_storeinfo)
{
QVariantMap map;
GETEVENTINFO(map, e, QVariantMap);
m_storeinfo = map;
return true;
}
if(e->type() == PosEvent::s_delete_order)
{
QVariantMap value;
......@@ -167,18 +182,21 @@ bool MainForm::event(QEvent *e)
if(value.contains(EVENT_KEY_ORDERSTATUS) && value[EVENT_KEY_ORDERSTATUS].toInt() == 0)
{
onShowAlert(AlertForm::LOADING, value[EVENT_KEY_MSG].toString());
if(!this->isHidden())
onShowAlert(AlertForm::LOADING, value[EVENT_KEY_MSG].toString());
return true;
}
if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == false)
{
QLOG_INFO() << value[EVENT_KEY_MSG].toString();
onShowAlert(AlertForm::ERROR, value[EVENT_KEY_MSG].toString());
if(!this->isHidden())
onShowAlert(AlertForm::ERROR, value[EVENT_KEY_MSG].toString());
}
else if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == true)
{
onShowAlert(AlertForm::SUCCESS, value[EVENT_KEY_MSG].toString());
if(!this->isHidden())
onShowAlert(AlertForm::SUCCESS, value[EVENT_KEY_MSG].toString());
}
return true;
}
......@@ -192,7 +210,8 @@ bool MainForm::event(QEvent *e)
if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == false)
{
QLOG_INFO() << value[EVENT_KEY_MSG].toString();
onShowAlert(AlertForm::ERROR, value[EVENT_KEY_MSG].toString());
// if(!this->isHidden())
// onShowAlert(AlertForm::ERROR, value[EVENT_KEY_MSG].toString());
onSetOpeStatus(QString::fromLocal8Bit("未登录"));
}
else if(value.contains(EVENT_KEY_STATUS) && value[EVENT_KEY_STATUS].toBool() == true)
......@@ -201,7 +220,7 @@ bool MainForm::event(QEvent *e)
onSetCashierInfo(m_storeinfo[JSON_STATIONID].toString());
onSetOpeStatus(QString::fromLocal8Bit("登陆成功"));
onSetNetStatus(QString::fromLocal8Bit("正常"));
onHideAlert();
// onHideAlert();
}
return true;
}
......
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