Merge branch 'dev_vedio_xixijuchang_241011' of...

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

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

@@ -3,6 +3,7 @@ package com.duben.xixiplayletu.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
@@ -207,6 +208,11 @@ 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"))
+            } else {
+                tv_vip_hint.setTextColor(Color.parseColor("#97ffffff"))
+            }
         } else {
             tv_vip_hint.visibility = View.INVISIBLE
         }

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

@@ -216,7 +216,7 @@
             android:layout_gravity="center_horizontal"
             android:text="试用到期后将按终身xx元自动续费，可随时关闭"
             android:textColor="#97ffffff"
-            android:textSize="10sp" />
+            android:textSize="12sp" />
 
         <LinearLayout
             android:layout_width="wrap_content"