Merge remote-tracking branch 'origin/master'

app/src/main/java/com/kanglai/push/ui/activity/TabBarActivity.java

@@ -89,10 +89,6 @@ public class TabBarActivity extends BaseActivity<ActivityTabBarBinding, BaseView
             public void onRepeat(int index) {
             }
         });
-        //设置消息数
-        navigationController.setMessageNumber(2, 8);
-        //设置显示小圆点
-        navigationController.setHasMessage(0, true);
     }
 
     private BaseTabItem normalItem(int drawable, int checkedDrawable, String text) {

app/src/main/java/com/kanglai/push/ui/fragment/MessageFragment.java

@@ -74,19 +74,17 @@ public class MessageFragment extends BaseFragment<FragmentMessageBinding, Messag
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {;
         super.onCreate(savedInstanceState);
-
-        // 友盟数据提前处理用户数据
         mSubscription = RxBus.getInstance().toObservableSticky(PushChatMessage.class)
-                .compose(RxUtil.schedulersTransformer())
+        .compose(RxUtil.schedulersTransformer())
-                .compose(RxUtil.exceptionTransformer())
+        .compose(RxUtil.exceptionTransformer())
-                .subscribe(msg -> {
+        .subscribe(msg -> {
-                    JSONObject jsonObject = new JSONObject(new Gson().toJson(msg));
+            PushChatMessage pushChatMessage = (PushChatMessage) msg;
-                    if(!TextUtils.isEmpty(jsonObject.getString("fanUserId"))) {
+            if(!TextUtils.isEmpty(pushChatMessage.getFanUserId())) {
-                        mViewModel.judgeNewPushMsgs(jsonObject.getString("fanUserId"),jsonObject.getString("text"));
+                mViewModel.judgeNewPushMsgs(pushChatMessage.getFanUserId(), pushChatMessage.getText());
-                    }
+            }
-                });
+        });
         RxSubscriptions.add(mSubscription);
     }
 
@@ -119,12 +117,8 @@ public class MessageFragment extends BaseFragment<FragmentMessageBinding, Messag
         mRecyclerView.setLayoutManager(mLayoutManager);
         mRecyclerView.setAdapter(mWrappedAdapter);
         mRecyclerView.setItemAnimator(animator);
-//        mRecyclerView.addItemDecoration(new DefaultItemDecoration(ContextCompat.getColor(requireContext(), R.color.common_divider_color)));
         mRecyclerViewTouchActionGuardManager.attachRecyclerView(mRecyclerView);
         mRecyclerViewSwipeManager.attachRecyclerView(mRecyclerView);
-
-        // mRefreshLayout.setOnRefreshListener(mViewModel::refresh);   // 刷新数据
-//        mRefreshLayout.setOnLoadMoreListener(mViewModel::loadMore);  隐藏加载更多 todo: 当联系人数据多起来之后 分页要做一下
         mRefreshLayout.setEnableLoadMore(false);
         mLoadingLayout.showContent();
         mRefreshLayout.autoRefresh();
@@ -133,11 +127,11 @@ public class MessageFragment extends BaseFragment<FragmentMessageBinding, Messag
     @Override
     public void onStart() {
         super.onStart();
+        mViewModel.setAlias();
         btnClickType = true;
         if (mRefreshLayout != null){
             mRefreshLayout.resetNoMoreData();   // 恢复没有数据的初始状态 等待系统销毁
             mRefreshLayout.setOnRefreshListener(mViewModel::refresh);
-//            mViewModel.refresh(mRefreshLayout);
         }
     }
 

app/src/main/java/com/kanglai/push/ui/fragment/UserFragment.java

@@ -77,12 +77,8 @@ public class UserFragment extends BaseFragment<FragmentUserBinding, UserViewMode
         mRecyclerView = getView().findViewById(R.id.recycler_view);
         // 设置列表
         List<UserRecyclerAdapter.UserEntity> list = CollectionUtils.newArrayList(
-                new UserRecyclerAdapter.UserEntity().setCode("1").setTitle("推送设置").setBadge(0).setImage(R.drawable.icon_about).setHidesLeftImage(true),
                 new UserRecyclerAdapter.UserEntity().setCode("2").setTitle("关于我们").setBadge(0).setImage(R.drawable.icon_about).setHidesLeftImage(true),
-                new UserRecyclerAdapter.UserEntity().setCode("3").setTitle("退出登录").setBadge(0).setImage(R.drawable.icon_exit).setHidesLeftImage(true),
+                new UserRecyclerAdapter.UserEntity().setCode("3").setTitle("退出登录").setBadge(0).setImage(R.drawable.icon_exit).setHidesLeftImage(true)
-                // todo 发布时隐藏该入口
-                new UserRecyclerAdapter.UserEntity().setCode("4").setTitle("测-第一次注册时修改用户信息").setBadge(0).setImage(R.drawable.icon_exit).setHidesLeftImage(true)
-
         );
         final UserRecyclerAdapter userRecyclerAdapter = new UserRecyclerAdapter(list);
         userRecyclerAdapter.setEventListener(this);
@@ -129,10 +125,6 @@ public class UserFragment extends BaseFragment<FragmentUserBinding, UserViewMode
                         .setCancelButton("取 消")
                         .show();
             break;
-            case "4":
-                // todo 正式发布时隐藏该入口
-                startActivity(LoginSurveyActivity.class);
-            break;
         }
     }
 

app/src/main/java/com/kanglai/push/ui/vm/MessageViewModel.java

@@ -90,7 +90,6 @@ public class MessageViewModel extends ToolbarViewModel<MessageFragment> {
             mActivity.mLoadingLayout.showEmpty();
             refresh.finishRefresh(true);
         }
-        refreshAlias();  // 每次刷新时 重新注册token
     }
 
     /**
@@ -174,7 +173,7 @@ public class MessageViewModel extends ToolbarViewModel<MessageFragment> {
     }
 
 
-    public void refreshAlias(){
+    public void setAlias(){
         PushAgent mPushAgent = PushAgent.getInstance(Utils.getApp());
         mPushAgent.register(new UPushRegisterCallback() {   // 设备注册
             @Override