代码优化

video/app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.duben.speedplaylet"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 5
-        versionName "1.0.4"
+        versionCode 6
+        versionName "1.0.5"
         flavorDimensions "default"
 
         // dex突破65535的限制

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

@@ -2,6 +2,7 @@ package com.duben.speedplaylet.ui.adapter
 
 import android.content.Context
 import android.graphics.Paint
+import android.text.TextUtils
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -12,7 +13,10 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.duben.speedplaylet.R
 import com.duben.speedplaylet.mvp.model.VipBean
+import com.duben.speedplaylet.utils.BubbleUtils
+import com.duben.speedplaylet.utils.SpanUtils
 import com.duben.speedplaylet.utils.UIUtils
+import kotlinx.android.synthetic.main.fragment_main_my.*
 
 class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
     RecyclerView.Adapter<VipAdapter.ViewHolder>() {
@@ -50,38 +54,77 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val vipBean = vipList[position]
-        holder.tvVipItemTitle.text = vipBean.title
+
         if (vipBean.trial != 0) {
             holder.tvVipItemLable.setPadding(0, 0, 0, 0)
             holder.tvVipItemLable.text = "限时特惠"
             holder.tvVipItemLable.gravity = Gravity.CENTER
             holder.tvVipItemLable.setBackgroundResource(R.mipmap.ic_vip_lable)
         } else {
-            holder.tvVipItemLable.setPadding(0, 0, UIUtils.dp2px(10), 0)
-            holder.tvVipItemLable.gravity = Gravity.END or Gravity.CENTER_VERTICAL
-            holder.tvVipItemLable.text = "可微信支付"
-            holder.tvVipItemLable.setBackgroundResource(R.mipmap.ic_vip_lable_wx)
+            holder.tvVipItemLable.setPadding(0, 0, 0, 0)
+            holder.tvVipItemLable.text = "热门"
+            holder.tvVipItemLable.gravity = Gravity.CENTER
+            holder.tvVipItemLable.setBackgroundResource(R.mipmap.ic_vip_lable)
         }
 
-        if (vipBean.price < 1) {
-            holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
-        } else {
-            holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
+
+        try {
+            if(!TextUtils.isEmpty(vipBean.topTitle)){
+
+               val topArray= vipBean.topTitle.split(",")
+                holder.tvVipItemCurMoney.text = SpanUtils()
+                        .append(topArray[0])
+                        .append(topArray[1])
+                        .setFontSize(BubbleUtils.sp2px(28))
+                        .append(topArray[2])
+                        .create()
+                holder.tvVipItemMoney.text = topArray[3]
+                holder.tvVipItemTitle.text = topArray[4]
+            }else{
+                holder.tvVipItemTitle.text = vipBean.title
+                if (vipBean.price < 1) {
+                    holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
+                } else {
+                    holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
 //            holder.tvVipItemCurMoney.text = "￥${String.format("%.0f", vipBean.price)}"
-        }
-        if (vipBean.oldPrice > 0) {
-            holder.tvVipItemMoney.visibility = View.VISIBLE
-            holder.tvVipItemMoney.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中间横线（删除线）
-            if (vipBean.oldPrice < 1) {
-                holder.tvVipItemMoney.text = "原价：${vipBean.oldPrice}"
+                }
+                if (vipBean.oldPrice > 0) {
+                    holder.tvVipItemMoney.visibility = View.VISIBLE
+                    holder.tvVipItemMoney.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中间横线（删除线）
+                    if (vipBean.oldPrice < 1) {
+                        holder.tvVipItemMoney.text = "原价：${vipBean.oldPrice}"
+                    } else {
+                        holder.tvVipItemMoney.text = "原价：${String.format("%.0f", vipBean.oldPrice)}"
+                    }
+                } else {
+                    holder.tvVipItemMoney.visibility = View.INVISIBLE
+                }
+
+            }
+        }catch (e:Exception){
+            e.printStackTrace()
+            holder.tvVipItemTitle.text = vipBean.title
+            if (vipBean.price < 1) {
+                holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
             } else {
-                holder.tvVipItemMoney.text = "原价：${String.format("%.0f", vipBean.oldPrice)}"
+                holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
+//            holder.tvVipItemCurMoney.text = "￥${String.format("%.0f", vipBean.price)}"
+            }
+            if (vipBean.oldPrice > 0) {
+                holder.tvVipItemMoney.visibility = View.VISIBLE
+                holder.tvVipItemMoney.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中间横线（删除线）
+                if (vipBean.oldPrice < 1) {
+                    holder.tvVipItemMoney.text = "原价：${vipBean.oldPrice}"
+                } else {
+                    holder.tvVipItemMoney.text = "原价：${String.format("%.0f", vipBean.oldPrice)}"
+                }
+            } else {
+                holder.tvVipItemMoney.visibility = View.INVISIBLE
             }
-        } else {
-            holder.tvVipItemMoney.visibility = View.INVISIBLE
         }
 
 
+
         holder.rlVipItemRoot.setOnClickListener {
             mOnItemClickListener.onItemClick(position)
             notifyDataSetChanged()

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

@@ -20,7 +20,7 @@
         android:paddingRight="6dp"
         android:paddingBottom="2dp"
         android:textColor="@color/color_815136"
-        android:textSize="10sp"
+        android:textSize="14sp"
         tools:text="包年会员" />
 
     <TextView
@@ -28,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="12dp"
         android:textColor="@color/white"
         android:textSize="18sp"
         tools:text="包年会员" />
@@ -38,10 +38,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="8dp"
         android:gravity="center"
         android:textColor="#373737"
-        android:textSize="24sp"
+        android:textSize="14sp"
         android:textStyle="bold"
         tools:text="$78" />