Merge branch 'fix/GHZSCY-7608' into 'release'
fix:【光环助手】奇游加速器第二期迭代-03/04测试-客户端 https://jira.shanqu.cc/browse/GHZSCY-7608 See merge request halo/android/assistant-android!2084
This commit is contained in:
@ -62,27 +62,26 @@ class AcceleratorDataHolder {
|
||||
""
|
||||
}
|
||||
|
||||
private var _vipEntity: VipEntity? = null
|
||||
val vipEntity: VipEntity?
|
||||
get() = _vipEntity
|
||||
var vipEntity: VipEntity? = null
|
||||
private set
|
||||
|
||||
val isVip: Boolean
|
||||
get() = _vipEntity?.vipStatus ?: false
|
||||
get() = vipEntity?.vipStatus ?: false
|
||||
|
||||
val isNewUser: Boolean
|
||||
get() = _vipEntity?.isNewUser ?: false
|
||||
get() = vipEntity?.isNewUser ?: false
|
||||
|
||||
val memberType: String
|
||||
get() = when {
|
||||
!CheckLoginUtils.isLogin() -> MEMBER_TYPE_NOT_LOGIN
|
||||
_vipEntity?.vipStatus == true && _vipEntity?.isTryVip == true -> MEMBER_TYPE_FREE_MEMBER
|
||||
_vipEntity?.vipStatus == true -> MEMBER_TYPE_PAID_MEMBER
|
||||
vipEntity?.vipStatus == true && vipEntity?.isTryVip == true -> MEMBER_TYPE_FREE_MEMBER
|
||||
vipEntity?.vipStatus == true -> MEMBER_TYPE_PAID_MEMBER
|
||||
else -> MEMBER_TYPE_NONE_MEMBER
|
||||
}
|
||||
|
||||
fun setVipEntity(vip: VipEntity) {
|
||||
if (_vipEntity != vip) {
|
||||
_vipEntity = vip
|
||||
if (vipEntity != vip) {
|
||||
vipEntity = vip
|
||||
listeners.forEach {
|
||||
it.onVipStateChanged(vip)
|
||||
}
|
||||
@ -98,7 +97,7 @@ class AcceleratorDataHolder {
|
||||
}
|
||||
|
||||
fun clear() {
|
||||
_vipEntity = null
|
||||
vipEntity = null
|
||||
listeners.clear()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user