diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 1400a0755..ce0856f6b 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -847,6 +847,11 @@ public class MainActivity extends BaseMvpActivity tempFragment = showFragment; if (!isDestroyed()) transaction.commitNowAllowingStateLoss(); mCurrentTabType = tabType; + + //每次点击我的都更新当前用户信息 + if (mCurrentTabType == MainTabType.TAB_TYPE_ME) { + UserModel.get().updateCurrentUserInfo().subscribe(); + } } @Override diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/VisitorListActivity.kt b/app/src/main/java/com/yizhuan/erban/home/activity/VisitorListActivity.kt index 357615283..51f5fde32 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/VisitorListActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/home/activity/VisitorListActivity.kt @@ -12,8 +12,10 @@ import com.yizhuan.erban.databinding.ActivityVisitorListBinding import com.yizhuan.erban.home.adapter.VisitorListAdapter import com.yizhuan.erban.ui.utils.RVDelegate import com.yizhuan.xchat_android_core.home.bean.VisitorInfo +import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent import com.yizhuan.xchat_android_core.user.UserModel import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import org.greenrobot.eventbus.EventBus @ActLayoutRes(R.layout.activity_visitor_list) class VisitorListActivity : BaseViewBindingActivity() { @@ -33,6 +35,7 @@ class VisitorListActivity : BaseViewBindingActivity( @SuppressLint("CheckResult") override fun init() { + EventBus.getDefault().postSticky(VisitorUnreadCountEvent(0)) initTitleBar("访客记录") rvDelegate = RVDelegate.Builder() .setRefreshLayout(binding.swipeRefresh) diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt index d593b4a1e..55629c3c7 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt @@ -443,14 +443,13 @@ class MeFragment : BaseFragment(), View.OnClickListener { @SuppressLint("SetTextI18n") @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) - fun onVisitorUnreadCountEvent(event: VisitorUnreadCountEvent?) { - /* if (mBinding == null) return; - if (event.getVisitNum() == 0) { - mBinding.tvRedDot.setVisibility(View.GONE); + fun onVisitorUnreadCountEvent(event: VisitorUnreadCountEvent) { + if (event.visitNum == 0) { + mBinding.tvRedDot.visibility = View.GONE } else { - mBinding.tvRedDot.setVisibility(View.VISIBLE); - mBinding.tvRedDot.setText(event.getVisitNum() > 99 ? "99+" : String.valueOf(event.getVisitNum())); - }*/ + mBinding.tvRedDot.visibility = View.VISIBLE + mBinding.tvRedDot.text = if (event.visitNum > 99) "99+" else event.visitNum.toString() + } } private fun requestUpdateUserInfo() { @@ -502,7 +501,10 @@ class MeFragment : BaseFragment(), View.OnClickListener { R.id.fl_new_user_charge -> { NewUserChargeGiftDialog.start(mContext) StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_USERCENTER_NUGIFT_POP_CLICK, "usercenter_nugift_pop_click") + .onEvent( + StatisticsProtocol.EVENT_USERCENTER_NUGIFT_POP_CLICK, + "usercenter_nugift_pop_click" + ) } else -> {} } diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java index 8d1ff9a09..bc9b1f6bc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java @@ -35,7 +35,6 @@ import com.yizhuan.erban.team.view.NimTeamMessageActivity; import com.yizhuan.erban.ui.login.BindPhoneActivity; import com.yizhuan.erban.ui.login.ShowBindPhoneActivity; import com.yizhuan.erban.ui.patriarch.PatriarchModeActivity; -import com.yizhuan.erban.ui.patriarch.help.LimitEnterRoomHelper; import com.yizhuan.erban.ui.pay.ChargeActivity; import com.yizhuan.erban.ui.setting.FeedbackActivity; import com.yizhuan.erban.ui.setting.ModifyPwdActivity; @@ -48,12 +47,10 @@ import com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipAct import com.yizhuan.xchat_android_core.DemoCache; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent; -import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent; import com.yizhuan.xchat_android_core.im.custom.bean.RouterType; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; import com.yizhuan.xchat_android_core.room.bean.RoomInfo; import com.yizhuan.xchat_android_core.room.model.AvRoomModel; import com.yizhuan.xchat_android_core.statistic.StatisticManager; @@ -314,7 +311,6 @@ public class RouterHandler { break; case RouterType.VISITOR_LIST: //访客记录 - EventBus.getDefault().postSticky(new VisitorUnreadCountEvent(0)); VisitorListActivity.start(context); break; case RouterType.CP_HOME: diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 8f02409d2..a3018da61 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -266,6 +266,7 @@ android:layout_marginStart="10dp" android:layout_marginTop="20dp" android:layout_marginEnd="10dp" + android:baselineAligned="false" android:gravity="bottom" android:orientation="horizontal" android:weightSum="4" @@ -343,16 +344,40 @@ android:onClick="@{click}" android:orientation="vertical"> - + + + + + + +