Commit 29bcf633 authored by jyx's avatar jyx

代码优化

parent 5821d471
...@@ -10,8 +10,8 @@ android { ...@@ -10,8 +10,8 @@ android {
applicationId "com.duben.supertheateru" applicationId "com.duben.supertheateru"
minSdkVersion rootProject.ext.androidMinSdkVersion minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 722 versionCode 723
versionName "7.2.2" versionName "7.2.3"
flavorDimensions "default" flavorDimensions "default"
// dex突破65535的限制 // dex突破65535的限制
......
...@@ -35,6 +35,7 @@ import com.duben.supertheateru.ui.widgets.countdowntimer.CountDownTimerSupport ...@@ -35,6 +35,7 @@ import com.duben.supertheateru.ui.widgets.countdowntimer.CountDownTimerSupport
import com.duben.supertheateru.ui.widgets.countdowntimer.OnCountDownTimerListener import com.duben.supertheateru.ui.widgets.countdowntimer.OnCountDownTimerListener
import com.duben.library.utils.GlideUtils import com.duben.library.utils.GlideUtils
import com.duben.library.utils.nodoubleclick.AntiShake import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.supertheateru.utils.SpanUtils
import com.jobo.alipay.AliPay import com.jobo.alipay.AliPay
import com.jobo.alipay.AlipayInfoImpl import com.jobo.alipay.AlipayInfoImpl
import com.jobo.rxpay.RxPay import com.jobo.rxpay.RxPay
...@@ -173,7 +174,6 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -173,7 +174,6 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
} }
} }
} }
/** /**
* 设置content样式 * 设置content样式
*/ */
...@@ -220,7 +220,18 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -220,7 +220,18 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
} }
if (!TextUtils.isEmpty(bean.buttonText)) { 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 = "点击购买即表示您同意《自动续费协议》" tvVipAgreement.text = "点击购买即表示您同意《自动续费协议》"
} else { } else {
tvVipPay.text = "立即开通" tvVipPay.text = "立即开通"
......
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