代码优化

video/app/src/main/java/com/duben/miaoquplaylet/mvp/model/VipBean.java

@@ -34,7 +34,7 @@ public class VipBean implements Serializable {
         private String topTitle;
         private String buttonText;
         private int payToModel;//0 app内部，1.只签约转支付宝浏览器支付 2.带uid转支付宝小程序(暂定只有一个小程序)
-
+        private int wechatPayToModel;
         //带uid转支付宝小程序 第一个小程序
         private String payToModel2FirstAlipayAppid;
 
@@ -106,6 +106,14 @@ public class VipBean implements Serializable {
             return topTitle;
         }
 
+        public int getWechatPayToModel() {
+            return wechatPayToModel;
+        }
+
+        public void setWechatPayToModel(int wechatPayToModel) {
+            this.wechatPayToModel = wechatPayToModel;
+        }
+
         public void setTitle(String title) {
             this.title = title;
         }

video/app/src/main/java/com/duben/miaoquplaylet/ui/activitys/VipActivity.kt

@@ -250,8 +250,8 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
                 //0-普通或支付并签约  1-纯签约
                 if (vipList != null && vipList!!.size > 0) {
                     val vipBean = vipList!![vipAdapter.getPosition()]
-                    val payToModel = vipBean.payToModel
-                    //0 app内部，1.只签约转支付宝浏览器支付 2.带uid转支付宝小程序(暂定只有一个小程序)
+                    val payToModel = vipBean.wechatPayToModel
+                    //0-普通或支付并签约  1-纯签约
                     when (payToModel) {
                         0 -> {
                             wxPay(paramsBean, payToModel)
@@ -259,6 +259,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
                         1 -> {
                             wxPay(paramsBean, payToModel)
                         }
+                        else ->{
+                            wxPay(paramsBean, payToModel)
+                        }
                     }
                 }
 
@@ -271,7 +274,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
                 if (vipList != null && vipList!!.size > 0) {
                     val vipBean = vipList!![vipAdapter.getPosition()]
                     val payToModel = vipBean.payToModel
-                    //0 app内部，1.只签约转支付宝浏览器支付 2.带uid转支付宝小程序(暂定只有一个小程序)
+                    //0 app内部，1.只签约转支付宝浏览器支付 2.带uid转支付宝小程序(暂定只有一个小程序)4.蚂蚁链
                     when (payToModel) {
                         0 -> {
                             alipay(paramsBean)
@@ -289,6 +292,9 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
                         4 -> {
                             goAlipaySignExecute(paramsBean.params.params)
                         }
+                        else ->{
+                            alipay(paramsBean)
+                        }
                     }
                 }
             }

video/wxpay/src/main/java/com/jobo/wxpay/WXPay.java

@@ -68,15 +68,17 @@ public class WXPay implements IPayStrategy<WXPayInfoImpl> {
     public void pay(Activity activity, WXPayInfoImpl payInfo, IPayCallback payCallback) {
         this.payInfoImpli = payInfo;
         sPayCallback = payCallback;
-
-        if (payInfoImpli == null || TextUtils.isEmpty(payInfoImpli.getAppid()) || TextUtils.isEmpty(payInfoImpli.getPartnerid())
-                || TextUtils.isEmpty(payInfoImpli.getPrepayId()) || TextUtils.isEmpty(payInfoImpli.getPackageValue()) ||
-                TextUtils.isEmpty(payInfoImpli.getNonceStr()) || TextUtils.isEmpty(payInfoImpli.getTimestamp()) ||
-                TextUtils.isEmpty(payInfoImpli.getSign())) {
-            if (payCallback != null) {
-                payCallback.failed(WXErrCodeEx.CODE_ILLEGAL_ARGURE, WXErrCodeEx.getMessageByCode(WXErrCodeEx.CODE_ILLEGAL_ARGURE));
+        int payModel = payInfoImpli.getPayModel();
+        if (payModel == 0) {
+            if (payInfoImpli == null || TextUtils.isEmpty(payInfoImpli.getAppid()) || TextUtils.isEmpty(payInfoImpli.getPartnerid())
+                    || TextUtils.isEmpty(payInfoImpli.getPrepayId()) || TextUtils.isEmpty(payInfoImpli.getPackageValue()) ||
+                    TextUtils.isEmpty(payInfoImpli.getNonceStr()) || TextUtils.isEmpty(payInfoImpli.getTimestamp()) ||
+                    TextUtils.isEmpty(payInfoImpli.getSign())) {
+                if (payCallback != null) {
+                    payCallback.failed(WXErrCodeEx.CODE_ILLEGAL_ARGURE, WXErrCodeEx.getMessageByCode(WXErrCodeEx.CODE_ILLEGAL_ARGURE));
+                }
+                return;
             }
-            return;
         }
 
         if (!initializated) {
@@ -91,7 +93,6 @@ public class WXPay implements IPayStrategy<WXPayInfoImpl> {
         }
 
 
-        int payModel = payInfoImpli.getPayModel();
         if (payModel == 1) {
             // 纯签约
             WXOpenBusinessWebview.Req wreq = new WXOpenBusinessWebview.Req();