Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmp_vip
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
fmp_vip
Commits
fea1896a
Commit
fea1896a
authored
Nov 06, 2017
by
NitefullWind
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 所有接口弹窗显示错误信息。 2. 网络错误时如果服务端返回了Json信息则显示服务端的信息。
parent
3193ea90
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
9 deletions
+33
-9
fmp_vip.pro
+1
-1
task/fmtask.cpp
+22
-7
task/fmtask.h
+5
-0
task/fmtasknownd.cpp
+4
-0
task/taskothers.cpp
+1
-1
No files found.
fmp_vip.pro
View file @
fea1896a
...
...
@@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG
+=
c
++
11
DEFINES
+=
TEST
#
DEFINES += TEST
SOURCES
+=
\
fmp_vip
.
cpp
\
...
...
task/fmtask.cpp
View file @
fea1896a
...
...
@@ -23,7 +23,8 @@ FMTask::FMTask(QJsonObject &jsonObj, FM_TYPE fmType, Session *session, QObject *
_FM_Type
(
fmType
),
preTask
(
nullptr
),
_error
(
FM_API_SUCCESS
),
_errorMsg
(
""
)
_errorMsg
(
""
),
_isShowErrorMsgWnd
(
true
)
{
if
(
session
==
0
)
{
_session
=
new
Session
();
...
...
@@ -50,6 +51,10 @@ QByteArray FMTask::doTask()
RunFunction
(
showWindow
);
RunFunction
(
packagePOSRsp
);
if
(
_isShowErrorMsgWnd
&&
getServerJsonValue
(
PosProps
.
StatusCode
).
toInt
((
int
)
FM_API_SUCCESS
)
!=
FM_API_SUCCESS
)
{
FMMsgWnd
::
FailureWnd
(
getServerJsonValue
(
PosProps
.
Msg
).
toString
(),
_window
);
}
QJsonDocument
json
(
posRspJsonObj
);
return
json
.
toJson
(
QJsonDocument
::
Compact
);
}
...
...
@@ -125,13 +130,13 @@ bool FMTask::sendToServer(bool isShowMsg)
FMP_INFO
()
<<
"Server rsponse: "
<<
rspData
;
// 网络错误
if
(
net
.
error
!=
FM_API_SUCCESS
)
{
QJsonParseError
jsonErr
;
QJsonDocument
rspJson
=
QJsonDocument
::
fromJson
(
rspData
,
&
jsonErr
);
// 网络错误,且服务端返回数据不为Json
if
(
net
.
error
!=
FM_API_SUCCESS
&&
jsonErr
.
error
!=
QJsonParseError
::
NoError
)
{
setError
(
net
.
error
,
net
.
errorMsg
);
}
else
{
QJsonParseError
jsonErr
;
QJsonDocument
rspJson
=
QJsonDocument
::
fromJson
(
rspData
,
&
jsonErr
);
// Json错误
if
(
jsonErr
.
error
!=
QJsonParseError
::
NoError
)
{
setError
(
FM_API_BADJSON
);
...
...
@@ -150,7 +155,7 @@ bool FMTask::sendToServer(bool isShowMsg)
}
bool
isOk
=
(
error
()
==
FM_API_SUCCESS
);
if
(
!
isOk
&&
isShowMsg
)
if
(
!
isOk
&&
isShowMsg
&&
_isShowErrorMsgWnd
)
{
FMMsgWnd
::
FailureWnd
(
errorString
(),
_window
);
}
...
...
@@ -223,3 +228,13 @@ QString FMTask::sign() const
QByteArray
md5Bt
=
QCryptographicHash
::
hash
(
bt
,
QCryptographicHash
::
Md5
);
return
md5Bt
.
toHex
();
}
bool
FMTask
::
getIsShowErrorMsgWnd
()
const
{
return
_isShowErrorMsgWnd
;
}
void
FMTask
::
setIsShowErrorMsgWnd
(
bool
isShowErrorMsgWnd
)
{
_isShowErrorMsgWnd
=
isShowErrorMsgWnd
;
}
task/fmtask.h
View file @
fea1896a
...
...
@@ -27,6 +27,8 @@ public:
QJsonValue
getServerJsonValue
(
const
QString
prop
);
QJsonValue
getPosJsonValue
(
const
QString
prop
);
bool
getIsShowErrorMsgWnd
()
const
;
void
setIsShowErrorMsgWnd
(
bool
isShowErrorMsgWnd
);
protected
:
// 从配置文件中拷贝数据信息
void
copyPros
();
...
...
@@ -50,6 +52,8 @@ protected:
FMTask
*
preTask
;
bool
_isShowErrorMsgWnd
;
private
:
QString
sign
()
const
;
...
...
@@ -75,6 +79,7 @@ public:
return
fm_error
.
at
(
_error
);
}
}
private
:
FMError
_error
;
QString
_errorMsg
;
...
...
task/fmtasknownd.cpp
View file @
fea1896a
...
...
@@ -18,6 +18,10 @@ QByteArray FMTaskNoWnd::doTask()
}
packagePOSRsp
();
if
(
_isShowErrorMsgWnd
&&
getServerJsonValue
(
PosProps
.
StatusCode
).
toInt
((
int
)
FM_API_SUCCESS
)
!=
FM_API_SUCCESS
)
{
FMMsgWnd
::
FailureWnd
(
getServerJsonValue
(
PosProps
.
Msg
).
toString
(),
_window
);
}
QJsonDocument
json
(
posRspJsonObj
);
return
json
.
toJson
(
QJsonDocument
::
Compact
);
}
task/taskothers.cpp
View file @
fea1896a
...
...
@@ -3,7 +3,7 @@
TaskCoupon
::
TaskCoupon
(
QJsonObject
&
jsonObj
,
Session
*
session
,
QObject
*
parent
)
:
FMTaskNoWnd
(
jsonObj
,
FM_Coupon
,
session
,
parent
)
{
_isShowErrorMsgWnd
=
false
;
}
void
TaskCoupon
::
packageServerReq
()
...
...
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