Commit 9a3b68b9 authored by mengcuiguang2's avatar mengcuiguang2

代码优化

parent 97099c11
...@@ -10,8 +10,8 @@ android { ...@@ -10,8 +10,8 @@ android {
applicationId "com.duben.skitworld" applicationId "com.duben.skitworld"
minSdkVersion rootProject.ext.androidMinSdkVersion minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 701 versionCode 800
versionName "7.0.1" versionName "8.0.0"
flavorDimensions "default" flavorDimensions "default"
// dex突破65535的限制 // dex突破65535的限制
......
...@@ -111,11 +111,20 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) : ...@@ -111,11 +111,20 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
// holder.tvVipItemCurMoney.text = "¥${vipBean.price}" // holder.tvVipItemCurMoney.text = "¥${vipBean.price}"
//// holder.tvVipItemCurMoney.text = "¥${String.format("%.0f", vipBean.price)}" //// holder.tvVipItemCurMoney.text = "¥${String.format("%.0f", vipBean.price)}"
// } // }
if(vipBean.price==0.0){
holder.tvVipItemCurMoney.text = SpanUtils()
.append("0.01")
.setFontSize(BubbleUtils.sp2px(34))
.append("元")
.create()
}else{
holder.tvVipItemCurMoney.text = SpanUtils() holder.tvVipItemCurMoney.text = SpanUtils()
.append(vipBean.price.toString()) .append(vipBean.price.toString())
.setFontSize(BubbleUtils.sp2px(34)) .setFontSize(BubbleUtils.sp2px(34))
.append("元") .append("元")
.create() .create()
}
// if (vipBean.oldPrice > 0) { // if (vipBean.oldPrice > 0) {
// holder.tvVipItemMoney.visibility = View.VISIBLE // holder.tvVipItemMoney.visibility = View.VISIBLE
// holder.tvVipItemMoney.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中间横线(删除线) // holder.tvVipItemMoney.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中间横线(删除线)
......
...@@ -55,10 +55,10 @@ class PayYesDialog( ...@@ -55,10 +55,10 @@ class PayYesDialog(
iv_dialog_vip_quit.setOnClickListener(listener) iv_dialog_vip_quit.setOnClickListener(listener)
tv_dialog_vip_next.setOnClickListener(listener) tv_dialog_vip_next.setOnClickListener(listener)
if (vipBean.trial == 0) { if (vipBean.price == 0.0) {
//0-没签约 无0.01 //0-没签约 无0.01
tv_dialog_vip_count.text = SpanUtils() tv_dialog_vip_count.text = SpanUtils()
.append("" + vipBean.price) .append("0.01")
.setFontSize(30, true) .setFontSize(30, true)
.append(" 元") .append(" 元")
.setFontSize(16, true) .setFontSize(16, true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment