Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sbkpay
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhenfei.zhang
sbkpay
Commits
3ad8a0a9
Commit
3ad8a0a9
authored
May 15, 2019
by
wuyang.zou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug:
1、编译减少报警错误; 2、针对POS出现多屏情况,客户端插件显示到非主屏的BUG;
parent
e6a62032
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
22 additions
and
9 deletions
+22
-9
sbkpay/DataProcess/cretopt.h
+2
-0
sbkpay/DataProcess/rollback.cpp
+1
-0
sbkpay/fmp_window.h
+5
-4
sbkpay/fmtool.h
+1
-0
sbkpay/hostwidget.cpp
+7
-3
sbkpay/jsonfactory.h
+1
-0
sbkpay/rspfactory.h
+4
-1
sbkpay/version.h
+1
-1
No files found.
sbkpay/DataProcess/cretopt.h
View file @
3ad8a0a9
...
...
@@ -83,6 +83,8 @@ public:
static
bool
RSASign
(
QJsonObject
&
json
,
QString
&
sign
)
{
Q_UNUSED
(
json
);
Q_UNUSED
(
sign
);
return
true
;
}
...
...
sbkpay/DataProcess/rollback.cpp
View file @
3ad8a0a9
...
...
@@ -39,6 +39,7 @@ RollBack::~RollBack()
void
RollBack
::
RollWiteQuery
(
QSqlDatabase
&
_db
,
QSqlQuery
&
query
)
{
Q_UNUSED
(
_db
);
while
(
query
.
next
())
{
QString
parnetid
=
query
.
value
(
0
).
toString
();
...
...
sbkpay/fmp_window.h
View file @
3ad8a0a9
#ifndef FMP_WINDOW_H
#
ifndef
FMP_WINDOW_H
#define FMP_WINDOW_H
#include <QWidget>
...
...
@@ -40,9 +40,10 @@ public:
::
SetForegroundWindow
((
HWND
)
effectiveWinId
());
QDesktopWidget
w
;
QRect
rc
=
w
.
availableGeometry
();
setGeometry
((
rc
.
width
()
-
width
())
/
2
,
(
rc
.
height
()
-
height
())
/
2
,
width
(),
height
());
//QRect rc = w.availableGeometry();
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
();
}
...
...
sbkpay/fmtool.h
View file @
3ad8a0a9
...
...
@@ -150,6 +150,7 @@ public:
static
void
SetStringWith
(
void
*
beginptr
,
int
size
,
const
QString
&
in
)
{
Q_UNUSED
(
size
);
char
buf
[
MAX_PRINT_LEN
]
=
{
0
};
char
tmpbuf
[
MAX_PRINT_LEN
]
=
{
0
};
...
...
sbkpay/hostwidget.cpp
View file @
3ad8a0a9
...
...
@@ -92,11 +92,15 @@ void HostWidget::ShowWidget(QWidget *showwidget)
}
_widgetlist
.
at
(
i
)
->
hide
();
}
//this->show();
//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
()
...
...
sbkpay/jsonfactory.h
View file @
3ad8a0a9
...
...
@@ -51,6 +51,7 @@ public:
return
GetAgainPrinteJson
(
json
,
reqJson
,
list
);
default
:
json
=
reqJson
;
return
false
;
break
;
}
}
...
...
sbkpay/rspfactory.h
View file @
3ad8a0a9
#ifndef RSPFACTORY
#
ifndef
RSPFACTORY
#define RSPFACTORY
#include "requestmodel.h"
...
...
@@ -265,11 +265,14 @@ private:
static
bool
GetFindResponse
(
AlipayResponse
&
response
,
const
QJsonObject
&
json
)
{
Q_UNUSED
(
response
);
Q_UNUSED
(
json
);
return
false
;
}
static
bool
GetFindResponse
(
QJsonObject
&
response
,
const
QJsonObject
&
json
)
{
Q_UNUSED
(
response
);
// response[JSON_KEY_STATUSCODE] = json[JSON_KEY_STATUSCODE];
// response[JSON_KEY_MESSAGE] = json[JSON_KEY_MESSAGE];
response
=
json
;
...
...
sbkpay/version.h
View file @
3ad8a0a9
...
...
@@ -5,7 +5,7 @@
#define VER_MINOR 2
#define VER_REVISION 7
#define VER_BUILD
5
#define VER_BUILD
6
//! Convert version numbers to string
#define _STR(S) #S
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment