添加支付宝小程序跳转，添加支付宝渠道

video/app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.duben.speedplayletu"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 712
-        versionName "7.1.2"
+        versionCode 713
+        versionName "7.1.3"
         flavorDimensions "default"
 
         // dex突破65535的限制

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

@@ -33,6 +33,7 @@ public class VipBean implements Serializable {
         private String title;
         private String topTitle;
         private String buttonText;
+        private int payToModel;//0 app内部，1.只签约转支付宝浏览器支付 2.带uid转支付宝小程序(暂定只有一个小程序)
 
         public String getButtonText() {
             return buttonText;
@@ -113,5 +114,13 @@ public class VipBean implements Serializable {
         public int getTrial() {
             return trial;
         }
+
+        public int getPayToModel() {
+            return payToModel;
+        }
+
+        public void setPayToModel(int payToModel) {
+            this.payToModel = payToModel;
+        }
     }
 }

video/app/src/main/java/com/duben/speedplayletu/ui/fragment/MyFragment.kt

@@ -149,21 +149,21 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
 
     private fun loginStatus(consumer: UserBean) {
         // 1-匹配用户
-        if (consumer.activiteFlag == 1) {
-            // 匹配
-            ll_my_vip.visibility = View.VISIBLE
-            ll_my_payrecord.visibility = View.VISIBLE
-            ll_contactus.visibility = View.VISIBLE
-            line_my_payrecord.visibility = View.VISIBLE
-            line_my_contactus.visibility = View.VISIBLE
-        } else {
-            // 未匹配
-            ll_my_vip.visibility = View.GONE
-            ll_my_payrecord.visibility = View.GONE
-            ll_contactus.visibility = View.GONE
-            line_my_payrecord.visibility = View.GONE
-            line_my_contactus.visibility = View.GONE
-        }
+//        if (consumer.activiteFlag == 1) {
+//            // 匹配
+//            ll_my_vip.visibility = View.VISIBLE
+//            ll_my_payrecord.visibility = View.VISIBLE
+//            ll_contactus.visibility = View.VISIBLE
+//            line_my_payrecord.visibility = View.VISIBLE
+//            line_my_contactus.visibility = View.VISIBLE
+//        } else {
+//            // 未匹配
+//            ll_my_vip.visibility = View.GONE
+//            ll_my_payrecord.visibility = View.GONE
+//            ll_contactus.visibility = View.GONE
+//            line_my_payrecord.visibility = View.GONE
+//            line_my_contactus.visibility = View.GONE
+//        }
 
         // 2-是否有手机号
         if (!TextUtils.isEmpty(userManager.mobile)) {

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

@@ -95,8 +95,7 @@
                     android:layout_marginRight="10dp"
                     android:background="@mipmap/bg_my_vip"
                     android:orientation="vertical"
-                    android:paddingLeft="24dp"
-                    android:visibility="gone">
+                    android:paddingLeft="24dp">
 
                     <TextView
                         android:id="@+id/tv_my_vip"
@@ -241,8 +240,7 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:paddingStart="20dp"
-                        android:paddingEnd="15dp"
-                        android:visibility="gone">
+                        android:paddingEnd="15dp">
 
                         <TextView
                             android:layout_width="0dp"
@@ -305,8 +303,7 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:paddingStart="20dp"
-                        android:paddingEnd="15dp"
-                        android:visibility="gone">
+                        android:paddingEnd="15dp">
 
                         <TextView
                             android:id="@+id/tv_contact"

video/gradle.properties

@@ -44,7 +44,7 @@ WEIXIN_APP_SECRET =c7ae162c83efbb8449d576fa9b85a07e
 RELEASE_UMENG_KEY=64b8de13a1a164591b5133df
 
 #TalkingData
-RELEASE_TALKING_DATA_KEY="3510E9DDC0E74A44A2BBA904A8345918 "
+RELEASE_TALKING_DATA_KEY="3510E9DDC0E74A44A2BBA904A8345918"
 
 
 GROMORE_APP_ID="5566629"