From cbf43a3aa3aa02326ce0ee7d6aa0d980e5055a65 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Fri, 22 Jul 2022 16:27:19 +0800
Subject: [PATCH] 11111

---
 .../java/com/shayu/phonelive/AppContext.java  |   3 +-
 .../yunbao/common/manager/IMLoginManager.java |   6 +
 .../manager/InstructorRemarkManager.java      |   4 +
 .../manager/imrongcloud/MessageIMManager.java |  15 +-
 .../imrongcloud/RongcloudIMManager.java       |  14 +-
 live/build.gradle                             |   2 +-
 live/src/main/AndroidManifest.xml             |   2 +-
 .../activity/PDLiveConversationActivity.java  |   7 +-
 .../live/dialog/PDLiveMessageListAdapter.java |  39 +++++
 .../live/views/InputPanelViewHolder.java      |  18 +-
 .../views/PDLiveConversationFragment.java     |  18 ++
 .../res/layout/rc_conversationlist_item.xml   |  53 +++---
 live/src/main/res/layout/rc_message_item.xml  | 159 ++++++++++++++++++
 .../res/mipmap-xxxhdpi/icon_message_read.png  | Bin 0 -> 2248 bytes
 .../mipmap-xxxhdpi/icon_message_unread.png    | Bin 0 -> 3030 bytes
 .../yunbao/main/activity/MainActivity.java    |  15 +-
 .../PDLiveCustomConversationProvider.java     |  20 ++-
 17 files changed, 334 insertions(+), 41 deletions(-)
 create mode 100644 live/src/main/java/com/yunbao/live/dialog/PDLiveMessageListAdapter.java
 create mode 100644 live/src/main/java/com/yunbao/live/views/PDLiveConversationFragment.java
 rename {main => live}/src/main/res/layout/rc_conversationlist_item.xml (77%)
 create mode 100644 live/src/main/res/layout/rc_message_item.xml
 create mode 100644 live/src/main/res/mipmap-xxxhdpi/icon_message_read.png
 create mode 100644 live/src/main/res/mipmap-xxxhdpi/icon_message_unread.png

diff --git a/app/src/main/java/com/shayu/phonelive/AppContext.java b/app/src/main/java/com/shayu/phonelive/AppContext.java
index 128f680e6..8708a0a1f 100644
--- a/app/src/main/java/com/shayu/phonelive/AppContext.java
+++ b/app/src/main/java/com/shayu/phonelive/AppContext.java
@@ -150,8 +150,7 @@ public class AppContext extends CommonAppContext {
         RongcloudIMManager.addRongcloudIMOnReceiveMessageListener();
         //初始化融云
         RongcloudIMManager.initRongIM(this);
-        //添加融云连接状态监听
-        RongcloudIMManager.setIMStatusListener();
+
 
 
         //监听im消息
diff --git a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
index 5736848df..fa5d990e0 100644
--- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
@@ -13,6 +13,8 @@ import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
 import com.yunbao.common.manager.base.BaseCacheManager;
+import com.yunbao.common.manager.imrongcloud.MessageIMManager;
+import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 
 import java.util.Map;
 
@@ -99,11 +101,15 @@ public class IMLoginManager extends BaseCacheManager {
      * 退出登录
      */
     public void logout() {
+        //添加融云连接状态监听
+        RongcloudIMManager.removeIMStatusListener();
         //删除用户登录信息
         deleteByKey(KEY_USER_INFO);
         //用户对象置空
         userInfo = null;
         manager = null;
+        RongcloudIMManager.logoutIM();
+        MessageIMManager.get(context).logout();
     }
 
 }
diff --git a/common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java b/common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java
index 68ba76ab4..e015845d9 100644
--- a/common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java
@@ -11,6 +11,7 @@ import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
 import com.yunbao.common.manager.base.BaseCacheManager;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -38,6 +39,9 @@ public class InstructorRemarkManager extends BaseCacheManager {
             instructorRemarkMap = JSON.parseObject(getString(KEY_INSTRUCTOR_REMARK), new TypeReference<Map<String, String>>() {
             });
         }
+        if (instructorRemarkMap == null) {
+            instructorRemarkMap = new HashMap<>();
+        }
         return instructorRemarkMap;
     }
 
diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java
index 8d1e0e73c..dd1f125b9 100644
--- a/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/MessageIMManager.java
@@ -34,6 +34,15 @@ public class MessageIMManager {
         number = 0;
     }
 
+    public void logout() {
+        number = 0;
+        imNumber = 0;
+        systemNumber = 0;
+        //发送通知
+        unreadMessagesHandler.post(essagesRunnable);
+        manager = null;
+    }
+
     /**
      * 获取单利
      */
@@ -85,6 +94,8 @@ public class MessageIMManager {
                                     try {
                                         if (!TextUtils.isEmpty(number) && Integer.parseInt(number) > 0) {
                                             systemNumber = Integer.parseInt(number);
+                                        }else {
+                                            systemNumber = 0;
                                         }
                                     } catch (NumberFormatException e) {
                                         systemNumber = 0;
@@ -125,6 +136,8 @@ public class MessageIMManager {
                                     try {
                                         if (!TextUtils.isEmpty(number) && Integer.parseInt(number) > 0) {
                                             systemNumber = Integer.parseInt(number);
+                                        }else {
+                                            systemNumber = 0;
                                         }
                                     } catch (NumberFormatException e) {
                                         systemNumber = 0;
@@ -148,7 +161,7 @@ public class MessageIMManager {
     //整合未读消息数目并且发送出去
     private final Runnable essagesRunnable = () -> {
         number = imNumber + systemNumber;
-        EventBus.getDefault().postSticky(new MessageIMEvent().setNumber(number));
+        EventBus.getDefault().post(new MessageIMEvent().setNumber(number));
     };
 
 }
diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
index 399475ef6..d781963dc 100644
--- a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
@@ -10,13 +10,19 @@ import androidx.annotation.NonNull;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.request.RequestOptions;
+import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.bean.BaseModel;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.manager.IMLoginManager;
 
+import org.greenrobot.eventbus.EventBus;
+
+import cn.rongcloud.rtc.api.RCRTCEngine;
 import io.rong.imkit.GlideKitImageEngine;
 import io.rong.imkit.IMCenter;
 import io.rong.imkit.RongIM;
 import io.rong.imkit.config.RongConfigCenter;
+import io.rong.imlib.RongCoreClient;
 import io.rong.imlib.RongIMClient;
 import io.rong.imlib.model.Conversation;
 import io.rong.imlib.model.Message;
@@ -107,7 +113,8 @@ public class RongcloudIMManager {
             public void onSuccess(String s) {
                 //连接成功，如果 onDatabaseOpened() 时没有页面跳转，也可在此时进行跳转。
                 Log.e(CLASSNAME, "onSuccess:" + s);
-
+                //添加融云连接状态监听
+                RongcloudIMManager.setIMStatusListener();
             }
 
             @Override
@@ -145,6 +152,10 @@ public class RongcloudIMManager {
         RongIM.setConnectionStatusListener(connectionStatusListener);
     }
 
+    public static void removeIMStatusListener() {
+        RongIM.setConnectionStatusListener(null);
+    }
+
     /**
      * 监听 IM 连接状态，可根据连接状态进行不同业务处理
      */
@@ -159,6 +170,7 @@ public class RongcloudIMManager {
                     break;
                 //用户账号在其它设备登录，此设备被踢下线
                 case KICKED_OFFLINE_BY_OTHER_CLIENT:
+//                    EventBus.getDefault().post(new BaseModel());
                     break;
                 //连接暂时挂起（多是由于网络问题导致），SDK 会在合适时机进行自动重连
                 case SUSPEND:
diff --git a/live/build.gradle b/live/build.gradle
index c9272badb..989609960 100644
--- a/live/build.gradle
+++ b/live/build.gradle
@@ -1 +1 @@
-apply plugin: 'com.android.library'
apply plugin: 'img-optimizer'
apply plugin: 'kotlin-android'


android {
    compileSdkVersion rootProject.ext.android.compileSdkVersion
    buildToolsVersion rootProject.ext.android.buildToolsVersion
    aaptOptions.cruncherEnabled = false
    aaptOptions.useNewCruncher = false
    packagingOptions {
        pickFirst "lib/armeabi/libyuvutils.so"
        pickFirst "lib/arm64-v8a/libyuvutils.so"
        pickFirst "lib/armeabi-v7a/libyuvutils.so"
        pickFirst "lib/armeabi/libyuvtools.so"
        pickFirst "lib/arm64-v8a/libyuvtools.so"
        pickFirst "lib/armeabi-v7a/libyuvtools.so"
        exclude "lib/arm64-v8a/libmmcv_api_handgesture.so"
        exclude "lib/arm64-v8a/libmmcv_api_express.so"
        exclude "lib/arm64-v8a/libMediaEncoder.so"
        exclude "lib/arm64-v8a/libarcore_sdk_c.so"
        exclude "lib/arm64-v8a/libmediadecoder.so"
        exclude "lib/arm64-v8a/libMediaMuxer.so"
        exclude "lib/arm64-v8a/libarcore_sdk_jni.so"
        exclude "lib/arm64-v8a/libMediaUtils.so"
        exclude "lib/arm64-v8a/libcosmosffmpeg.so"

    }

    defaultConfig {
        minSdkVersion rootProject.ext.android.minSdkVersion
        targetSdkVersion rootProject.ext.android.targetSdkVersion
        versionCode rootProject.ext.android.versionCode
        versionName rootProject.ext.android.versionName
        manifestPlaceholders = rootProject.ext.manifestPlaceholders
        ndk {
            abiFilters "armeabi-v7a", "arm64-v8a"
        }
        javaCompileOptions {
            annotationProcessorOptions {
                arguments = [AROUTER_MODULE_NAME: project.getName()]
            }
        }
    }
    aaptOptions {
        cruncherEnabled = false
        useNewCruncher = false
    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }

    kotlinOptions {
        allWarningsAsErrors = true
    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
}

repositories {
    flatDir {
        dirs 'libs', '../libs'
    }
    mavenCentral()
}

dependencies {
    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
    //socket.io
    implementation('io.socket:socket.io-client:1.0.0') {
        exclude group: 'org.json', module: 'json'
    }
    //common
    implementation project(path: ':common')
    annotationProcessor rootProject.ext.dependencies["arouter-compiler"]


    //工具
    api rootProject.ext.dependencies["blank-utilcode"]
    implementation 'com.eightbitlab:blurview:1.6.6'

    implementation files('libs/beautysdk-202202241203.aar')
    implementation 'com.google.code.gson:gson:2.8.6'
    implementation "com.getkeepsafe.relinker:relinker:1.4.4"
}
\ No newline at end of file
+apply plugin: 'com.android.library'
apply plugin: 'img-optimizer'
apply plugin: 'kotlin-android'


android {
    compileSdkVersion rootProject.ext.android.compileSdkVersion
    buildToolsVersion rootProject.ext.android.buildToolsVersion
    aaptOptions.cruncherEnabled = false
    aaptOptions.useNewCruncher = false
    packagingOptions {
        pickFirst "lib/armeabi/libyuvutils.so"
        pickFirst "lib/arm64-v8a/libyuvutils.so"
        pickFirst "lib/armeabi-v7a/libyuvutils.so"
        pickFirst "lib/armeabi/libyuvtools.so"
        pickFirst "lib/arm64-v8a/libyuvtools.so"
        pickFirst "lib/armeabi-v7a/libyuvtools.so"
        exclude "lib/arm64-v8a/libmmcv_api_handgesture.so"
        exclude "lib/arm64-v8a/libmmcv_api_express.so"
        exclude "lib/arm64-v8a/libMediaEncoder.so"
        exclude "lib/arm64-v8a/libarcore_sdk_c.so"
        exclude "lib/arm64-v8a/libmediadecoder.so"
        exclude "lib/arm64-v8a/libMediaMuxer.so"
        exclude "lib/arm64-v8a/libarcore_sdk_jni.so"
        exclude "lib/arm64-v8a/libMediaUtils.so"
        exclude "lib/arm64-v8a/libcosmosffmpeg.so"

    }

    defaultConfig {
        minSdkVersion rootProject.ext.android.minSdkVersion
        targetSdkVersion rootProject.ext.android.targetSdkVersion
        versionCode rootProject.ext.android.versionCode
        versionName rootProject.ext.android.versionName
        manifestPlaceholders = rootProject.ext.manifestPlaceholders
        ndk {
            abiFilters "armeabi-v7a", "arm64-v8a"
        }
        javaCompileOptions {
            annotationProcessorOptions {
                arguments = [AROUTER_MODULE_NAME: project.getName()]
            }
        }
    }
    aaptOptions {
        cruncherEnabled = false
        useNewCruncher = false
    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }

    kotlinOptions {
        allWarningsAsErrors = true
    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
}

repositories {
    flatDir {
        dirs 'libs', '../libs'
    }
    mavenCentral()
}

dependencies {
    implementation 'androidx.constraintlayout:constraintlayout:2.0.0'

    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
    //socket.io
    implementation('io.socket:socket.io-client:1.0.0') {
        exclude group: 'org.json', module: 'json'
    }
    //common
    implementation project(path: ':common')
    annotationProcessor rootProject.ext.dependencies["arouter-compiler"]


    //工具
    api rootProject.ext.dependencies["blank-utilcode"]
    implementation 'com.eightbitlab:blurview:1.6.6'

    implementation files('libs/beautysdk-202202241203.aar')
    implementation 'com.google.code.gson:gson:2.8.6'
    implementation "com.getkeepsafe.relinker:relinker:1.4.4"
}
\ No newline at end of file
diff --git a/live/src/main/AndroidManifest.xml b/live/src/main/AndroidManifest.xml
index 41f237ebe..e0f0cc711 100644
--- a/live/src/main/AndroidManifest.xml
+++ b/live/src/main/AndroidManifest.xml
@@ -82,7 +82,7 @@
         <activity
             android:name=".activity.PDLiveConversationActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden|adjustResize">
+            android:windowSoftInputMode="adjustResize|stateHidden">
         </activity>
         <activity
             android:name=".activity.PDLIiveChatActivity"
diff --git a/live/src/main/java/com/yunbao/live/activity/PDLiveConversationActivity.java b/live/src/main/java/com/yunbao/live/activity/PDLiveConversationActivity.java
index 56785e3e4..3b9d85ae2 100644
--- a/live/src/main/java/com/yunbao/live/activity/PDLiveConversationActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/PDLiveConversationActivity.java
@@ -27,6 +27,7 @@ import com.yunbao.live.R;
 import com.yunbao.live.bean.SearchUserBean;
 import com.yunbao.live.dialog.MenuPopuwWindow;
 import com.yunbao.live.views.InputPanelViewHolder;
+import com.yunbao.live.views.PDLiveConversationFragment;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -42,7 +43,7 @@ import io.rong.imlib.model.UserInfo;
  * 聊天会话界面
  */
 public class PDLiveConversationActivity extends AbsActivity implements View.OnClickListener {
-    private ConversationFragment conversationFragment;
+    private PDLiveConversationFragment conversationFragment;
     private PDLiveConversationActivity mContext;
     private InputPanelViewHolder inputPanel;
     private TextView titleView;
@@ -83,7 +84,7 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
         if (!TextUtils.isEmpty(userInfo.getExtra())) {
             SearchUserBean userBean = GsonUtils.fromJson(userInfo.getExtra(), SearchUserBean.class);
             //新手指导员
-            if (TextUtils.isEmpty(userBean.getIs_admin()) && TextUtils.equals(userBean.getIs_admin(), "1")) {
+            if (!TextUtils.isEmpty(userBean.getIs_admin()) && TextUtils.equals(userBean.getIs_admin(), "1")) {
                 isAdmin = true;
                 imgMore.setVisibility(View.GONE);
             } else {//非指导员
@@ -100,7 +101,7 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl
      */
     private void initView() {
         // 添加会话界面
-        conversationFragment = new ConversationFragment();
+        conversationFragment = new PDLiveConversationFragment();
         FragmentManager manager = getSupportFragmentManager();
         FragmentTransaction transaction = manager.beginTransaction();
         transaction.replace(R.id.container, conversationFragment);
diff --git a/live/src/main/java/com/yunbao/live/dialog/PDLiveMessageListAdapter.java b/live/src/main/java/com/yunbao/live/dialog/PDLiveMessageListAdapter.java
new file mode 100644
index 000000000..79e118b6c
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/dialog/PDLiveMessageListAdapter.java
@@ -0,0 +1,39 @@
+package com.yunbao.live.dialog;
+
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+
+import com.yunbao.live.R;
+
+import io.rong.imkit.conversation.MessageListAdapter;
+import io.rong.imkit.model.UiMessage;
+import io.rong.imkit.widget.adapter.IViewProviderListener;
+import io.rong.imkit.widget.adapter.ViewHolder;
+import io.rong.imlib.model.Message;
+
+/**
+ * 会话页面更改已读未读
+ */
+public class PDLiveMessageListAdapter extends MessageListAdapter {
+    public PDLiveMessageListAdapter(IViewProviderListener<UiMessage> listener) {
+        super(listener);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        super.onBindViewHolder(holder, position);
+        Message.MessageDirection messageDirection = mDataList.get(position).getMessage().getMessageDirection();
+        Message.SentStatus sentStatus = mDataList.get(position).getMessage().getSentStatus();
+        ImageView readReceipt = holder.getConvertView().findViewById(R.id.rc_read_receipt);
+        ImageView readReceiptNew = holder.getConvertView().findViewById(R.id.rc_read_receipt_new);
+        if (readReceipt.getVisibility() == View.VISIBLE) {
+            readReceipt.setVisibility(View.GONE);
+            readReceiptNew.setBackgroundResource(R.mipmap.icon_message_read);
+        } else {
+            if (messageDirection.equals(Message.MessageDirection.SEND)&&sentStatus.equals(Message.SentStatus.SENT))
+                readReceiptNew.setBackgroundResource(R.mipmap.icon_message_unread);
+        }
+    }
+}
diff --git a/live/src/main/java/com/yunbao/live/views/InputPanelViewHolder.java b/live/src/main/java/com/yunbao/live/views/InputPanelViewHolder.java
index 447fcb90c..31fb17e7a 100644
--- a/live/src/main/java/com/yunbao/live/views/InputPanelViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/InputPanelViewHolder.java
@@ -78,10 +78,22 @@ public class InputPanelViewHolder extends LinearLayout implements View.OnClickLi
         inputPanelView.findViewById(R.id.lt_photo_button).setOnClickListener(this);
         inputPanelView.findViewById(R.id.lt_choospic_button).setOnClickListener(this);
         inputPanelView.findViewById(R.id.lt_video_button).setOnClickListener(this);
-
-
+        editBtn.setOnFocusChangeListener(focusChangeListener);
     }
 
+    //输入框焦点监听事件
+    View.OnFocusChangeListener focusChangeListener = new OnFocusChangeListener() {
+        @Override
+        public void onFocusChange(View v, boolean hasFocus) {
+            if (!hasFocus) {
+                //失去焦点
+                InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.showSoftInput(editBtn, InputMethodManager.SHOW_FORCED);
+                imm.hideSoftInputFromWindow(editBtn.getWindowToken(), 0); //强制隐藏键盘
+            }
+        }
+    };
+
     @Override
     public void onClick(View v) {
         int id = v.getId();
@@ -188,7 +200,7 @@ public class InputPanelViewHolder extends LinearLayout implements View.OnClickLi
         }
 
         public void afterTextChanged(Editable s) {
-            editBtn.clearFocus();
+
         }
     };
 
diff --git a/live/src/main/java/com/yunbao/live/views/PDLiveConversationFragment.java b/live/src/main/java/com/yunbao/live/views/PDLiveConversationFragment.java
new file mode 100644
index 000000000..535041dca
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/views/PDLiveConversationFragment.java
@@ -0,0 +1,18 @@
+package com.yunbao.live.views;
+
+import com.yunbao.live.dialog.PDLiveMessageListAdapter;
+
+import io.rong.imkit.conversation.ConversationFragment;
+import io.rong.imkit.conversation.MessageListAdapter;
+
+/**
+ * 聊天详情页面
+ */
+public class PDLiveConversationFragment extends ConversationFragment {
+    @Override
+    protected MessageListAdapter onResolveAdapter() {
+        return new PDLiveMessageListAdapter(this);
+    }
+
+
+}
diff --git a/main/src/main/res/layout/rc_conversationlist_item.xml b/live/src/main/res/layout/rc_conversationlist_item.xml
similarity index 77%
rename from main/src/main/res/layout/rc_conversationlist_item.xml
rename to live/src/main/res/layout/rc_conversationlist_item.xml
index 25f1ecbe9..8a781ed44 100644
--- a/main/src/main/res/layout/rc_conversationlist_item.xml
+++ b/live/src/main/res/layout/rc_conversationlist_item.xml
@@ -11,18 +11,18 @@
 
         <RelativeLayout
             android:id="@+id/rc_conversation_portrait_rl"
-            android:layout_width="54dp"
-            android:layout_height="54dp"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginStart="@dimen/rc_margin_size_12"
+            android:layout_marginTop="@dimen/rc_margin_size_12"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
                 android:id="@+id/rc_conversation_portrait"
-                android:layout_width="54dp"
-                android:layout_height="54dp"
+                android:layout_width="@dimen/rc_conversation_portrait_size"
+                android:layout_height="@dimen/rc_conversation_portrait_size"
                 android:scaleType="centerCrop" />
 
 
@@ -35,8 +35,8 @@
 
                 <ImageView
                     android:id="@+id/rc_conversation_unread_bg"
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     app:srcCompat="@drawable/rc_unread_count_bg_normal" />
 
@@ -69,23 +69,36 @@
             app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait_rl"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/rc_conversation_content"
-            style="@style/TextStyle.Alignment"
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="60dp"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:text="你好，朋友！"
-            android:textColor="@color/rc_secondary_color"
-            android:textSize="@dimen/rc_font_text_third_size"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait_rl"
-            app:layout_constraintTop_toBottomOf="@+id/rc_conversation_title" />
+            app:layout_constraintTop_toBottomOf="@+id/rc_conversation_title">
+
+            <ImageView
+                android:id="@+id/rc_read_receipt_new"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="4dp" />
+
+            <TextView
+                android:id="@+id/rc_conversation_content"
+                style="@style/TextStyle.Alignment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:layout_marginEnd="60dp"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:text="你好，朋友！"
+                android:textColor="@color/rc_secondary_color"
+                android:textSize="@dimen/rc_font_text_third_size" />
+        </LinearLayout>
+
 
         <TextView
             android:id="@+id/rc_conversation_date"
diff --git a/live/src/main/res/layout/rc_message_item.xml b/live/src/main/res/layout/rc_message_item.xml
new file mode 100644
index 000000000..496b5e44e
--- /dev/null
+++ b/live/src/main/res/layout/rc_message_item.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rc_cl_content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/rc_margin_size_10"
+    android:paddingBottom="@dimen/rc_margin_size_10">
+
+    <TextView
+        android:id="@+id/rc_time"
+        style="@style/TextStyle.Alignment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="12dp"
+        android:textColor="@color/rc_secondary_color"
+        android:textSize="@dimen/rc_font_describe_size"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="7月29日 12:30" />
+
+    <ImageView
+        android:id="@+id/rc_selected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/rc_margin_size_8"
+        android:layout_marginTop="10dp"
+        android:src="@drawable/rc_selector_selected"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/ll_content" />
+
+    <ImageView
+        android:id="@+id/rc_left_portrait"
+        android:layout_width="@dimen/rc_message_portrait_size"
+        android:layout_height="@dimen/rc_message_portrait_size"
+        android:layout_marginStart="@dimen/rc_margin_size_4"
+        android:src="@color/rc_secondary_color"
+        app:layout_constraintStart_toEndOf="@id/rc_selected"
+        app:layout_constraintTop_toTopOf="@id/ll_content"
+        app:layout_goneMarginStart="@dimen/rc_margin_size_12" />
+
+    <ImageView
+        android:id="@+id/rc_right_portrait"
+        android:layout_width="@dimen/rc_message_portrait_size"
+        android:layout_height="@dimen/rc_message_portrait_size"
+        android:layout_marginEnd="@dimen/rc_margin_size_12"
+        android:src="@color/rc_secondary_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/ll_content"
+        app:layout_goneMarginTop="@dimen/rc_margin_size_20" />
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/rc_margin_size_8"
+        android:layout_marginEnd="@dimen/rc_margin_size_8"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toStartOf="@id/rc_right_portrait"
+        app:layout_constraintStart_toEndOf="@id/rc_left_portrait"
+        app:layout_constraintTop_toBottomOf="@id/rc_time">
+
+        <TextView
+            android:id="@+id/rc_title"
+            style="@style/TextStyle.Alignment"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="@color/rc_secondary_color"
+            android:textSize="@dimen/rc_font_text_third_size" />
+
+        <LinearLayout
+            android:id="@+id/rc_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ProgressBar
+                android:id="@+id/rc_progress"
+                style="?android:attr/progressBarStyle"
+                android:layout_width="13dp"
+                android:layout_height="13dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="11dp"
+                android:indeterminateDrawable="@drawable/rc_progress_sending_style"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/rc_warning"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="8dp"
+                android:src="@drawable/rc_ic_warning"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/rc_read_receipt"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:layout_marginEnd="4dp"
+                android:src="@drawable/rc_read_receipt"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/rc_read_receipt_new"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:layout_marginEnd="4dp" />
+
+            <TextView
+                android:id="@+id/rc_read_receipt_request"
+                style="@style/TextStyle.Alignment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:layout_marginTop="13dp"
+                android:layout_marginEnd="4dp"
+                android:drawableStart="@drawable/rc_read_receipt_request_button"
+                android:textColor="@color/rc_read_receipt_status"
+                android:textSize="12sp"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/rc_read_receipt_status"
+                style="@style/TextStyle.Alignment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="5dp"
+                android:text="@string/rc_read_receipt_status"
+                android:textColor="@color/rc_read_receipt_status"
+                android:textSize="12sp"
+                android:visibility="gone" />
+
+            <FrameLayout
+                android:id="@+id/rc_content"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <View
+        android:id="@+id/rc_v_edit"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/live/src/main/res/mipmap-xxxhdpi/icon_message_read.png b/live/src/main/res/mipmap-xxxhdpi/icon_message_read.png
new file mode 100644
index 0000000000000000000000000000000000000000..57d802c403eb2bd94bb56f0466010fb544c2de4c
GIT binary patch
literal 2248
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
WUQ%dp%2`za0000<MNUMnLSTXr&m@fi

literal 0
HcmV?d00001

diff --git a/live/src/main/res/mipmap-xxxhdpi/icon_message_unread.png b/live/src/main/res/mipmap-xxxhdpi/icon_message_unread.png
new file mode 100644
index 0000000000000000000000000000000000000000..15d73986c9192bb24cdd189aff83ff03c7d9bf4a
GIT binary patch
literal 3030
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
Y2S;}T4JtA&o&W#<07*qoM6N<$g2YR&O8@`>

literal 0
HcmV?d00001

diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
index 46f96389d..de627156a 100644
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -41,6 +41,7 @@ import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.activity.AbsActivity;
 import com.yunbao.common.adapter.ViewPagerAdapter;
+import com.yunbao.common.bean.BaseModel;
 import com.yunbao.common.bean.ChatRemarksBean;
 import com.yunbao.common.bean.ConfigBean;
 import com.yunbao.common.bean.LiveSvgGiftBean;
@@ -1032,7 +1033,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
     }
 
     //消息中心
-    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
+    @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageIMEvent(MessageIMEvent event) {
         messageNumber = event.getNumber();
         if (event.getNumber() > 0) {
@@ -1054,4 +1055,16 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
             v_table_redpoint_me.setVisibility(View.GONE);
         }
     }
+
+    /**
+     * 用户被踢下线
+     *
+     * @param model
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void userSignOut(BaseModel model) {
+//        IMLoginManager.get(mContext).logout();
+//        CommonAppConfig.getInstance().clearLoginInfo();
+//        LoginActivity.forward();
+    }
 }
diff --git a/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java b/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java
index 0a65a0ea6..11332fbf7 100644
--- a/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java
+++ b/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java
@@ -4,6 +4,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ import io.rong.imkit.utils.RouteUtils;
 import io.rong.imkit.widget.adapter.IViewProviderListener;
 import io.rong.imkit.widget.adapter.ViewHolder;
 import io.rong.imlib.model.Conversation;
+import io.rong.imlib.model.Message;
 import io.rong.imlib.model.UserInfo;
 
 /**
@@ -23,7 +25,6 @@ public class PDLiveCustomConversationProvider extends BaseConversationProvider {
     public boolean isItemViewType(BaseUiConversation item) {
         //根据业务需要，判断 item 是该模板需要处理的会话时，返回 true, 否则返回 false
         //此处以自定义私聊会话模板为例
-        Log.e("PDLiveCustomConversat","-+++++++++++++++++++++++++++++++++");
         return item.mCore.getConversationType().equals(Conversation.ConversationType.PRIVATE);
     }
 
@@ -31,20 +32,23 @@ public class PDLiveCustomConversationProvider extends BaseConversationProvider {
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         //根据业务需要，自定义处理
         Log.e("PDLiveCustomConversat","------------------------------------------"+viewType);
-//        View view = LayoutInflater.from(parent.getContext()).inflate(layout.rc_conversationlist_item, parent, false);
         return super.onCreateViewHolder(parent, viewType);
 
     }
 
     @Override
     public void bindViewHolder(ViewHolder holder, BaseUiConversation uiConversation, int position, List<BaseUiConversation> list, IViewProviderListener<BaseUiConversation> listener) {
-        for (BaseUiConversation conversation:list){
-//            UserInfo userInfo = conversation.mCore.getLatestMessage().getUserInfo();
-////            Log.e("PDLiveCustomConversat","getName****************************"+userInfo.getName());
-//            Log.e("PDLiveCustomConversat","getPortraitUri****************************"+userInfo.getPortraitUri().toString());
-        }
+
         //根据业务需要，自定义处理
-        Log.e("PDLiveCustomConversat","****************************");
         super.bindViewHolder(holder, uiConversation, position, list, listener);
+        if ( list.size()>0){
+            Message.ReceivedStatus receivedStatus = list.get(position).mCore.getReceivedStatus();
+            ImageView readReceipt = holder.itemView.findViewById(com.yunbao.live.R.id.rc_read_receipt_new);
+            if (receivedStatus.isRead()) {
+                readReceipt.setBackgroundResource(com.yunbao.live.R.mipmap.icon_message_read);
+            }else {
+                readReceipt.setBackgroundResource(com.yunbao.live.R.mipmap.icon_message_unread);
+            }
+        }
     }
 }