Merge branch 'develop' into test

app/src/main/java/com/bgycc/smartcanteen/action/PayOfflineAction.java

@@ -4,6 +4,7 @@ import com.bgycc.smartcanteen.App;
 import com.bgycc.smartcanteen.Storage.PayStorage;
 import com.bgycc.smartcanteen.event.PayStateEvent;
 import com.bgycc.smartcanteen.event.QRCodeRepeatEvent;
+import com.bgycc.smartcanteen.helper.TTSHelper;
 import com.bgycc.smartcanteen.helper.TimerHelper;
 import com.bgycc.smartcanteen.server.websocket.MainWebSocket;
 import com.bgycc.smartcanteen.task.QRCodeTask;
@@ -79,7 +80,7 @@ public class PayOfflineAction extends Action {
         setState(State.STARTED);
 
         if (!QRCodeTask.TYPE_BHPAY.equals(payCodeType)) {
-            setState(State.FAIL);
+            setState(State.FAIL, "第三方支付异常");
             return;
         }
         if (checkRepeat && mPayCodeHistory.contains(payCode)) {

app/src/main/java/com/bgycc/smartcanteen/helper/TTSHelper.kt

@@ -67,6 +67,7 @@ object TTSHelper {
             "非本窗口营业时间" -> "pay-window-rest-time.mp3"
             "非营业时间" -> "pay-canteen-rest-time.mp3"
             "余额不足" -> "pay-balance-not-enough.mp3"
+            "第三方支付异常" -> "pay-other-platform-offline.mp3"
             else -> "pay-fail.mp3"
         }