代码优化

video/app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.duben.carefreeu"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 721
-        versionName "7.2.1"
+        versionCode 723
+        versionName "7.2.3"
         flavorDimensions "default"
 
         // dex突破65535的限制

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

@@ -3,6 +3,7 @@ package com.duben.carefreeu.ui.activitys
 import android.animation.ValueAnimator
 import android.app.Dialog
 import android.content.Intent
+import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
@@ -32,6 +33,7 @@ import com.duben.carefreeu.ui.adapter.VipBannerAdapter
 import com.duben.carefreeu.ui.widgets.*
 import com.duben.carefreeu.ui.widgets.countdowntimer.CountDownTimerSupport
 import com.duben.carefreeu.ui.widgets.countdowntimer.OnCountDownTimerListener
+import com.duben.carefreeu.utils.SpanUtils
 import com.duben.library.utils.GlideUtils
 import com.duben.library.utils.nodoubleclick.AntiShake
 import com.jobo.alipay.AliPay
@@ -172,7 +174,6 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
             }
         }
     }
-
     /**
      * 设置content样式
      */
@@ -207,12 +208,30 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         if (!TextUtils.isEmpty(bean.remarks)) {
             tv_vip_hint.text = bean.remarks
             tv_vip_hint.visibility = View.VISIBLE
+            if (bean.isShowCycTips) {
+                tv_vip_hint.setTextColor(Color.parseColor("#FFAC5E"))
+                tv_vip_hint.textSize = 12f
+            } else {
+                tv_vip_hint.setTextColor(Color.parseColor("#97ffffff"))
+                tv_vip_hint.textSize = 10f
+            }
         } else {
             tv_vip_hint.visibility = View.INVISIBLE
         }
 
         if (!TextUtils.isEmpty(bean.buttonText)) {
-            tvVipPay.text = bean.buttonText
+            if (bean.isShowCycTips) {
+                tvVipPay.text = SpanUtils()
+                    .append(bean.buttonText + "\n")
+                    .setFontSize(20, true)
+                    .append(bean.remarks)
+                    .setFontSize(10, true)
+                    .setForegroundColor(Color.parseColor("#A24240"))
+                    .create()
+            } else {
+                tvVipPay.text = bean.buttonText
+            }
+
             tvVipAgreement.text = "点击购买即表示您同意《自动续费协议》"
         } else {
             tvVipPay.text = "立即开通"