兼容vip页面，vip返回弹窗，视频详情页中的金额显示

video/app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.duben.speedplayletu"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 715
-        versionName "7.1.5"
+        versionCode 717
+        versionName "7.1.7"
         flavorDimensions "default"
 
         // dex突破65535的限制

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

@@ -117,11 +117,11 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
         if (vipBean.payToModel == 2) {
             // 跳转小程序领券
             holder.tvVipItemCurMoney.text = SpanUtils()
-                .append(vipBean.oldPrice.toInt().toString())
+                .append(vipBean.oldPrice.toFloat().toString())
                 .setFontSize(BubbleUtils.sp2px(34))
                 .append(" 元\n")
                 .setFontSize(BubbleUtils.sp2px(14))
-                .append("原价：" + vipBean.price.toInt().toString() + " 元")
+                .append("原价：" + vipBean.price.toFloat().toString() + " 元")
                 .setFontSize(BubbleUtils.sp2px(12))
                 .setStrikethrough()
                 .create()
@@ -134,7 +134,7 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
                     .create()
             } else {
                 holder.tvVipItemCurMoney.text = SpanUtils()
-                    .append(vipBean.price.toInt().toString())
+                    .append(vipBean.price.toString())
                     .setFontSize(BubbleUtils.sp2px(34))
                     .append("元")
                     .create()

video/app/src/main/java/com/duben/speedplayletu/ui/widgets/PayYesDialog.kt

@@ -60,11 +60,11 @@ class PayYesDialog(
         if (vipBean.payToModel == 2) {
             // 跳转小程序领券
             tv_dialog_vip_count.text = SpanUtils()
-                .append(vipBean.oldPrice.toInt().toString())
+                .append(vipBean.oldPrice.toFloat().toString())
                 .setFontSize(BubbleUtils.sp2px(30))
                 .append(" 元\n")
                 .setFontSize(BubbleUtils.sp2px(16))
-                .append("原价：" + vipBean.price.toInt().toString() + " 元")
+                .append("原价：" + vipBean.price.toFloat().toString() + " 元")
                 .setFontSize(BubbleUtils.sp2px(12))
                 .setStrikethrough()
                 .create()

video/app/src/main/java/com/duben/speedplayletu/video/tx/adapter/TxVideoAdapter.kt

@@ -113,13 +113,13 @@ class TxVideoAdapter : BaseMultiItemQuickAdapter<VideoMultiItemEntity, BaseViewH
                     vipBtn.visibility = View.GONE
                     adBtn.visibility = View.VISIBLE
                     holder.getView<TextView>(R.id.tv_title).text =
-                        if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toInt()}元解锁后续剧集"
+                        if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toFloat()}元解锁后续剧集"
 
                 } else { // 开通会员解锁
                     adBtn.visibility = View.GONE
                     vipBtn.visibility = View.VISIBLE
                     holder.getView<TextView>(R.id.tv_title).text =
-                        if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toInt()}元解锁后续剧集"
+                        if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toFloat()}元解锁后续剧集"
                 }
 
             } else {
@@ -127,7 +127,7 @@ class TxVideoAdapter : BaseMultiItemQuickAdapter<VideoMultiItemEntity, BaseViewH
                 adBtn.visibility = View.GONE
                 vipBtn.visibility = View.VISIBLE
                 holder.getView<TextView>(R.id.tv_title).text =
-                    if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toInt()}元解锁后续剧集"
+                    if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toFloat()}元解锁后续剧集"
 
             }
             holder.getView<TextView>(R.id.unlock).text = String.format("查看激励视频")

video/app/src/main/java/com/duben/speedplayletu/video/tx/newrecommend/NewTxVideoAdapter.kt

@@ -82,7 +82,7 @@ class NewTxVideoAdapter : BaseMultiItemQuickAdapter<VideoMultiItemEntity4, BaseV
                     vipBtn.visibility = View.GONE
                     adBtn.visibility = View.VISIBLE
                     holder.getView<TextView>(R.id.tv_title).text =
-                        if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toInt()}元解锁后续剧集"
+                        if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toFloat()}元解锁后续剧集"
 
                 }
                 VEDIO3DOS_PAY -> { // 开通会员解锁
@@ -90,13 +90,13 @@ class NewTxVideoAdapter : BaseMultiItemQuickAdapter<VideoMultiItemEntity4, BaseV
                     vipBtn.visibility = View.VISIBLE
 
                     holder.getView<TextView>(R.id.tv_title).text =
-                        if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toInt()}元解锁后续剧集"
+                        if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toFloat()}元解锁后续剧集"
                 }
                 else -> {
                     adBtn.visibility = View.GONE
                     vipBtn.visibility = View.VISIBLE
                     holder.getView<TextView>(R.id.tv_title).text =
-                        if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toInt()}元解锁后续剧集"
+                        if (AppConfig.firstVipPrice == 0.0) "解锁后续剧集" else "${AppConfig.firstVipPrice.toFloat()}元解锁后续剧集"
                 }
             }