Commit 6f0bc2f1 authored by jyx's avatar jyx

代码优化

parent 3bda9764
...@@ -10,8 +10,8 @@ android { ...@@ -10,8 +10,8 @@ android {
applicationId "com.duben.microtribeu" applicationId "com.duben.microtribeu"
minSdkVersion rootProject.ext.androidMinSdkVersion minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 721 versionCode 723
versionName "7.2.1" versionName "7.2.3"
flavorDimensions "default" flavorDimensions "default"
// dex突破65535的限制 // dex突破65535的限制
......
...@@ -3,6 +3,7 @@ package com.duben.microtribeu.ui.activitys ...@@ -3,6 +3,7 @@ package com.duben.microtribeu.ui.activitys
import android.animation.ValueAnimator import android.animation.ValueAnimator
import android.app.Dialog import android.app.Dialog
import android.content.Intent import android.content.Intent
import android.graphics.Color
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
...@@ -34,6 +35,7 @@ import com.duben.microtribeu.ui.widgets.countdowntimer.CountDownTimerSupport ...@@ -34,6 +35,7 @@ import com.duben.microtribeu.ui.widgets.countdowntimer.CountDownTimerSupport
import com.duben.microtribeu.ui.widgets.countdowntimer.OnCountDownTimerListener import com.duben.microtribeu.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.microtribeu.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
...@@ -172,7 +174,6 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -172,7 +174,6 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
} }
} }
} }
/** /**
* 设置content样式 * 设置content样式
*/ */
...@@ -207,12 +208,30 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -207,12 +208,30 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
if (!TextUtils.isEmpty(bean.remarks)) { if (!TextUtils.isEmpty(bean.remarks)) {
tv_vip_hint.text = bean.remarks tv_vip_hint.text = bean.remarks
tv_vip_hint.visibility = View.VISIBLE tv_vip_hint.visibility = View.VISIBLE
if (bean.isShowCycTips) {
tv_vip_hint.setTextColor(Color.parseColor("#FFAC5E"))
tv_vip_hint.textSize = 12f
} else {
tv_vip_hint.setTextColor(Color.parseColor("#97ffffff"))
tv_vip_hint.textSize = 10f
}
} else { } else {
tv_vip_hint.visibility = View.INVISIBLE tv_vip_hint.visibility = View.INVISIBLE
} }
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