Merge branch 'fea-payoffline_split' of…

Merge branch 'fea-payoffline_split' of https://git.bgy.com.cn/bu00302/dining-android into fea-payoffline_split

# Conflicts:
#	app/src/main/java/com/bgycc/smartcanteen/data/dao/PayDataDao.java
#	app/src/main/java/com/bgycc/smartcanteen/viewModel/PayOfflineViewModel.java

app/src/main/java/com/bgycc/smartcanteen/data/dao/PayDataDao.java

@@ -15,7 +15,7 @@ public interface PayDataDao {
     /**
     /**
      * 获取需要离线支付的订单
      * 获取需要离线支付的订单
      */
      */
-    @Query("select * from paydata where payState == -1 limit 2")
+    @Query("select * from paydata where payState == -1 limit 10")
     List<PayData> queryPayOfflineData();
     List<PayData> queryPayOfflineData();
 
 
     /**
     /**

app/src/main/java/com/bgycc/smartcanteen/viewModel/PayOfflineViewModel.java

@@ -108,7 +108,6 @@ public class PayOfflineViewModel extends ViewModel {
             // 1、没有action
             // 1、没有action
             // 2、message为"操作完成"
             // 2、message为"操作完成"
             LogUtils.d(TAG, "离线支付结果响应: " + original);
             LogUtils.d(TAG, "离线支付结果响应: " + original);
-            cancelTimeout();
             ResponseRunnable runnable = new ResponseRunnable(original);
             ResponseRunnable runnable = new ResponseRunnable(original);
             SCTaskExecutor.getInstance().executeOnDiskIO(runnable);
             SCTaskExecutor.getInstance().executeOnDiskIO(runnable);
         }
         }
@@ -170,6 +169,7 @@ public class PayOfflineViewModel extends ViewModel {
 
 
         @Override
         @Override
         public void run() {
         public void run() {
+            cancelTimeout();
             if (payRequest == null || payRequest.getData().isEmpty()) {
             if (payRequest == null || payRequest.getData().isEmpty()) {
                 LogUtils.w(TAG, "后台返回离线支付结果，但没有待处理任务");
                 LogUtils.w(TAG, "后台返回离线支付结果，但没有待处理任务");
                 payOfflineState.postValue(new PayOfflineState(PayOfflineState.IDLE));
                 payOfflineState.postValue(new PayOfflineState(PayOfflineState.IDLE));