Commit 3ad8a0a9 by wuyang.zou

fix bug:

1、编译减少报警错误;
2、针对POS出现多屏情况,客户端插件显示到非主屏的BUG;
parent e6a62032
...@@ -83,6 +83,8 @@ public: ...@@ -83,6 +83,8 @@ public:
static bool RSASign(QJsonObject &json, QString &sign) static bool RSASign(QJsonObject &json, QString &sign)
{ {
Q_UNUSED(json);
Q_UNUSED(sign);
return true; return true;
} }
......
...@@ -39,6 +39,7 @@ RollBack::~RollBack() ...@@ -39,6 +39,7 @@ RollBack::~RollBack()
void RollBack::RollWiteQuery(QSqlDatabase &_db, QSqlQuery &query) void RollBack::RollWiteQuery(QSqlDatabase &_db, QSqlQuery &query)
{ {
Q_UNUSED(_db);
while(query.next()) while(query.next())
{ {
QString parnetid = query.value(0).toString(); QString parnetid = query.value(0).toString();
......
#ifndef FMP_WINDOW_H #ifndef FMP_WINDOW_H
#define FMP_WINDOW_H #define FMP_WINDOW_H
#include <QWidget> #include <QWidget>
...@@ -40,9 +40,10 @@ public: ...@@ -40,9 +40,10 @@ public:
::SetForegroundWindow((HWND)effectiveWinId()); ::SetForegroundWindow((HWND)effectiveWinId());
QDesktopWidget w; QDesktopWidget w;
QRect rc = w.availableGeometry(); //QRect rc = w.availableGeometry();
setGeometry((rc.width() - width()) / 2, (rc.height() - height()) / 2, width(), height()); QRect rc = w.screenGeometry(w.primaryScreen());//程序获取主屏幕索引号+ 根据屏幕索引号获取屏幕尺寸
setGeometry(rc.left(), rc.top(), rc.width(), rc.height());
//setGeometry((rc.width() - width()) / 2, (rc.height() - height()) / 2, width(), height());
return QWidget::show(); return QWidget::show();
} }
......
...@@ -150,6 +150,7 @@ public: ...@@ -150,6 +150,7 @@ public:
static void SetStringWith(void *beginptr, int size, const QString &in) static void SetStringWith(void *beginptr, int size, const QString &in)
{ {
Q_UNUSED(size);
char buf[MAX_PRINT_LEN] = { 0 }; char buf[MAX_PRINT_LEN] = { 0 };
char tmpbuf[MAX_PRINT_LEN] = { 0 }; char tmpbuf[MAX_PRINT_LEN] = { 0 };
......
...@@ -92,11 +92,15 @@ void HostWidget::ShowWidget(QWidget *showwidget) ...@@ -92,11 +92,15 @@ void HostWidget::ShowWidget(QWidget *showwidget)
} }
_widgetlist.at(i)->hide(); _widgetlist.at(i)->hide();
} }
//this->show(); //this->show();
//this->move(1200, 500); //this->move(1200, 500);
this->showFullScreen();
//解决POS收银屏幕多屏时出现程序界面跑到非主屏BUG; 需要将此处代码转移到父类中测试;
//QDesktopWidget qDW; int primaryScreenIndex = qDW.primaryScreen();//程序获取主屏幕索引号;
//QRect tempRect = qDW.screenGeometry(primaryScreenIndex);//根据屏幕索引号获取屏幕尺寸
//this->move(tempRect.left(),tempRect.top()); //移动到主屏并在主屏上显示全屏
this->show();
//this->showFullScreen(); //出现双屏POS之后就在无全屏展示了;
} }
void HostWidget::InitWidget() void HostWidget::InitWidget()
......
...@@ -51,6 +51,7 @@ public: ...@@ -51,6 +51,7 @@ public:
return GetAgainPrinteJson(json, reqJson, list); return GetAgainPrinteJson(json, reqJson, list);
default: default:
json = reqJson; json = reqJson;
return false;
break; break;
} }
} }
......
#ifndef RSPFACTORY #ifndef RSPFACTORY
#define RSPFACTORY #define RSPFACTORY
#include "requestmodel.h" #include "requestmodel.h"
...@@ -265,11 +265,14 @@ private: ...@@ -265,11 +265,14 @@ private:
static bool GetFindResponse(AlipayResponse &response, const QJsonObject &json) static bool GetFindResponse(AlipayResponse &response, const QJsonObject &json)
{ {
Q_UNUSED(response);
Q_UNUSED(json);
return false; return false;
} }
static bool GetFindResponse(QJsonObject &response, const QJsonObject &json) static bool GetFindResponse(QJsonObject &response, const QJsonObject &json)
{ {
Q_UNUSED(response);
// response[JSON_KEY_STATUSCODE] = json[JSON_KEY_STATUSCODE]; // response[JSON_KEY_STATUSCODE] = json[JSON_KEY_STATUSCODE];
// response[JSON_KEY_MESSAGE] = json[JSON_KEY_MESSAGE]; // response[JSON_KEY_MESSAGE] = json[JSON_KEY_MESSAGE];
response = json; response = json;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 2 #define VER_MINOR 2
#define VER_REVISION 7 #define VER_REVISION 7
#define VER_BUILD 5 #define VER_BUILD 6
//! 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