Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/dialog/LoadingDialog.java

@@ -45,13 +45,13 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin
         super.show(activity, 20);
     }
 
+    public void show(BaseActivity activity, int s) {
+        super.show(activity, s);
+    }
+
     @Override
     public void onDismiss(DialogInterface dialog) {
         super.onDismiss(dialog);
-//        if (null != disp && (!disp.isDisposed())) {
-//            disp.dispose();
-//        }
-
     }
 
 }

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java

@@ -173,7 +173,7 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
 
     @Override
     public void showLoadingDialog() {
-        mLoadingDialog.show(this);
+        mLoadingDialog.show(this, 60);
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleContract.java

@@ -257,8 +257,10 @@ interface SettleContract {
 
         /**
          * 支付中页面 - 查看支付状态
+         *
+         * @param payType 支付类型
          */
-        public abstract void checkPayState();
+        public abstract void checkPayState(int payType);
 
         /**
          * 支付结果页面 - 完成订单

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java

@@ -302,7 +302,7 @@ public class SettlePresenter extends SettleContract.Presenter {
     }
 
     @Override
-    public void checkPayState() {
+    public void checkPayState(int payType) {
         mView.showLoadingDialog();
         JniFactory.Settle.query()
                 .doFinally(() -> mView.dismissLoadingDialog())
@@ -310,7 +310,7 @@ public class SettlePresenter extends SettleContract.Presenter {
                             com.xingdata.zzdpos.api.Pay.Response r1 = JSON.parseObject(s.replace("\\", ""), com.xingdata.zzdpos.api.Pay.Response.class);
                             switch (r1.getResponseCode()) {
                                 case "0000":
-                                    subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.ALI)).doFinally(() -> mView.dismissLoadingDialog())));
+                                    subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, payType)).doFinally(() -> mView.dismissLoadingDialog())));
                                     break;
                                 case "0098":
                                     mView.showMsg("交易处理中");
@@ -356,15 +356,11 @@ public class SettlePresenter extends SettleContract.Presenter {
      * 提交订单
      */
     private Observable<String> commitOrder() {
-        if (StringUtils.isEmpty(mSaleorder.getOrderNo())) {
-            return ApiFactory.Saleorder.addOrderMis(createSaleorderParam())
-                    .doAfterNext(s -> {
-                        mSaleorder.setOrderNo(s);
-                        mView.changeLockState(true);
-                    });
-        } else {
-            return Observable.just(mSaleorder.getOrderNo());
-        }
+        return ApiFactory.Saleorder.addOrderMis(createSaleorderParam())
+                .doAfterNext(s -> {
+                    mSaleorder.setOrderNo(s);
+                    mView.changeLockState(true);
+                });
     }
 
     /**

app/src/main/java/com/xingdata/zzdpos/ui/settle/dialog/PayingDialog.java

@@ -26,8 +26,7 @@ public class PayingDialog extends BaseDialog<SettlePresenter, DialogSettlePaying
 
     @Override
     public void initView() {
-
-        mViewBinding.tvCheck.setOnClickListener(view -> mPresenter.checkPayState());
+        mViewBinding.tvCheck.setOnClickListener(view -> mPresenter.checkPayState(mType));
         switch (mType) {
             case C.PAY_CHANNEL.ALI:
                 mViewBinding.ivLogo.setImageResource(R.mipmap.pay_alipay);