diff --git a/app/src/main/java/com/mango/moshen/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/mango/moshen/avroom/activity/AVRoomActivity.java index 2861f0320..bb7b9a687 100644 --- a/app/src/main/java/com/mango/moshen/avroom/activity/AVRoomActivity.java +++ b/app/src/main/java/com/mango/moshen/avroom/activity/AVRoomActivity.java @@ -428,16 +428,20 @@ public class AVRoomActivity extends BaseMvpActivity 0 && position == 1) { - if (mAdapter == null || mAdapter.getItem(2) == null) return; - ((FakeSingleRoomFragment) mAdapter.getItem(2)).requestPreRoomInfo(); - if (singleRoomTipDialog != null) { - singleRoomTipDialog.dismissAllowingStateLoss(); - singleRoomTipDialog = null; + try { + if (positionOffset > 0 && position == 1) { + if (mAdapter == null || mAdapter.getItem(2) == null) return; + ((FakeSingleRoomFragment) mAdapter.getItem(2)).requestPreRoomInfo(); + if (singleRoomTipDialog != null) { + singleRoomTipDialog.dismissAllowingStateLoss(); + singleRoomTipDialog = null; + } + } else if (positionOffset > 0 && position == 0) { + if (mAdapter == null || mAdapter.getItem(0) == null) return; + ((FakeSingleRoomBackFragment) mAdapter.getItem(0)).requestPreRoomInfo(); } - } else if (positionOffset > 0 && position == 0) { - if (mAdapter == null || mAdapter.getItem(0) == null) return; - ((FakeSingleRoomBackFragment) mAdapter.getItem(0)).requestPreRoomInfo(); + } catch (Exception e) { + e.printStackTrace(); } } @@ -448,14 +452,18 @@ public class AVRoomActivity extends BaseMvpActivity() { override fun init() { meViewModel.getAnchorGradeInfo(true) meViewModel.anchorGradeInfoLiveData.observe(this) { + if (it == null) return@observe val isCompleted = it.currentReply >= it.targetReply && it.currentDiamond >= it.targetDiamond binding.ivTitle.setImageResource(if (isCompleted) R.drawable.anchor_grade_bg_complete_text else R.drawable.anchor_grade_bg_task_text) diff --git a/app/src/main/java/com/mango/moshen/vip/VipUpgradeDialog.kt b/app/src/main/java/com/mango/moshen/vip/VipUpgradeDialog.kt index 9245cd5f8..9124f2fda 100644 --- a/app/src/main/java/com/mango/moshen/vip/VipUpgradeDialog.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipUpgradeDialog.kt @@ -63,8 +63,8 @@ class VipUpgradeDialog : BaseDialog() { override fun onError() { } }) - } catch (e: MalformedURLException) { - + } catch (e: Exception) { + e.printStackTrace() } binding.tvLevelDesc.text = "恭喜你成为「${vipInfo.vipName}」!当前已自动佩戴该等级装扮,是否保留原有装扮?" } diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ClanIncomeActivity.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ClanIncomeActivity.java index 73729c6c5..6cd6ed882 100644 --- a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ClanIncomeActivity.java +++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ClanIncomeActivity.java @@ -3,6 +3,7 @@ package com.mango.moshen.module_hall.hall.activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -11,7 +12,8 @@ import androidx.fragment.app.FragmentStatePagerAdapter; import androidx.viewpager.widget.ViewPager; import com.jzxiang.pickerview.data.Type; -import com.netease.nim.uikit.StatusBarUtil; +import com.mango.core.statistic.StatisticManager; +import com.mango.core.statistic.protocol.StatisticsProtocol; import com.mango.moshen.R; import com.mango.moshen.base.BaseMvpActivity; import com.mango.moshen.module_hall.hall.view.dialog.TimePickerDialog; @@ -22,12 +24,11 @@ import com.mango.moshen.module_hall.income.view.IIncomeStatisticsView; import com.mango.moshen.ui.widget.magicindicator.MagicIndicator; import com.mango.moshen.ui.widget.magicindicator.ViewPagerHelper; import com.mango.moshen.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.mango.core.statistic.StatisticManager; -import com.mango.core.statistic.protocol.StatisticsProtocol; import com.mango.xchat_android_library.base.factory.CreatePresenter; import com.mango.xchat_android_library.utils.CommonUtils; import com.mango.xchat_android_library.utils.TimeUtils; import com.mango.xchat_android_library.utils.config.BasicConfig; +import com.netease.nim.uikit.StatusBarUtil; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -235,6 +236,7 @@ public class ClanIncomeActivity extends BaseMvpActivity