代码优化

video/app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.xinfu.helivideo"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 15
-        versionName "1.1.4"
+        versionCode 16
+        versionName "1.1.5"
         flavorDimensions "default"
 
         // dex突破65535的限制

video/app/src/main/java/com/xinfu/helivideo/ui/activitys/VipActivity.kt

@@ -69,7 +69,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, VipAdapter.On
     private var isGuide: Boolean = false// 从启动页进入vip界面，返回时要回到首页
     private var isMain: Boolean = false
     private var isRecommend: Boolean = false
-    private var payType = ALIPAY// 支付类型
+    private var payType = WEIXIN_PAY// 支付类型
     private var vedioId = ""
     private var thirdId = ""
 

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

@@ -58,28 +58,31 @@
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
+
+
             <LinearLayout
-                android:id="@+id/ll_vip_alipay"
+                android:id="@+id/ll_vip_wx"
                 android:layout_width="0dp"
                 android:layout_height="40dp"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:paddingLeft="20dp"
                 android:orientation="horizontal"
-                android:paddingLeft="20dp">
+                >
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawableLeft="@mipmap/ic_alipay"
+                    android:drawableLeft="@mipmap/ic_call_wx"
                     android:drawablePadding="6dp"
                     android:gravity="center_vertical"
-                    android:text="支付宝支付"
+                    android:text="微信支付"
                     android:textColor="@color/white"
                     android:textSize="14sp"
                     android:textStyle="bold" />
 
                 <ImageView
-                    android:id="@+id/iv_vip_alipay"
+                    android:id="@+id/iv_vip_wx"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
                     android:scaleType="center"
@@ -87,28 +90,28 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/ll_vip_wx"
+                android:id="@+id/ll_vip_alipay"
                 android:layout_width="0dp"
                 android:layout_height="40dp"
                 android:layout_weight="1"
+                android:paddingRight="20dp"
                 android:gravity="center"
                 android:orientation="horizontal"
-                android:paddingRight="20dp">
+                >
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:drawableLeft="@mipmap/ic_call_wx"
+                    android:drawableLeft="@mipmap/ic_alipay"
                     android:drawablePadding="6dp"
                     android:gravity="center_vertical"
-                    android:text="微信支付"
+                    android:text="支付宝支付"
                     android:textColor="@color/white"
                     android:textSize="14sp"
                     android:textStyle="bold" />
 
-
                 <ImageView
-                    android:id="@+id/iv_vip_wx"
+                    android:id="@+id/iv_vip_alipay"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
                     android:scaleType="center"