添加微信支付

video/app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.duben.loveplayletd"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 807
-        versionName "8.0.7"
+        versionCode 808
+        versionName "8.0.8"
         flavorDimensions "default"
 
         // dex突破65535的限制

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

@@ -287,11 +287,25 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, VipAdapter.On
      * 设置content样式
      */
     private fun setVipContent(bean: VipBean.ListBean) {
-        ll_vip_alipay.visibility = View.VISIBLE
-        ll_vip_wx.visibility = View.GONE
-        payType = ALIPAY
-        iv_vip_alipay.setImageResource(R.mipmap.ic_vip_enable_blue)
-        iv_vip_wx.setImageResource(R.mipmap.ic_vip_none)
+        if (bean.isAlipay && bean.isWeixin) {
+            ll_vip_alipay.visibility = View.VISIBLE
+            ll_vip_wx.visibility = View.VISIBLE
+            payType = WEIXIN_PAY
+            iv_vip_wx.setImageResource(R.mipmap.ic_vip_enable_blue)
+            iv_vip_alipay.setImageResource(R.mipmap.ic_vip_none)
+        } else if (bean.isAlipay && !bean.isWeixin) {
+            ll_vip_alipay.visibility = View.VISIBLE
+            ll_vip_wx.visibility = View.GONE
+            payType = ALIPAY
+            iv_vip_alipay.setImageResource(R.mipmap.ic_vip_enable_blue)
+            iv_vip_wx.setImageResource(R.mipmap.ic_vip_none)
+        } else if (!bean.isAlipay && bean.isWeixin) {
+            ll_vip_alipay.visibility = View.GONE
+            ll_vip_wx.visibility = View.VISIBLE
+            payType = WEIXIN_PAY
+            iv_vip_wx.setImageResource(R.mipmap.ic_vip_enable_blue)
+            iv_vip_alipay.setImageResource(R.mipmap.ic_vip_none)
+        }
 
         if (!TextUtils.isEmpty(bean.remarks)) {
             tv_vip_hint.text = bean.remarks

video/app/src/main/res/layout/activity_new_vip.xml

@@ -167,8 +167,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:orientation="horizontal"
-                android:paddingLeft="20dp"
-                android:visibility="gone">
+                android:paddingLeft="20dp">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -196,8 +195,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:orientation="horizontal"
-                android:paddingRight="20dp"
-                android:visibility="gone">
+                android:paddingRight="20dp">
 
                 <TextView
                     android:layout_width="wrap_content"