Commit 06108fca by Carwyn

1. 配置 Key 修改; 2. 屏蔽登录(正式接口不兼容)

parent 247a7347
...@@ -40,7 +40,8 @@ HEADERS += fmp_home.h \ ...@@ -40,7 +40,8 @@ HEADERS += fmp_home.h \
fmp_home_settings.h \ fmp_home_settings.h \
fmp_flicker.h \ fmp_flicker.h \
algorithm.h \ algorithm.h \
fmp_message.h fmp_message.h \
fmp_home_def.h
FORMS += \ FORMS += \
fmp_home_navwindow.ui \ fmp_home_navwindow.ui \
......
#ifndef FMP_HOME_DEF_H
#define FMP_HOME_DEF_H
#define FMP_INIKEY_LOGINSERVER "Home/Server"
#define FMP_INIKEY_LOGINPWD "Home/Pwd"
#define FMP_INIKEY_LOGINSTOREID "Home/StoreId"
#define FMP_INIKEY_LOGINPOSID "Home/PosId"
#define FMP_INIKEY_LOGINBUSINESS "Home/Business"
#define FMP_INIKEY_LOGINCASHIER "Home/CashierId"
#define FMP_INIKEY_LOGINPARTNERID "Home/PartnerId"
#define FMP_INIKEY_HOMEPOSITION "Home/Position"
#define FMP_INIKEY_HOMEAUTOLOGIN "Home/Autologin"
#define FMP_INIKEY_HOMEACCOUNT "Home/Account"
#define FMP_INIKEY_REMEMBERPWD "Home/RememberPwd"
#endif // FMP_HOME_DEF_H
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include <fmp_plugin_i.h> #include <fmp_plugin_i.h>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include "fmp_home_def.h"
class FMPHomeInterface : public QObject, public FMPluginInterface class FMPHomeInterface : public QObject, public FMPluginInterface
{ {
Q_OBJECT Q_OBJECT
......
...@@ -29,7 +29,7 @@ NavWindow::NavWindow(QWidget *parent) : ...@@ -29,7 +29,7 @@ NavWindow::NavWindow(QWidget *parent) :
connect(this, SIGNAL(stopBlink()), ui->navMainBtn, SLOT(stop())); connect(this, SIGNAL(stopBlink()), ui->navMainBtn, SLOT(stop()));
btns.push_back(std::make_pair("payment", QString::fromLocal8Bit("非码支付"))); btns.push_back(std::make_pair("payment", QString::fromLocal8Bit("非码支付")));
btns.push_back(std::make_pair("vip", QString::fromLocal8Bit("非码会员"))); // btns.push_back(std::make_pair("vip", QString::fromLocal8Bit("非码会员")));
btns.push_back(std::make_pair("takeout", QString::fromLocal8Bit("非码外卖"))); btns.push_back(std::make_pair("takeout", QString::fromLocal8Bit("非码外卖")));
// btns.push_back(std::make_pair("coupons", QString::fromLocal8Bit("码多多"))); // btns.push_back(std::make_pair("coupons", QString::fromLocal8Bit("码多多")));
btns.push_back(std::make_pair("tool", QString::fromLocal8Bit("设置"))); btns.push_back(std::make_pair("tool", QString::fromLocal8Bit("设置")));
......
...@@ -42,6 +42,14 @@ int FMPHomePrivate::Init() ...@@ -42,6 +42,14 @@ int FMPHomePrivate::Init()
connect(_navWindow, SIGNAL(menuBtnClicked(QString)), this, SLOT(onMenuBtnClicked(QString))); connect(_navWindow, SIGNAL(menuBtnClicked(QString)), this, SLOT(onMenuBtnClicked(QString)));
connect(_navWindow, &NavWindow::pluginActived, this, &FMPHomePrivate::onPluginActived); connect(_navWindow, &NavWindow::pluginActived, this, &FMPHomePrivate::onPluginActived);
login();
// 启动外卖
FMPBaseInterface *svc = q->GetService<FMPTakeoutInterface>(q->_ctx);
if(svc) {
svc->StartService();
}
q->_inited = true; q->_inited = true;
return FMP_SUCCESS; return FMP_SUCCESS;
} }
...@@ -128,12 +136,6 @@ void FMPHomePrivate::onMenuBtnClicked(QString btnName) ...@@ -128,12 +136,6 @@ void FMPHomePrivate::onMenuBtnClicked(QString btnName)
if(!_isLogined && btnName!="tool") { if(!_isLogined && btnName!="tool") {
if(login() != FMP_SUCCESS) { if(login() != FMP_SUCCESS) {
return; return;
} else if(btnName != "takeout") {
// 启动外卖
FMPBaseInterface *svc = q->GetService<FMPTakeoutInterface>(q->_ctx);
if(svc) {
svc->StartService();
}
} }
} }
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
#include <QVariant> #include <QVariant>
#include <fmp_logger_i.h> #include <fmp_logger_i.h>
#include "fmp_home_def.h"
class FMPSettingsInterface; class FMPSettingsInterface;
class FMPHomeSettings : public QObject class FMPHomeSettings : public QObject
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 9 #define VER_BUILD 15
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
......
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