Merge branch 'dev_vedio_aiduanju_yi_241015' of...

Merge branch 'dev_vedio_aiduanju_yi_241015' of http://gitlab.mints-id.com/android/android_vedio into dev_vedio_aiduanju_yi_241015

video/app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.duben.loveplayletu"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 726
-        versionName "7.2.6"
+        versionCode 727
+        versionName "7.2.7"
         flavorDimensions "default"
 
         // dex突破65535的限制

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

@@ -17,12 +17,13 @@ public class VipBean implements Serializable {
         return list;
     }
 
-    public class ListBean implements Serializable{
+    public class ListBean implements Serializable {
 
         private boolean weixin;
         private boolean alipay;
         private boolean showCycTips;// 判断是否提示
         private double firstPayPrice;
+        private double firstPayPriceAfterBack;
         private double oldPrice;
         private int days;
         private int trial;//是否签约 0-没签约 1-签约
@@ -58,6 +59,14 @@ public class VipBean implements Serializable {
             return firstPayPrice;
         }
 
+        public double getFirstPayPriceAfterBack() {
+            return firstPayPriceAfterBack;
+        }
+
+        public void setFirstPayPriceAfterBack(double firstPayPriceAfterBack) {
+            this.firstPayPriceAfterBack = firstPayPriceAfterBack;
+        }
+
         public double getOldPrice() {
             return oldPrice;
         }

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

@@ -228,6 +228,12 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
 
         if (!TextUtils.isEmpty(bean.buttonText)) {
             if (bean.isShowCycTips) {
+                if (bean.remarks.isEmpty()) {
+                    tvVipPay.text = SpanUtils()
+                        .append(bean.buttonText)
+                        .setFontSize(20, true)
+                        .create()
+                } else {
                     tvVipPay.text = SpanUtils()
                         .append(bean.buttonText + "\n")
                         .setFontSize(20, true)
@@ -235,6 +241,8 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
                         .setFontSize(10, true)
                         .setForegroundColor(Color.parseColor("#A24240"))
                         .create()
+                }
+
                 tvVipAgreement.text = "点击购买即表示您同意《自动续费协议》"
             } else {
                 tvVipPay.text = bean.buttonText

video/app/src/main/java/com/duben/loveplayletu/ui/adapter/VipAdapter.kt

@@ -61,25 +61,25 @@ class VipAdapter(private val vipList: MutableList<VipBean.ListBean>) :
 
         holder.tvVipItemOldMoney.text = SpanUtils()
             .append("原价 ")
-            .setFontSize(BubbleUtils.sp2px(14))
+            .setFontSize(BubbleUtils.sp2px(10))
             .setStrikethrough()
             .append("" + vipBean.oldPrice)
-            .setFontSize(BubbleUtils.sp2px(16))
+            .setFontSize(BubbleUtils.sp2px(12))
             .setBold()
             .setStrikethrough()
             .create()
 
-        if (vipBean.price == 0.0) {
+        if (vipBean.firstPayPriceAfterBack == 0.0) {
             holder.tvVipItemCurMoney.text = SpanUtils()
                 .append("￥")
-                .append("0.01")
-                .setFontSize(BubbleUtils.sp2px(30))
+                .append("0")
+                .setFontSize(BubbleUtils.sp2px(36))
                 .create()
         } else {
             holder.tvVipItemCurMoney.text = SpanUtils()
                 .append("￥")
-                .append(vipBean.price.toString())
-                .setFontSize(BubbleUtils.sp2px(30))
+                .append(vipBean.firstPayPriceAfterBack.toString())
+                .setFontSize(BubbleUtils.sp2px(36))
                 .create()
         }
 

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

@@ -138,7 +138,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvVip"
             android:layout_width="match_parent"
-            android:layout_height="150dp"
+            android:layout_height="170dp"
             android:layout_gravity="center_horizontal"
             android:background="@null"
             android:overScrollMode="never" />

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

@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
-    android:layout_height="138dp"
+    android:layout_height="158dp"
     android:layout_marginLeft="5dp"
     android:layout_marginTop="10dp"
     android:layout_marginRight="5dp"
@@ -11,7 +11,7 @@
     <FrameLayout
         android:id="@+id/rlVipItemRoot"
         android:layout_width="130dp"
-        android:layout_height="130dp"
+        android:layout_height="150dp"
         android:layout_marginTop="8dp"
         android:background="@drawable/shape_vip_adapter_none"
         android:orientation="vertical">
@@ -50,7 +50,7 @@
                 android:layout_gravity="center_horizontal"
                 android:gravity="center"
                 android:textColor="#efbc6a"
-                android:textSize="14sp"
+                android:textSize="10sp"
                 tools:text="$78" />
 
         </LinearLayout>