Commit 005693b1 by Amnes1a

显示桌面悬浮窗; 消除部分警告信息

parent 0e47e6b8
......@@ -83,6 +83,7 @@ RESOURCES += \
res/img.qrc
win32 {
QMAKE_CXXFLAGS += /wd4018 /wd4189
RC_FILE += res/$${ORIGIN_TARGET}.rc
system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET)
}
......
......@@ -46,10 +46,10 @@ int FMPHomePrivate::Init()
// _navWindow->createMenuBtn("payment", QString::fromLocal8Bit("非码支付"));
// _navWindow->createMenuBtn("vip", QString::fromLocal8Bit("非码会员"));
// _navWindow->createMenuBtn("takeout", QString::fromLocal8Bit("非码外卖"));
// _navWindow->createMenuBtn("coupons", QString::fromLocal8Bit("码多多"));
_navWindow->createMenuBtn("coupons", QString::fromLocal8Bit("码多多"));
// _navWindow->createMenuBtn("tool", QString::fromLocal8Bit("设置"));
// _navWindow->show();
_navWindow->show();
connect(_navWindow, SIGNAL(menuBtnClicked(QString)), this, SLOT(onMenuBtnClicked(QString)));
connect(_navWindow, &NavWindow::pluginActived, this, &FMPHomePrivate::onPluginActived);
......@@ -69,17 +69,6 @@ int FMPHomePrivate::Init()
q->_inited = true;
q->notification(QString::fromLocal8Bit("[非码POS插件]启动成功!"));
QTimer::singleShot(1000, this,
[](){
//启动卡券核销
FMPRedeemInterface* svcRedeem = FMP::GetService<FMPRedeemInterface>();
if(svcRedeem)
{
svcRedeem->StartService();
QJsonObject result = svcRedeem->Redeem(QJsonArray());
FMP_DEBUG() << result;
}
});
return FMP_SUCCESS;
}
......@@ -179,6 +168,19 @@ void FMPHomePrivate::onMenuBtnClicked(QString btnName)
} else if(btnName == "coupons") {
// FMPVipInterface *e = q->GetService<FMPVipInterface>(q->_ctx);
// e->StartService();
//启动卡券核销
FMPRedeemInterface* svcRedeem = FMP::GetService<FMPRedeemInterface>();
if(svcRedeem)
{
svcRedeem->StartService();
QJsonObject result = svcRedeem->Redeem(QJsonArray());
FMP_DEBUG() << result;
}
else
{
FMP_DEBUG() << "coupon service not available";
}
return ;
} else if(btnName == "tool") {
svc = FMP::GetService<FMPSettingsInterface>();
}
......
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