fix [换设备已读聊天信息依旧推送问题]

2024-04-01 10:47:13 +08:00
parent 91217e6bda
commit 51ab918327
13 changed files with 287 additions and 24 deletions
--- a/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/EntryActivity.java
@@ -84,6 +84,7 @@ import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.NoviceInstructorManager;
 import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.DialogUitl;
+import com.yunbao.common.utils.MessageChatNotifyManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.http.LiveHttpUtil;
@@ -184,6 +185,7 @@ public class EntryActivity extends AppCompatActivity {
        activity = this;
        Contexts = this;
        setStatusBar();
+        MessageChatNotifyManager.getInstance().clear();
        lt_btn_facebook = findViewById(R.id.lt_btn_facebook);
        lt_btn_twitter = findViewById(R.id.lt_btn_twitter);
        btn_tip = findViewById(R.id.btn_tip);
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -17,6 +17,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Display;
@@ -67,6 +68,7 @@ import com.yunbao.common.bean.LiveSvgGiftBean;
 import com.yunbao.common.bean.UpdataListBean;
 import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.custom.TabButtonGroup;
+import com.yunbao.common.dialog.DebugDialog;
 import com.yunbao.common.dialog.HintDialog;
 import com.yunbao.common.dialog.InstructorOperationDialog;
 import com.yunbao.common.event.CompleteInformationEvent;
@@ -150,9 +152,12 @@ import cn.rongcloud.rtc.api.RCRTCConfig;
 import cn.rongcloud.rtc.api.RCRTCEngine;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
+import io.rong.imkit.RongIM;
 import io.rong.imkit.config.RongConfigCenter;
 import io.rong.imkit.notification.NotificationConfig;
+import io.rong.imlib.RongCoreClient;
 import io.rong.imlib.RongIMClient;
+import io.rong.imlib.model.Conversation;
 import io.rong.imlib.model.Message;
 import kotlin.Unit;

@@ -225,6 +230,13 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
        ActivityCompat.postponeEnterTransition(this);
        ConversationIMListManager.get(this);
        OpenAdManager.getInstance();
+        new Handler(Looper.getMainLooper())
+                .postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        DebugDialog.getInstance(mContext).setParams("Debug", "悬浮层");
+                    }
+                }, 1000);
        UserInfoManager.updateMyInfo(this, null);
        //在请求一下这个接口给我后台版本号
        CommonHttpUtil.getConfig(mContext, new CommonCallback<ConfigBean>() {
@@ -266,6 +278,8 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
        RCRTCConfig.Builder config = RCRTCConfig.Builder.create();
        config.enableEncoderTexture(false);//新娱美颜 需要关闭这个
        RCRTCEngine.getInstance().init(MainActivity.this, config.build());
+        ConversationIMListManager.get(mContext).addUserInfoProvider();
+        requestNotReadMessage();
        //推送跳直播间
        if (getIntent().getStringExtra("liveid") != null) {
            LiveHttpUtil.getLiveInfo(getIntent().getStringExtra("liveid") + "", new HttpCallback() {
@@ -550,6 +564,10 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
        showFirstLogin();
    }

+    private void requestNotReadMessage() {
+    
+    }
+
    private void showFirstLogin() {
        LiveNetManager.get(mContext).isFirstLogin(new com.yunbao.common.http.base.HttpCallback<FirstLoginBean>() {
            @Override
--- a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationActivity.java
@@ -47,6 +47,7 @@ import com.yunbao.common.manager.NoviceInstructorManager;
 import com.yunbao.common.manager.imrongcloud.MessageIMManager;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
+import com.yunbao.common.utils.MessageChatNotifyManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
@@ -108,6 +109,7 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
    @Override
    protected void main() {
        super.main();
+        targetId = getIntent().getStringExtra("targetId");
        EventBus.getDefault().register(this);
        mContext = this;
        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
@@ -116,13 +118,13 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
        WindowSoftModeAdjustResizeExecutor.assistActivity(this);
        //设置会话界面操作监听器
        MessageIMManager.get(this).addConversationClickListener();
+        MessageChatNotifyManager.getInstance().clear(Long.parseLong(targetId));
    }

    @Override
    protected void onResume() {
        super.onResume();
        setUserCard();
-        ConversationIMListManager.get(mContext).addUserInfoProvider();
    }

    private void hideUserCard() {
@@ -228,7 +230,6 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
    private void initView() {
        try {
            // 添加会话界面
-            targetId = getIntent().getStringExtra("targetId");
            conversationFragment = new PDLiveConversationFragment(targetId);
            FragmentManager manager = getSupportFragmentManager();
            FragmentTransaction transaction = manager.beginTransaction();
--- a/main/src/main/java/com/yunbao/main/adapter/MainMsgAddressBookListAdapter.java
+++ b/main/src/main/java/com/yunbao/main/adapter/MainMsgAddressBookListAdapter.java
@@ -14,6 +14,7 @@ import com.yunbao.common.bean.SetAttentsModel;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
@@ -23,8 +24,10 @@ import com.yunbao.main.fragment.MyAddressBookFragment;
 import java.util.ArrayList;
 import java.util.List;

+import io.rong.imkit.utils.RouteUtils;
 import io.rong.imkit.widget.adapter.BaseAdapter;
 import io.rong.imkit.widget.adapter.ViewHolder;
+import io.rong.imlib.model.Conversation;

 public class MainMsgAddressBookListAdapter extends BaseAdapter<MessageChatUserBean> {
    public static final int TYPE_SEARCH_TITLE = 500;
@@ -85,10 +88,15 @@ public class MainMsgAddressBookListAdapter extends BaseAdapter<MessageChatUserBe
        }
        holder.getConvertView().setTag(mDataList.get(position));
        holder.getConvertView().setOnClickListener(view -> {
-          /*  MessageChatUserBean userBean = (MessageChatUserBean) view.getTag();
-            RouteUtils.routeToConversationActivity(view.getContext(),
-                    Conversation.ConversationType.PRIVATE,
-                    userBean.getId());*/
+            AppManager.runDebugCode(new Runnable() {
+                @Override
+                public void run() {
+                    MessageChatUserBean userBean = (MessageChatUserBean) view.getTag();
+                    RouteUtils.routeToConversationActivity(view.getContext(),
+                            Conversation.ConversationType.PRIVATE,
+                            userBean.getId());
+                }
+            });
        });
    }

--- a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java
@@ -136,8 +136,8 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
        search = findViewById(R.id.search);
        contacts.setOnClickListener(view -> {
            //通讯录
-            //RouteUtil.forwardActivity(RouteUtil.PATH_ADDRESSBOOK);
-             mContext.startActivity(new Intent(mContext, com.yunbao.main.activity.CompleteUserInfoActivity.class));
+            RouteUtil.forwardActivity(RouteUtil.PATH_ADDRESSBOOK);
+            // mContext.startActivity(new Intent(mContext, com.yunbao.main.activity.CompleteUserInfoActivity.class));
            // mContext.startActivity(new Intent(mContext, MessageHiConfigRecordActivity.class));
        });
        search.addTextChangedListener(new TextWatcher() {