diff --git a/app/src/main/java/com/kanglai/push/ui/activity/TabBarActivity.java b/app/src/main/java/com/kanglai/push/ui/activity/TabBarActivity.java index 9aeb1cc..53501bb 100644 --- a/app/src/main/java/com/kanglai/push/ui/activity/TabBarActivity.java +++ b/app/src/main/java/com/kanglai/push/ui/activity/TabBarActivity.java @@ -89,10 +89,6 @@ public class TabBarActivity extends BaseActivity { - JSONObject jsonObject = new JSONObject(new Gson().toJson(msg)); - if(!TextUtils.isEmpty(jsonObject.getString("fanUserId"))) { - mViewModel.judgeNewPushMsgs(jsonObject.getString("fanUserId"),jsonObject.getString("text")); - } - }); + .compose(RxUtil.schedulersTransformer()) + .compose(RxUtil.exceptionTransformer()) + .subscribe(msg -> { + PushChatMessage pushChatMessage = (PushChatMessage) msg; + if(!TextUtils.isEmpty(pushChatMessage.getFanUserId())) { + mViewModel.judgeNewPushMsgs(pushChatMessage.getFanUserId(), pushChatMessage.getText()); + } + }); RxSubscriptions.add(mSubscription); } @@ -119,12 +117,8 @@ public class MessageFragment extends BaseFragment 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), - // todo 发布时隐藏该入口 - new UserRecyclerAdapter.UserEntity().setCode("4").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) ); final UserRecyclerAdapter userRecyclerAdapter = new UserRecyclerAdapter(list); userRecyclerAdapter.setEventListener(this); @@ -129,10 +125,6 @@ public class UserFragment extends BaseFragment { mActivity.mLoadingLayout.showEmpty(); refresh.finishRefresh(true); } - refreshAlias(); // 每次刷新时 重新注册token } /** @@ -174,7 +173,7 @@ public class MessageViewModel extends ToolbarViewModel { } - public void refreshAlias(){ + public void setAlias(){ PushAgent mPushAgent = PushAgent.getInstance(Utils.getApp()); mPushAgent.register(new UPushRegisterCallback() { // 设备注册 @Override