From ef38916fa1a6b6a00814fe3b9f11ed808d1b98e3 Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Fri, 25 Oct 2024 10:32:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20VIp=20=E8=BF=94=E5=9B=9E=20null=20?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chwl/app/ui/setting/VipSetActivity.kt | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/chwl/app/ui/setting/VipSetActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/VipSetActivity.kt index 04878efca..6781d299c 100644 --- a/app/src/main/java/com/chwl/app/ui/setting/VipSetActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/VipSetActivity.kt @@ -69,12 +69,10 @@ class VipSetActivity : BaseViewBindingActivity(), ILog, V UserModel.get().getUserInfoFromServerUpdate(AuthModel.get().currentUid) .compose(bindToLifecycle()) .doOnSuccess { - it.userVipInfoVO?.let { vInfo -> - setSwitchView(binding.vipSetSwitch1, vInfo.preventFollow)//不被关注 - setSwitchView(binding.vipSetSwitch2, vInfo.preventTrace)//防跟随 - setSwitchView(binding.vipSetSwitch3, vInfo.enterHide)//开关隐身进房状态 - setSwitchView(binding.vipSetSwitch4, vInfo.preventKick)//防踢 - } + setSwitchView(binding.vipSetSwitch1, it?.userVipInfoVO?.preventFollow?:false)//不被关注 + setSwitchView(binding.vipSetSwitch2, it?.userVipInfoVO?.preventTrace?:false)//防跟随 + setSwitchView(binding.vipSetSwitch3, it?.userVipInfoVO?.enterHide?:false)//开关隐身进房状态 + setSwitchView(binding.vipSetSwitch4, it?.userVipInfoVO?.preventKick?:false)//防踢 } .doOnError { @@ -106,7 +104,7 @@ class VipSetActivity : BaseViewBindingActivity(), ILog, V private fun switchClick(view: View) { val value = view.tag - if (value is Boolean && view is ImageView) { + if (value != null && value is Boolean && view is ImageView) { switchApi(view,!value) .doOnSuccess { view.tag = !value @@ -123,11 +121,11 @@ class VipSetActivity : BaseViewBindingActivity(), ILog, V } private fun switchApi(view : ImageView,value:Boolean) : Single { - when (view) { - binding.vipSetSwitch1 -> return api.notFollowed(value).compose(RxHelper.handleIgnoreData()).compose(RxHelper.handleSchedulers()) - binding.vipSetSwitch2 -> return api.notTrace(value).compose(RxHelper.handleIgnoreData()).compose(RxHelper.handleSchedulers()) - binding.vipSetSwitch3 -> return api.invisible(value).compose(RxHelper.handleIgnoreData()).compose(RxHelper.handleSchedulers()) - binding.vipSetSwitch4 -> return api.notKick(value).compose(RxHelper.handleIgnoreData()).compose(RxHelper.handleSchedulers()) + when (view.id) { + binding.vipSetSwitch1.id -> return api.notFollowed(value).compose(RxHelper.handleIgnoreData()).compose(RxHelper.handleSchedulers()) + binding.vipSetSwitch2.id -> return api.notTrace(value).compose(RxHelper.handleIgnoreData()).compose(RxHelper.handleSchedulers()) + binding.vipSetSwitch3.id -> return api.invisible(value).compose(RxHelper.handleIgnoreData()).compose(RxHelper.handleSchedulers()) + binding.vipSetSwitch4.id -> return api.notKick(value).compose(RxHelper.handleIgnoreData()).compose(RxHelper.handleSchedulers()) else -> return api.notFollowed(!value).compose(RxHelper.handleIgnoreData()).compose(RxHelper.handleSchedulers()) } }