From 37e32e433f075250ec4840a45dece5b2d6411576 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Mon, 12 Dec 2022 17:49:46 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]viewModel=E7=9A=84=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/decoration/viewmodel/DecorationViewModel.kt | 8 +++----- .../java/com/yizhuan/erban/fansteam/FansTeamViewModel.kt | 2 ++ app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt | 1 + .../java/com/yizhuan/erban/home/RoomCommonViewModel.kt | 2 ++ .../yizhuan/erban/community/square/SquareFragment.java | 4 ---- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/DecorationViewModel.kt b/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/DecorationViewModel.kt index c73e49f35..f5e7a0202 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/DecorationViewModel.kt +++ b/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/DecorationViewModel.kt @@ -16,8 +16,8 @@ class DecorationViewModel : BaseViewModel() { private val BANNER_TYPE = "3" - private val _bannerLiveData = MutableLiveData>() - val bannerLiveData: LiveData> = _bannerLiveData + private val _bannerLiveData = MutableLiveData?>() + val bannerLiveData: MutableLiveData?> = _bannerLiveData private val _decorationInfoListLiveData = MutableLiveData>() val decorationInfoListLiveData: LiveData> = @@ -31,9 +31,6 @@ class DecorationViewModel : BaseViewModel() { safeLaunch( block = { _bannerLiveData.value = HomeModel.getHomeBanner(BANNER_TYPE) - }, - onError = { - _bannerLiveData.value = null } ) } @@ -45,6 +42,7 @@ class DecorationViewModel : BaseViewModel() { ListResult.success(DecorationModel.getDecorationInfoList(dressType), 1) }, onError = { + it.message.toast() _decorationInfoListLiveData.value = ListResult.failed(1) } ) diff --git a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamViewModel.kt b/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamViewModel.kt index e9bd7ea38..1100b7513 100644 --- a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamViewModel.kt +++ b/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamViewModel.kt @@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData import com.yizhuan.erban.base.BaseViewModel import com.yizhuan.xchat_android_core.bean.response.ListResult import com.yizhuan.xchat_android_core.fansteam.* +import com.yizhuan.xchat_android_core.utils.toast class FansTeamViewModel : BaseViewModel() { @@ -51,6 +52,7 @@ class FansTeamViewModel : BaseViewModel() { fun loadJoinFansTeamList(pageNum: Int, pageSize: Int) { safeLaunch( onError = { + it.message.toast() _joinFansTeamListLiveData.value = ListResult.failed(pageNum) }, block = { diff --git a/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt b/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt index 9baad43e4..de7c3be75 100644 --- a/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt +++ b/app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt @@ -93,6 +93,7 @@ class HomeViewModel : BaseViewModel() { fun getGameRoom(pageNum: Int, pageSize: Int) { safeLaunch( onError = { + it.message.toast() _gameRoomLiveData.value = ListResult.failed(pageNum) }, block = { diff --git a/app/src/main/java/com/yizhuan/erban/home/RoomCommonViewModel.kt b/app/src/main/java/com/yizhuan/erban/home/RoomCommonViewModel.kt index 7e3e1e6e9..0274284b8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/RoomCommonViewModel.kt +++ b/app/src/main/java/com/yizhuan/erban/home/RoomCommonViewModel.kt @@ -6,6 +6,7 @@ import com.yizhuan.erban.base.BaseViewModel import com.yizhuan.xchat_android_core.bean.response.ListResult import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo import com.yizhuan.xchat_android_core.home.model.HomeModel +import com.yizhuan.xchat_android_core.utils.toast class RoomCommonViewModel : BaseViewModel() { @@ -15,6 +16,7 @@ class RoomCommonViewModel : BaseViewModel() { fun getCommonRoom(tabId: Int, pageNum: Int, pageSize: Int) { safeLaunch( onError = { + it.message.toast() _commonRoomLiveData.value = ListResult.failed(pageNum) }, block = { diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java index 317509d37..5f1c6031d 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java @@ -110,17 +110,13 @@ public class SquareFragment extends BaseFragment implements TopMagicIndicatorAda viewPager.addOnPageChangeListener(new OnPageSelectedListener() { @Override public void onPageSelected(int position) { - String tag = ""; if(position == 0){ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SQUARE_DONGTAI_FOLLOW_CLICK, ResUtil.getString(R.string.community_square_squarefragment_01)); - tag = getResources().getString(R.string.dys_tab_attent); }else if (position == 1){ - tag = getResources().getString(R.string.dys_tab_recommend); } else if (position == 2){ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SQUARE_DONGTAI_NEW_CLICK, ResUtil.getString(R.string.community_square_squarefragment_02)); - tag = getResources().getString(R.string.dys_tab_new); } } });