Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
FMVip_LXJ
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
FMVip_LXJ
Commits
bf7d9c1b
Commit
bf7d9c1b
authored
Jan 03, 2017
by
NitefullWind
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 等待POS关闭Socket后外挂再断开Socket。 2. 修复其他bug。
parent
1d34495b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
7 deletions
+16
-7
FMVipDC/fmsockserver.cpp
+11
-2
FMVip_LXJ/res/FMVip.qrc
+0
-4
FMVip_LXJ/task/taskmanage.cpp
+4
-0
FMVip_LXJ/windows/fmvippanel.cpp
+1
-1
No files found.
FMVipDC/fmsockserver.cpp
View file @
bf7d9c1b
...
...
@@ -212,13 +212,22 @@ void FMSockServer::RecvRoutine(DWORD err, DWORD bytes, LPWSAOVERLAPPED overlappe
io_data
->
relay
->
Transfer
(
io_data
->
msg
,
response
,
len
);
}
if
(
response
)
{
FMLOG
(
"Transfered %s"
,
response
);
send
(
io_data
->
socket
,
response
,
len
,
0
);
FMLOG
(
"Transfered %s"
,
response
);
}
else
{
FMLOG
(
_T
(
"Failed to determine response data."
));
}
closesocket
(
io_data
->
socket
);
HANDLE
closeEvent
=
WSACreateEvent
();
WSAEventSelect
(
io_data
->
socket
,
closeEvent
,
FD_CLOSE
);
DWORD
dwRet
=
WaitForSingleObject
(
closeEvent
,
5000
);
// if(dwRet == WSA_WAIT_EVENT_0) {
closesocket
(
io_data
->
socket
);
// }
WSACloseEvent
(
closeEvent
);
//! Free all buffer
HeapFree
(
GetProcessHeap
(),
0
,
io_data
);
...
...
FMVip_LXJ/res/FMVip.qrc
View file @
bf7d9c1b
...
...
@@ -7,10 +7,6 @@
<file>chk_checked.png</file>
<file>chk_unchecked.png</file>
<file>img_logo.png</file>
<file>data/coupon</file>
<file>data/order</file>
<file>data/profile</file>
<file>data/user</file>
<file>loading.gif</file>
<file>alert_bg.png</file>
<file>tip_warning.png</file>
...
...
FMVip_LXJ/task/taskmanage.cpp
View file @
bf7d9c1b
...
...
@@ -77,6 +77,10 @@ void TaskManage::doChildTask()
posRspJsonObj
[
prop
]
=
(
*
childRsp
)[
prop
];
}
if
(
childTask
->
error
()
==
FM_API_WINDOWCLOSE
)
{
return
;
}
closeWindow
();
}
...
...
FMVip_LXJ/windows/fmvippanel.cpp
View file @
bf7d9c1b
...
...
@@ -25,7 +25,7 @@ void FMVipPanel::initWnd(Session *session)
ui
->
operator_label
->
setText
(
session
->
data
(
PosProps
.
OperatorId
).
toString
());
ui
->
bd_label
->
setText
(
session
->
data
(
PosProps
.
BussinessDate
).
toString
());
ui
->
id_label
->
setText
(
session
->
data
(
PosProps
.
Fm_open_id
).
toString
());
ui
->
balance_label
->
setText
(
QString
::
number
(
session
->
data
(
PosProps
.
Amount
).
toInt
()
/
100.0
));
ui
->
balance_label
->
setText
(
DOUBLE_STR
(
session
->
data
(
PosProps
.
Amount
).
toInt
()
/
100.0
));
ui
->
name_label
->
setText
(
session
->
data
(
PosProps
.
Name
).
toString
());
ui
->
bir_label
->
setText
(
session
->
data
(
PosProps
.
Birthday
).
toString
());
...
...
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