Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
huangzhicong
/
SmartCanteen
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ff4fa9c0
authored
Dec 11, 2019
by
patpat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加第三方离线支付失败提示
parent
ee03cefa
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletions
+3
-1
app/src/main/assets/pay-other-platform-offline.mp3
+0
-0
app/src/main/java/com/bgycc/smartcanteen/action/PayOfflineAction.java
+2
-1
app/src/main/java/com/bgycc/smartcanteen/helper/TTSHelper.kt
+1
-0
No files found.
app/src/main/assets/pay-other-platform-offline.mp3
0 → 100644
View file @
ff4fa9c0
File added
app/src/main/java/com/bgycc/smartcanteen/action/PayOfflineAction.java
View file @
ff4fa9c0
...
@@ -4,6 +4,7 @@ import com.bgycc.smartcanteen.App;
...
@@ -4,6 +4,7 @@ import com.bgycc.smartcanteen.App;
import
com.bgycc.smartcanteen.Storage.PayStorage
;
import
com.bgycc.smartcanteen.Storage.PayStorage
;
import
com.bgycc.smartcanteen.event.PayStateEvent
;
import
com.bgycc.smartcanteen.event.PayStateEvent
;
import
com.bgycc.smartcanteen.event.QRCodeRepeatEvent
;
import
com.bgycc.smartcanteen.event.QRCodeRepeatEvent
;
import
com.bgycc.smartcanteen.helper.TTSHelper
;
import
com.bgycc.smartcanteen.helper.TimerHelper
;
import
com.bgycc.smartcanteen.helper.TimerHelper
;
import
com.bgycc.smartcanteen.server.websocket.MainWebSocket
;
import
com.bgycc.smartcanteen.server.websocket.MainWebSocket
;
import
com.bgycc.smartcanteen.task.QRCodeTask
;
import
com.bgycc.smartcanteen.task.QRCodeTask
;
...
@@ -79,7 +80,7 @@ public class PayOfflineAction extends Action {
...
@@ -79,7 +80,7 @@ public class PayOfflineAction extends Action {
setState
(
State
.
STARTED
);
setState
(
State
.
STARTED
);
if
(!
QRCodeTask
.
TYPE_BHPAY
.
equals
(
payCodeType
))
{
if
(!
QRCodeTask
.
TYPE_BHPAY
.
equals
(
payCodeType
))
{
setState
(
State
.
FAIL
);
setState
(
State
.
FAIL
,
"第三方支付异常"
);
return
;
return
;
}
}
if
(
checkRepeat
&&
mPayCodeHistory
.
contains
(
payCode
))
{
if
(
checkRepeat
&&
mPayCodeHistory
.
contains
(
payCode
))
{
...
...
app/src/main/java/com/bgycc/smartcanteen/helper/TTSHelper.kt
View file @
ff4fa9c0
...
@@ -67,6 +67,7 @@ object TTSHelper {
...
@@ -67,6 +67,7 @@ object TTSHelper {
"非本窗口营业时间"
->
"pay-window-rest-time.mp3"
"非本窗口营业时间"
->
"pay-window-rest-time.mp3"
"非营业时间"
->
"pay-canteen-rest-time.mp3"
"非营业时间"
->
"pay-canteen-rest-time.mp3"
"余额不足"
->
"pay-balance-not-enough.mp3"
"余额不足"
->
"pay-balance-not-enough.mp3"
"第三方支付异常"
->
"pay-other-platform-offline.mp3"
else
->
"pay-fail.mp3"
else
->
"pay-fail.mp3"
}
}
...
...
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