Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
FmTakeaway
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
shangshang.dai
FmTakeaway
Commits
7e37cbf1
Commit
7e37cbf1
authored
Jun 22, 2017
by
shangshang.dai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix 1:修复切换请求URL的BUG
parent
0206ea0d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
fmTakeaway/Network/billSocket.cpp
+13
-4
fmTakeaway/Network/billSocket.h
+1
-0
No files found.
fmTakeaway/Network/billSocket.cpp
View file @
7e37cbf1
...
@@ -23,8 +23,8 @@ BillSocket::BillSocket(QObject *parent)
...
@@ -23,8 +23,8 @@ BillSocket::BillSocket(QObject *parent)
// {
// {
// m_networkManger.setProxy(proxy);
// m_networkManger.setProxy(proxy);
// }
// }
m_current_url
=
0
;
m_errorNum
=
0
;
m_errorNum
=
0
;
m_alternateUrl
=
ConfigManger
::
GetInstance
().
GetServerUrl1
();
m_networkRequest
.
setUrl
(
ConfigManger
::
GetInstance
().
GetServerUrl
());
m_networkRequest
.
setUrl
(
ConfigManger
::
GetInstance
().
GetServerUrl
());
m_networkRequest
.
setRawHeader
(
"Content-Type"
,
"text/json"
);
m_networkRequest
.
setRawHeader
(
"Content-Type"
,
"text/json"
);
}
}
...
@@ -40,11 +40,21 @@ bool BillSocket::Request(const QJsonObject &requestJson, QJsonObject &recvJson,
...
@@ -40,11 +40,21 @@ bool BillSocket::Request(const QJsonObject &requestJson, QJsonObject &recvJson,
{
{
m_networkManger
.
setNetworkAccessible
(
QNetworkAccessManager
::
Accessible
);
m_networkManger
.
setNetworkAccessible
(
QNetworkAccessManager
::
Accessible
);
}
}
if
(
m_errorNum
>=
2
)
if
(
m_errorNum
>=
5
)
{
{
if
(
m_current_url
==
0
)
{
m_alternateUrl
=
ConfigManger
::
GetInstance
().
GetServerUrl1
();
m_current_url
=
1
;
}
else
{
m_alternateUrl
=
ConfigManger
::
GetInstance
().
GetServerUrl
();
m_current_url
=
0
;
}
m_networkRequest
.
setUrl
(
m_alternateUrl
);
m_networkRequest
.
setUrl
(
m_alternateUrl
);
QLOG_INFO
()
<<
QString
(
"change url to [%1]"
).
arg
(
m_alternateUrl
.
toString
());
QLOG_INFO
()
<<
QString
(
"change url to [%1]"
).
arg
(
m_alternateUrl
.
toString
());
m_alternateUrl
=
ConfigManger
::
GetInstance
().
GetServerUrl
();
m_errorNum
=
0
;
}
}
QByteArray
sendArray
=
QJsonDocument
(
requestJson
).
toJson
(
QJsonDocument
::
Compact
);
QByteArray
sendArray
=
QJsonDocument
(
requestJson
).
toJson
(
QJsonDocument
::
Compact
);
...
@@ -74,6 +84,5 @@ bool BillSocket::Request(const QJsonObject &requestJson, QJsonObject &recvJson,
...
@@ -74,6 +84,5 @@ bool BillSocket::Request(const QJsonObject &requestJson, QJsonObject &recvJson,
recvJson
=
QJsonDocument
::
fromJson
(
recvArray
).
object
();
recvJson
=
QJsonDocument
::
fromJson
(
recvArray
).
object
();
reply
->
deleteLater
();
reply
->
deleteLater
();
m_errorNum
=
0
;
return
true
;
return
true
;
}
}
fmTakeaway/Network/billSocket.h
View file @
7e37cbf1
...
@@ -20,6 +20,7 @@ private:
...
@@ -20,6 +20,7 @@ private:
QUrl
m_alternateUrl
;
QUrl
m_alternateUrl
;
QNetworkAccessManager
m_networkManger
;
QNetworkAccessManager
m_networkManger
;
QNetworkRequest
m_networkRequest
;
QNetworkRequest
m_networkRequest
;
int
m_current_url
;
};
};
#endif // BILLSOCKET_H
#endif // BILLSOCKET_H
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