修改支付模块;

.idea/modules.xml

@@ -5,7 +5,6 @@
       <module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/neptune/neptune.iml" filepath="$PROJECT_DIR$/neptune/neptune.iml" />
-      <module fileurl="file://H:\work\TangKuPos\neptune\neptune.iml" filepath="H:\work\TangKuPos\neptune\neptune.iml" />
       <module fileurl="file://$PROJECT_DIR$/pay/pay.iml" filepath="$PROJECT_DIR$/pay/pay.iml" />
     </modules>
   </component>

app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java

@@ -260,7 +260,6 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
                     @Override
                     public void onNext(@io.reactivex.annotations.NonNull Long aLong) {
                         recLen = aLong;
-                        LogUtils.e("对话框将在" + aLong + "S后关闭");
                     }
 
                     @Override
@@ -275,7 +274,6 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
                 });
             }
         } else {
-            LogUtils.e("当前app属于后台，不可打开Dialog");
         }
     }
 

pay/src/main/java/com/xingdata/zxpay/PayCenter.java

 package com.xingdata.zxpay;
 
 
+import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.Utils;
 import com.xingdata.zxpay.api.Response;
+import com.xingdata.zxpay.model.Shopppp;
 import com.xingdata.zxpay.pax.PaxFactory;
 
 import io.reactivex.Observable;
@@ -22,17 +24,18 @@ public class PayCenter {
      */
     private int mPaySystem;
 
+
     /**
-     * 支付信息
+     * 交易基本信息
      */
-    public String mShoppppJson;
+    public Shopppp mShopppp;
 
 
     /**
      * 设置支付信息
      */
     public PayCenter setPayKey(String json) {
-        mShoppppJson = json;
+        mShopppp = JSON.parseObject(json, Shopppp.class);
         return this;
     }
 

pay/src/main/java/com/xingdata/zxpay/pax/Api.java

 package com.xingdata.zxpay.pax;
 
 
+import com.xingdata.zxpay.PayCenter;
+
 class Api extends com.xingdata.zxpay.api.Api {
     Service service;
 
@@ -19,6 +21,6 @@ class Api extends com.xingdata.zxpay.api.Api {
 
     @Override
     protected String getBaseUrl() {
-        return PaxFactory.getInstance().mShopppp.getHost().getHostAddr();
+        return PayCenter.getInstance().mShopppp.getHost().getHostAddr();
     }
 }

pay/src/main/java/com/xingdata/zxpay/pax/PaxFactory.java

@@ -3,10 +3,8 @@ package com.xingdata.zxpay.pax;
 
 import android.util.SparseArray;
 
-import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.TimeUtils;
 import com.xingdata.zxpay.PayCenter;
-import com.xingdata.zxpay.model.Shopppp;
 
 import java.text.SimpleDateFormat;
 import java.util.Locale;
@@ -16,7 +14,6 @@ import io.reactivex.Observable;
 public class PaxFactory extends com.xingdata.zxpay.api.Factory {
 
     private PaxFactory() {
-        mShopppp = JSON.parseObject(PayCenter.getInstance().mShoppppJson, Shopppp.class);
     }
 
     private static class PaxFactoryHolder {
@@ -27,11 +24,6 @@ public class PaxFactory extends com.xingdata.zxpay.api.Factory {
         return PaxFactory.PaxFactoryHolder.INSTANCE;
     }
 
-    /**
-     * 交易基本信息
-     */
-    Shopppp mShopppp;
-
     /**
      * 时间
      */
@@ -52,19 +44,19 @@ public class PaxFactory extends com.xingdata.zxpay.api.Factory {
      */
     public Observable<com.xingdata.zxpay.api.Response> microPay(int payChannel, String authCode, String totalAmount) {
         Request request = Request.create(C.METHOD.MICROPAY);
-        request.setOutTransactionNo(mShopppp.getPosppp().getHposTrace());
+        request.setOutTransactionNo(PayCenter.getInstance().mShopppp.getPosppp().getHposTrace());
         request.setTimeStart(TimeUtils.getNowString(format));
         request.setAuthCode(authCode);
         request.setTotalAmount(totalAmount);
         switch (payChannel) {
             case com.xingdata.zxpay.C.PAY_CHANNEL.ALI:
-                request.setKey(mShopppp.getHshopKeyAlipay());
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyAlipay());
                 break;
             case com.xingdata.zxpay.C.PAY_CHANNEL.WECHAT:
-                request.setKey(mShopppp.getHshopKeyWechat());
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyWechat());
                 break;
             case com.xingdata.zxpay.C.PAY_CHANNEL.BANK:
-                request.setKey(mShopppp.getHshopKeyUnipay());
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyUnipay());
                 break;
         }
         request.sign();
@@ -82,21 +74,21 @@ public class PaxFactory extends com.xingdata.zxpay.api.Factory {
      */
     public Observable<com.xingdata.zxpay.api.Response> qrPay(int payChannel, String totalAmount) {
         Request request = Request.create(C.METHOD.QRPAY);
-        request.setOutTransactionNo(mShopppp.getPosppp().getHposTrace());
+        request.setOutTransactionNo(PayCenter.getInstance().mShopppp.getPosppp().getHposTrace());
         request.setTimeStart(TimeUtils.getNowString(format));
         request.setTotalAmount(totalAmount);
         switch (payChannel) {
             case com.xingdata.zxpay.C.PAY_CHANNEL.ALI:
                 request.setTradeType(C.TRADE_TYPE.ALI);
-                request.setKey(mShopppp.getHshopKeyAlipay());
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyAlipay());
                 break;
             case com.xingdata.zxpay.C.PAY_CHANNEL.WECHAT:
                 request.setTradeType(C.TRADE_TYPE.WECHAT);
-                request.setKey(mShopppp.getHshopKeyWechat());
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyWechat());
                 break;
             case com.xingdata.zxpay.C.PAY_CHANNEL.BANK:
                 request.setTradeType(C.TRADE_TYPE.UNION);
-                request.setKey(mShopppp.getHshopKeyUnipay());
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyUnipay());
                 break;
         }
         request.sign();
@@ -113,17 +105,17 @@ public class PaxFactory extends com.xingdata.zxpay.api.Factory {
      */
     public Observable<com.xingdata.zxpay.api.Response> query(int payChannel) {
         Request request = Request.create(C.METHOD.QUERY);
-        request.setOutTransactionNo(mShopppp.getPosppp().getHposTrace());
+        request.setOutTransactionNo(PayCenter.getInstance().mShopppp.getPosppp().getHposTrace());
         request.setTimeStart(orderMap.get(request.getOutTransactionNo()));
         switch (payChannel) {
             case com.xingdata.zxpay.C.PAY_CHANNEL.ALI:
-                request.setKey(mShopppp.getHshopKeyAlipay());
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyAlipay());
                 break;
             case com.xingdata.zxpay.C.PAY_CHANNEL.WECHAT:
-                request.setKey(mShopppp.getHshopKeyWechat());
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyWechat());
                 break;
             case com.xingdata.zxpay.C.PAY_CHANNEL.BANK:
-                request.setKey(mShopppp.getHshopKeyUnipay());
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyUnipay());
                 break;
         }
         request.sign();

pay/src/main/java/com/xingdata/zxpay/pax/Request.java

@@ -3,6 +3,7 @@ package com.xingdata.zxpay.pax;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.blankj.utilcode.util.EncryptUtils;
+import com.xingdata.zxpay.PayCenter;
 
 class Request {
 
@@ -13,9 +14,9 @@ class Request {
         this.signType = C.SIGN_TYPE.MD5;
         this.version = C.VERSION;
 
-        this.agentId = PaxFactory.getInstance().mShopppp.getHost().getHostAcqCode();
-        this.mchId = PaxFactory.getInstance().mShopppp.getPosppp().getHshopNo();
-        this.terId = PaxFactory.getInstance().mShopppp.getPosppp().getHposNo();
+        this.agentId = PayCenter.getInstance().mShopppp.getHost().getHostAcqCode();
+        this.mchId = PayCenter.getInstance().mShopppp.getPosppp().getHshopNo();
+        this.terId = PayCenter.getInstance().mShopppp.getPosppp().getHposNo();
     }
 
     /**