From 7fb4a104259068433d753418fbe579d88f7c4719 Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Tue, 27 Aug 2024 14:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E5=A2=9E=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/MainConversationListAdapter.java  | 151 +++++++++++++++--
 .../fragment/MainMessageChatListFragment.java |   8 +
 .../views/MsgChatTypeSelectPoPupView.java     | 107 ++++++++++++
 common/src/main/res/drawable/green_dot.xml    |  11 ++
 common/src/main/res/drawable/red_dot.xml      |  10 ++
 common/src/main/res/drawable/shape_white.xml  |   6 +
 .../res/layout/rc_conversation_type_item.xml  |  29 ++++
 .../res/layout/rc_conversationlist_item.xml   |   2 +-
 .../res/layout/rc_conversationlist_item2.xml  | 156 ++++++++++++++++++
 .../res/layout/view_msg_select_chat_type.xml  | 128 ++++++++++++++
 .../res/mipmap-mdpi/ic_chat_type_select.png   | Bin 0 -> 642 bytes
 .../res/mipmap-mdpi/ic_chat_type_unselect.png | Bin 0 -> 542 bytes
 .../res/mipmap-xxhdpi/ic_chat_type_select.png | Bin 0 -> 2654 bytes
 .../mipmap-xxhdpi/ic_chat_type_unselect.png   | Bin 0 -> 2179 bytes
 .../mipmap-xxxhdpi/ic_chat_type_select.png    | Bin 0 -> 2055 bytes
 .../mipmap-xxxhdpi/ic_chat_type_unselect.png  | Bin 0 -> 1713 bytes
 common/src/main/res/values-en-rUS/strings.xml |   7 +
 common/src/main/res/values-zh/strings.xml     |   8 +-
 common/src/main/res/values/strings.xml        |   8 +-
 .../main/views/MainMessageViewHolder.java     |  59 ++++++-
 .../src/main/res/layout/view_main_message.xml |  73 ++++++--
 .../main/res/mipmap-mdpi/ic_expend_down.png   | Bin 0 -> 377 bytes
 .../src/main/res/mipmap-mdpi/ic_expend_up.png | Bin 0 -> 366 bytes
 .../main/res/mipmap-xxhdpi/ic_expend_down.png | Bin 0 -> 1009 bytes
 .../main/res/mipmap-xxhdpi/ic_expend_up.png   | Bin 0 -> 950 bytes
 .../res/mipmap-xxxhdpi/ic_expend_down.png     | Bin 0 -> 455 bytes
 .../main/res/mipmap-xxxhdpi/ic_expend_up.png  | Bin 0 -> 433 bytes
 27 files changed, 721 insertions(+), 42 deletions(-)
 create mode 100644 common/src/main/java/com/yunbao/common/views/MsgChatTypeSelectPoPupView.java
 create mode 100644 common/src/main/res/drawable/green_dot.xml
 create mode 100644 common/src/main/res/drawable/red_dot.xml
 create mode 100644 common/src/main/res/drawable/shape_white.xml
 create mode 100644 common/src/main/res/layout/rc_conversation_type_item.xml
 create mode 100644 common/src/main/res/layout/rc_conversationlist_item2.xml
 create mode 100644 common/src/main/res/layout/view_msg_select_chat_type.xml
 create mode 100644 common/src/main/res/mipmap-mdpi/ic_chat_type_select.png
 create mode 100644 common/src/main/res/mipmap-mdpi/ic_chat_type_unselect.png
 create mode 100644 common/src/main/res/mipmap-xxhdpi/ic_chat_type_select.png
 create mode 100644 common/src/main/res/mipmap-xxhdpi/ic_chat_type_unselect.png
 create mode 100644 common/src/main/res/mipmap-xxxhdpi/ic_chat_type_select.png
 create mode 100644 common/src/main/res/mipmap-xxxhdpi/ic_chat_type_unselect.png
 create mode 100644 main/src/main/res/mipmap-mdpi/ic_expend_down.png
 create mode 100644 main/src/main/res/mipmap-mdpi/ic_expend_up.png
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_expend_down.png
 create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_expend_up.png
 create mode 100644 main/src/main/res/mipmap-xxxhdpi/ic_expend_down.png
 create mode 100644 main/src/main/res/mipmap-xxxhdpi/ic_expend_up.png

diff --git a/common/src/main/java/com/yunbao/common/adapter/MainConversationListAdapter.java b/common/src/main/java/com/yunbao/common/adapter/MainConversationListAdapter.java
index 50a222466..a639fd5ea 100644
--- a/common/src/main/java/com/yunbao/common/adapter/MainConversationListAdapter.java
+++ b/common/src/main/java/com/yunbao/common/adapter/MainConversationListAdapter.java
@@ -12,6 +12,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 
 import com.blankj.utilcode.util.LogUtils;
 import com.yunbao.common.R;
@@ -27,6 +28,8 @@ import com.yunbao.common.utils.ViewUtils;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
+import org.spongycastle.jcajce.provider.asymmetric.rsa.ISOSignatureSpi;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -52,18 +55,80 @@ public class MainConversationListAdapter extends ConversationListAdapter {
     public static final int TYPE_SEARCH_USER = 510;
     public static final int TYPE_SEARCH_CHAT = 520;
     private List<BaseUiConversation> srcList;
+    private List<BaseUiConversation> allDataList;
     private Context mContext;
     private boolean isChat = true;
     private OnRecyclerListRefreshListener<List<BaseUiConversation>> onRefreshListener;
     private Map<String, Integer> timerMap = new HashMap<>();
 
+
+    public static final int FILTER_OFFLINE = 0;
+    public static final int FILTER_ONLINE = 1;
+    public static final int FILTER_UNREAD = 2;
+    public static final int FILTER_READ = 4;
+    public static final int FILTER_ALL = 7;
+
+    private int mFilter = FILTER_ALL;
+
+    public int getFilter() {
+        return mFilter;
+    }
+
+    public void setFilter(int mFilter) {
+        this.mFilter = mFilter;
+        super.setDataCollection(FilterData(mFilter, allDataList));
+    }
+
+    private List<BaseUiConversation> FilterData(int filterType, List<BaseUiConversation> data){
+        List<BaseUiConversation> showData= new ArrayList<>();;
+        Log.i("MainConversationListAdapter", "FilterData: 源" + data.size());
+        switch (filterType) {
+            case FILTER_ALL:
+                showData = data;
+                break;
+            case  FILTER_ONLINE :
+                for (BaseUiConversation conversation : data) {
+                    if ("0".equals(conversation.mCore.getDraft())) {
+                        showData.add(conversation);
+                    }
+                }
+                break;
+            case FILTER_OFFLINE:
+                for (BaseUiConversation conversation : data) {
+                    if (!"0".equals(conversation.mCore.getDraft())) {
+                        showData.add(conversation);
+                    }
+                }
+                break;
+            case FILTER_READ:
+                for (BaseUiConversation conversation : data) {
+                    if (conversation.mCore.getUnreadMessageCount() <= 0) {
+                        showData.add(conversation);
+                    }
+                }
+                break;
+            case FILTER_UNREAD:
+                for (BaseUiConversation conversation : data) {
+                    if (conversation.mCore.getUnreadMessageCount() > 0) {
+                        showData.add(conversation);
+                    }
+                }
+                break;
+        }
+        Log.i("MainConversationListAdapter", "FilterData: 结果" + showData.size());
+        return showData;
+    }
+
+
+
     public MainConversationListAdapter(Context mContext) {
         this.mContext = mContext;
     }
 
     public void setSrcList(List<BaseUiConversation> srcList) {
-        this.srcList = srcList;
-        notifyDataSetChanged();
+         this.srcList = srcList;
+         super.setDataCollection(FilterData(mFilter, allDataList));
+        // notifyDataSetChanged();
     }
 
     public void setOnRefreshListener(OnRecyclerListRefreshListener<List<BaseUiConversation>> onRefreshListener) {
@@ -87,7 +152,7 @@ public class MainConversationListAdapter extends ConversationListAdapter {
             View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_main_msg_search_chat, parent, false);
             holder = ViewHolder.createViewHolder(parent.getContext(), view);
         } else if (viewType != -200) {
-            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.rc_conversationlist_item, parent, false);
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.rc_conversationlist_item2, parent, false);
             holder = ViewHolder.createViewHolder(parent.getContext(), view);
         } else {
             holder = super.onCreateViewHolder(parent, viewType);
@@ -126,13 +191,62 @@ public class MainConversationListAdapter extends ConversationListAdapter {
         } else if (getItemViewType(position) == TYPE_SEARCH_TITLE) {
             bindTitle(holder, position);
         } else if (getItemViewType(position) != -200) {
+            bindChatNew(holder, position);
             super.onBindViewHolder(holder, position);
+            return;
         }
         if (getItemViewType(position) != -200) {
             bindDefault(holder, position);
         }
     }
 
+
+    private void bindChatNew(ViewHolder holder, int position) {
+        BaseUiConversation conversation = mDataList.get(position);
+        ImgLoader.display(holder.getContext(), conversation.mCore.getPortraitUrl(), holder.getView(R.id.rc_conversation_portrait));
+        holder.setText(R.id.rc_conversation_title, conversation.mCore.getConversationTitle());
+        ((TextView) holder.getView(R.id.rc_conversation_content)).setText(ChatMsgTypeUtils.getMsg(conversation.mConversationContent.toString()));
+        if (conversation.mCore.getSentTime() != -1 && holder.getView(R.id.rc_conversation_date) != null) {
+            holder.setText(R.id.rc_conversation_date, DateFormatUtil.getDateTimeString(conversation.mCore.getSentTime(), true, holder.getContext()));
+            holder.getView(R.id.rc_conversation_date).setVisibility(View.VISIBLE);
+        } else if (holder.getView(R.id.rc_conversation_date) != null) {
+            holder.getView(R.id.rc_conversation_date).setVisibility(View.GONE);
+        }
+        holder.setVisible(R.id.rc_conversation_live_online, "0".equals(conversation.mCore.getDraft()));
+        int unReadCount = conversation.mCore.getUnreadMessageCount();
+
+        if (unReadCount > 0) {
+            holder.setVisible(R.id.rc_conversation_unread_count, true);
+            holder.setText(R.id.rc_conversation_unread_count, String.valueOf(unReadCount));
+            holder.setTextColor(R.id.rc_conversation_unread_tv, ContextCompat.getColor(holder.itemView.getContext(), R.color.red));
+            holder.setText(R.id.rc_conversation_unread_tv, WordUtil.getNewString(R.string.message_chat_msg_unread_tip));
+        } else {
+            holder.setVisible(R.id.rc_conversation_unread_count, false);
+            holder.setTextColor(R.id.rc_conversation_unread_tv, ContextCompat.getColor(holder.itemView.getContext(), R.color.rc_secondary_color));
+            holder.setText(R.id.rc_conversation_unread_tv, WordUtil.getNewString(R.string.message_chat_msg_read_tip));
+        }
+
+        if (holder.getView(R.id.rc_conversation_live_status) == null || IMLoginManager.get(holder.getContext()).getAnchorB() != 1) {
+            return;
+        }
+        Integer timer = timerMap.get(mDataList.get(position).mCore.getTargetId());
+        if (timer == null) {
+            holder.getView(R.id.rc_conversation_live_status).setVisibility(View.GONE);
+            return;
+        }
+        if (timer >= 10) {
+            holder.setText(R.id.rc_conversation_live_status,
+                    String.format(WordUtil.getNewString(R.string.message_chat_msg_look_live), timer)
+            );
+            holder.getView(R.id.rc_conversation_live_status).setVisibility(View.VISIBLE);
+        } else {
+            holder.getView(R.id.rc_conversation_live_status).setVisibility(View.GONE);
+        }
+
+
+    }
+
+
     private void bindDefault(ViewHolder holder, int position) {
         BaseUiConversation conversation = mDataList.get(position);
         Log.i("列表", "bindDefault: 用户头像:" + conversation.mCore.getPortraitUrl());
@@ -171,6 +285,7 @@ public class MainConversationListAdapter extends ConversationListAdapter {
         }
     }
 
+
     private void bindEmpty(ViewHolder holder, int position) {
         if (isChat) {
             ViewUtils.findViewById(holder.itemView, R.id.imageView, ImageView.class).setImageResource(R.mipmap.ic_message_not_chat_list);
@@ -183,12 +298,13 @@ public class MainConversationListAdapter extends ConversationListAdapter {
 
     public void onFinish() {
         if (onRefreshListener != null) {
-            Log.i("聊天数据源", "设置数据源: " + mDataList.size());
-            onRefreshListener.onFinish(mDataList);
+            Log.i("聊天数据源", "设置数据源: " + allDataList.size());
+            onRefreshListener.onFinish(allDataList);
         }
     }
 
     private int listHashCode = 0;
+
     @Override
     public synchronized void setDataCollection(List<BaseUiConversation> data) {
         if (data.hashCode() == listHashCode) return;
@@ -236,8 +352,9 @@ public class MainConversationListAdapter extends ConversationListAdapter {
             }
             tmp.add(item);
         }
-        // ToastUtil.showDebug("消息数:"+data.size());
-        super.setDataCollection(tmp);
+        allDataList= tmp;
+        List<BaseUiConversation> showData= FilterData(mFilter,tmp);
+        super.setDataCollection(showData);
     }
 
     private List<String> tmpUids = new ArrayList<>();
@@ -349,15 +466,15 @@ public class MainConversationListAdapter extends ConversationListAdapter {
                 BaseUiConversation conversation = mDataList.get(id);
                 conversation.mCore.setSentTime(bean.getSentTime());
                 conversation.mCore.setUnreadMessageCount(integer);
-                if(bean.getContent() instanceof SightMessage){
-                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[小視頻]":"[Video]");
-                }else if(bean.getContent() instanceof HQVoiceMessage){
-                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[語音]":"[Voice]");
-                } else if(bean.getContent() instanceof ImageMessage){
-                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[圖片]":"[picture]");
-                }else if(bean.getContent() instanceof MessageChatCardContent){
-                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh()?"[站內分享]":"[In-app sharing]");
-                } else{
+                if (bean.getContent() instanceof SightMessage) {
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh() ? "[小視頻]" : "[Video]");
+                } else if (bean.getContent() instanceof HQVoiceMessage) {
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh() ? "[語音]" : "[Voice]");
+                } else if (bean.getContent() instanceof ImageMessage) {
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh() ? "[圖片]" : "[picture]");
+                } else if (bean.getContent() instanceof MessageChatCardContent) {
+                    conversation.mConversationContent = new SpannableString(WordUtil.isNewZh() ? "[站內分享]" : "[In-app sharing]");
+                } else {
                     conversation.mConversationContent = new SpannableString(((TextMessage) bean.getContent()).getContent());
                 }
                 mDataList.set(id, conversation);
@@ -375,4 +492,6 @@ public class MainConversationListAdapter extends ConversationListAdapter {
         });
 
     }
+
+
 }
diff --git a/common/src/main/java/com/yunbao/common/fragment/MainMessageChatListFragment.java b/common/src/main/java/com/yunbao/common/fragment/MainMessageChatListFragment.java
index e479828d2..966eca9b0 100644
--- a/common/src/main/java/com/yunbao/common/fragment/MainMessageChatListFragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/MainMessageChatListFragment.java
@@ -165,6 +165,14 @@ public class MainMessageChatListFragment extends AbsMainMessageChatListFragment
 
     }
 
+    public int getFilter() {
+        return mAdapter.getFilter();
+    }
+
+    public void setFilter(int mFilter) {
+        mAdapter.setFilter(mFilter);
+    }
+
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
diff --git a/common/src/main/java/com/yunbao/common/views/MsgChatTypeSelectPoPupView.java b/common/src/main/java/com/yunbao/common/views/MsgChatTypeSelectPoPupView.java
new file mode 100644
index 000000000..183bc5b84
--- /dev/null
+++ b/common/src/main/java/com/yunbao/common/views/MsgChatTypeSelectPoPupView.java
@@ -0,0 +1,107 @@
+package com.yunbao.common.views;
+
+import static io.rong.imlib.publicservice.model.PublicServiceMenu.PublicServiceMenuItemType.View;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+
+import com.lxj.xpopup.core.AttachPopupView;
+import com.yunbao.common.R;
+import com.yunbao.common.adapter.MainConversationListAdapter;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+import org.repackage.com.zui.opendeviceidlibrary.OpenDeviceId;
+
+public class MsgChatTypeSelectPoPupView extends AttachPopupView implements android.view.View.OnClickListener {
+
+    private TextView chatTypeTv1, chatTypeTv2, chatTypeTv3, chatTypeTv4, chatTypeTv5;
+    private ImageView chatTypeImg1, chatTypeImg2, chatTypeImg3, chatTypeImg4, chatTypeImg5;
+
+    private ResultCallBack mResultCallBack;
+    private int lastType;
+    public MsgChatTypeSelectPoPupView(@NonNull Context context,int type, ResultCallBack itemDelListener) {
+        super(context);
+        mResultCallBack = itemDelListener;
+        lastType = type;
+    }
+
+    @Override
+    protected int getImplLayoutId() {
+        return R.layout.view_msg_select_chat_type;
+    }
+
+    @Override
+    protected void onCreate() {
+        chatTypeTv1 =findViewById(R.id.chatTypeTv1);
+        chatTypeImg1 =findViewById(R.id.chatTypeImg1);
+        chatTypeTv2 =findViewById(R.id.chatTypeTv2);
+        chatTypeImg2 =findViewById(R.id.chatTypeImg2);
+        chatTypeTv3 =findViewById(R.id.chatTypeTv3);
+        chatTypeImg3 =findViewById(R.id.chatTypeImg3);
+        chatTypeTv4 =findViewById(R.id.chatTypeTv4);
+        chatTypeImg4 =findViewById(R.id.chatTypeImg4);
+        chatTypeTv5 =findViewById(R.id.chatTypeTv5);
+        chatTypeImg5 =findViewById(R.id.chatTypeImg5);
+
+        chatTypeImg1.setOnClickListener(this);
+        chatTypeImg2.setOnClickListener(this);
+        chatTypeImg3.setOnClickListener(this);
+        chatTypeImg4.setOnClickListener(this);
+        chatTypeImg5.setOnClickListener(this);
+
+        handleChatTypeClick(lastType);
+    }
+
+
+
+    private void handleChatTypeClick(int type) {
+        switch (type) {
+            case MainConversationListAdapter.FILTER_ALL:
+                chatTypeImg1.setImageResource(R.mipmap.ic_chat_type_select);
+                chatTypeTv1.setTextColor(ContextCompat.getColor(chatTypeTv1.getContext(),R.color.colorMainTab));
+                break;
+            case MainConversationListAdapter.FILTER_ONLINE:
+                chatTypeImg2.setImageResource(R.mipmap.ic_chat_type_select);
+                chatTypeTv2.setTextColor(ContextCompat.getColor(chatTypeTv2.getContext(),R.color.colorMainTab));
+                break;
+            case MainConversationListAdapter.FILTER_OFFLINE:
+                chatTypeImg3.setImageResource(R.mipmap.ic_chat_type_select);
+                chatTypeTv3.setTextColor(ContextCompat.getColor(chatTypeTv3.getContext(),R.color.colorMainTab));
+                break;
+            case MainConversationListAdapter.FILTER_READ:
+                chatTypeImg4.setImageResource(R.mipmap.ic_chat_type_select);
+                chatTypeTv4.setTextColor(ContextCompat.getColor(chatTypeTv4.getContext(),R.color.colorMainTab));
+                break;
+            case MainConversationListAdapter.FILTER_UNREAD:
+                chatTypeImg5.setImageResource(R.mipmap.ic_chat_type_select);
+                chatTypeTv5.setTextColor(ContextCompat.getColor(chatTypeTv5.getContext(),R.color.colorMainTab));
+                break;
+        }
+    }
+
+    @Override
+    public void onClick(android.view.View v) {
+        if (v.getId()==R.id.chatTypeImg1){
+            mResultCallBack.callBack(MainConversationListAdapter.FILTER_ALL);
+        }else if (v.getId()==R.id.chatTypeImg2){
+            mResultCallBack.callBack(MainConversationListAdapter.FILTER_ONLINE);
+        }else if (v.getId()==R.id.chatTypeImg3){
+            mResultCallBack.callBack(MainConversationListAdapter.FILTER_OFFLINE);
+        }else if (v.getId()==R.id.chatTypeImg4){
+            mResultCallBack.callBack(MainConversationListAdapter.FILTER_READ);
+        }else if (v.getId()==R.id.chatTypeImg5){
+            mResultCallBack.callBack(MainConversationListAdapter.FILTER_UNREAD);
+        }
+        dismiss();
+    }
+
+
+    public interface ResultCallBack {
+        void callBack(int i);
+    }
+}
diff --git a/common/src/main/res/drawable/green_dot.xml b/common/src/main/res/drawable/green_dot.xml
new file mode 100644
index 000000000..46fab62ef
--- /dev/null
+++ b/common/src/main/res/drawable/green_dot.xml
@@ -0,0 +1,11 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"> <!-- 设置形状为圆形 -->
+
+    <solid android:color="#6DFF7C" /> <!-- 设置填充颜色 -->
+
+    <!-- 可以添加额外的属性如边框等 -->
+    <!-- <stroke
+        android:width="2dp"
+        android:color="#000000" /> -->
+
+</shape>
diff --git a/common/src/main/res/drawable/red_dot.xml b/common/src/main/res/drawable/red_dot.xml
new file mode 100644
index 000000000..39d9237fe
--- /dev/null
+++ b/common/src/main/res/drawable/red_dot.xml
@@ -0,0 +1,10 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval"> <!-- 设置形状为圆形 -->
+
+    <solid android:color="#ffff4874" /> <!-- 设置填充颜色 -->
+
+    <stroke
+        android:width="2dp"
+         android:color="#30ff4874" /> <!-- 设置边框颜色为黑色并带有 70% 的不透明度 (BB 是 alpha 值) -->
+
+</shape>
diff --git a/common/src/main/res/drawable/shape_white.xml b/common/src/main/res/drawable/shape_white.xml
new file mode 100644
index 000000000..a9043c57d
--- /dev/null
+++ b/common/src/main/res/drawable/shape_white.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="20dp"/>
+    <solid android:color="@color/white"/>
+
+</shape>
\ No newline at end of file
diff --git a/common/src/main/res/layout/rc_conversation_type_item.xml b/common/src/main/res/layout/rc_conversation_type_item.xml
new file mode 100644
index 000000000..5b7fe7538
--- /dev/null
+++ b/common/src/main/res/layout/rc_conversation_type_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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_conversation_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/chatTypeTv"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:layout_weight="1"
+        android:textColor="@color/colorMainTab"
+        tools:text="全部聊天" />
+
+    <ImageView
+        android:id="@+id/chatTypeImg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="20dp"
+        android:src="@mipmap/ic_chat_type_select" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/common/src/main/res/layout/rc_conversationlist_item.xml b/common/src/main/res/layout/rc_conversationlist_item.xml
index 30703b211..da3a74afc 100644
--- a/common/src/main/res/layout/rc_conversationlist_item.xml
+++ b/common/src/main/res/layout/rc_conversationlist_item.xml
@@ -14,7 +14,6 @@
             android:id="@+id/rc_conversation_portrait_rl"
             android:layout_width="48dp"
             android:layout_height="48dp"
-
             android:layout_marginTop="@dimen/rc_margin_size_12"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -180,6 +179,7 @@
             android:layout_marginBottom="@dimen/rc_margin_size_12"
             android:src="@drawable/rc_read_receipt"
             android:visibility="gone"
+            tools:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/rc_conversation_no_disturb"
             app:layout_goneMarginRight="@dimen/rc_margin_size_12" />
diff --git a/common/src/main/res/layout/rc_conversationlist_item2.xml b/common/src/main/res/layout/rc_conversationlist_item2.xml
new file mode 100644
index 000000000..188c1721b
--- /dev/null
+++ b/common/src/main/res/layout/rc_conversationlist_item2.xml
@@ -0,0 +1,156 @@
+<?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_conversation_item"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/rc_conversation_item_height">
+
+    <com.yunbao.common.views.weight.ClipPathCircleImage
+        android:id="@+id/rc_conversation_portrait"
+        android:layout_width="54dp"
+        android:layout_height="54dp"
+        android:layout_marginTop="12dp"
+        android:scaleType="centerCrop"
+        android:src="@mipmap/beauty_jingbai"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/rc_conversation_live_online"
+        android:layout_width="12dp"
+        android:layout_height="12dp"
+        android:layout_marginTop="1dp"
+        android:layout_marginEnd="1dp"
+        android:layout_centerInParent="true"
+        android:src="@drawable/green_dot"
+        app:layout_constraintEnd_toEndOf="@+id/rc_conversation_portrait"
+        app:layout_constraintTop_toTopOf="@+id/rc_conversation_portrait" />
+
+
+    <TextView
+        android:id="@+id/rc_conversation_title"
+        style="@style/TextStyle.Alignment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="4dp"
+        android:ellipsize="end"
+        android:maxWidth="120dp"
+        android:maxLines="1"
+        android:textColor="@color/rc_text_main_color"
+        android:textSize="13dp"
+        app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait"
+        app:layout_constraintTop_toTopOf="@+id/rc_conversation_portrait"
+        tools:text="张三11111111111111111111111" />
+
+    <TextView
+        android:id="@+id/rc_conversation_live_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_main_message_chat_list_live_timer"
+        android:paddingStart="5dp"
+        android:paddingTop="2dp"
+        android:paddingEnd="3dp"
+        android:paddingBottom="3dp"
+        android:singleLine="true"
+        android:textColor="#EC70FD"
+        android:layout_marginStart="12dp"
+        android:textSize="10sp"
+        app:layout_constraintTop_toTopOf="@+id/rc_conversation_title"
+        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_title"
+        app:layout_constraintStart_toEndOf="@+id/rc_conversation_title"
+        android:visibility="gone"
+        tools:text="看直播10min"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/rc_conversation_date"
+        style="@style/TextStyle.Alignment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="3 月 22 日"
+        android:layout_marginEnd="12dp"
+        app:layout_constraintTop_toTopOf="@+id/rc_conversation_title"
+        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:textColor="@color/rc_auxiliary_color"
+        android:textSize="@dimen/rc_font_nav_or_date_size"
+
+        />
+
+
+    <TextView
+        android:id="@+id/rc_conversation_unread_tv"
+        android:layout_width="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_portrait"
+        app:layout_constraintStart_toStartOf="@+id/rc_conversation_title"
+        android:ellipsize="end"
+        android:maxLines="1"
+        tools:text="[已读]"
+        android:textColor="@color/rc_secondary_color"
+        android:textSize="13dp" />
+
+
+    <TextView
+        android:id="@+id/rc_conversation_content"
+        style="@style/TextStyle.Alignment"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingStart="6dp"
+        android:paddingEnd="6dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/rc_secondary_color"
+        android:textSize="13dp"
+        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_unread_tv"
+        app:layout_constraintEnd_toStartOf="@+id/rc_conversation_read_receipt"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/rc_conversation_unread_tv"
+        app:layout_constraintTop_toTopOf="@+id/rc_conversation_unread_tv"
+        tools:text="你好，朋友！111111111111111111111" />
+
+    <TextView
+        android:id="@+id/rc_conversation_unread_count"
+        app:layout_constraintTop_toTopOf="@+id/rc_conversation_unread_tv"
+        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_unread_tv"
+        app:layout_constraintEnd_toEndOf="@+id/rc_conversation_date"
+        style="@style/TextStyle.Alignment"
+        app:layout_constraintDimensionRatio="1"
+        android:layout_width="18dp"
+        android:gravity="center"
+        android:layout_height="18dp"
+        android:background="@drawable/red_dot"
+        android:text="15"
+        android:textColor="@color/rc_white_color"
+        android:textSize="10sp" />
+
+    <ImageView
+        android:id="@+id/rc_conversation_no_disturb"
+        android:layout_width="wrap_content"
+        android:layout_marginEnd="@dimen/rc_margin_size_2"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="@+id/rc_conversation_unread_count"
+        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_unread_count"
+        app:layout_constraintEnd_toStartOf="@+id/rc_conversation_unread_count"
+        android:src="@drawable/rc_no_disturb"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/rc_conversation_read_receipt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/rc_margin_size_2"
+        android:src="@drawable/rc_read_receipt"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_no_disturb"
+        app:layout_constraintEnd_toStartOf="@+id/rc_conversation_no_disturb"
+        app:layout_constraintTop_toTopOf="@+id/rc_conversation_no_disturb"
+        app:layout_constraintVertical_bias="1.0"
+        tools:visibility="visible" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/common/src/main/res/layout/view_msg_select_chat_type.xml b/common/src/main/res/layout/view_msg_select_chat_type.xml
new file mode 100644
index 000000000..2ae32ab29
--- /dev/null
+++ b/common/src/main/res/layout/view_msg_select_chat_type.xml
@@ -0,0 +1,128 @@
+<?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:layout_width="350dp"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_white">
+
+    <TextView
+        android:id="@+id/chatTypeTv1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_weight="1"
+        android:textColor="#777777"
+        tools:textColor="@color/colorMainTab"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:text="@string/all_chats" />
+
+    <ImageView
+        android:id="@+id/chatTypeImg1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="20dp"
+        android:src="@mipmap/ic_chat_type_unselect"
+        tools:src="@mipmap/ic_chat_type_select"
+        app:layout_constraintBottom_toBottomOf="@+id/chatTypeTv1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/chatTypeTv1" />
+
+
+    <TextView
+        android:id="@+id/chatTypeTv2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_weight="1"
+        android:textColor="#777777"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/chatTypeTv1"
+        android:text="@string/online_only" />
+
+    <ImageView
+        android:id="@+id/chatTypeImg2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@mipmap/ic_chat_type_unselect"
+        app:layout_constraintBottom_toBottomOf="@+id/chatTypeTv2"
+        app:layout_constraintEnd_toEndOf="@+id/chatTypeImg1"
+        app:layout_constraintTop_toTopOf="@+id/chatTypeTv2" />
+
+
+    <TextView
+        android:id="@+id/chatTypeTv3"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_weight="1"
+        android:textColor="#777777"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/chatTypeTv2"
+        android:text="@string/offline_only" />
+
+    <ImageView
+        android:id="@+id/chatTypeImg3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@mipmap/ic_chat_type_unselect"
+        app:layout_constraintBottom_toBottomOf="@+id/chatTypeTv3"
+        app:layout_constraintEnd_toEndOf="@+id/chatTypeImg1"
+        app:layout_constraintTop_toTopOf="@+id/chatTypeTv3" />
+
+
+    <TextView
+        android:id="@+id/chatTypeTv4"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_weight="1"
+        android:textColor="#777777"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/chatTypeTv3"
+        android:text="@string/read_only" />
+
+    <ImageView
+        android:id="@+id/chatTypeImg4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@mipmap/ic_chat_type_unselect"
+        app:layout_constraintBottom_toBottomOf="@+id/chatTypeTv4"
+        app:layout_constraintEnd_toEndOf="@+id/chatTypeImg1"
+        app:layout_constraintTop_toTopOf="@+id/chatTypeTv4" />
+
+
+    <TextView
+        android:id="@+id/chatTypeTv5"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp"
+        android:layout_weight="1"
+        android:textColor="#777777"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/chatTypeTv4"
+        android:text="@string/unread_only" />
+
+    <ImageView
+        android:id="@+id/chatTypeImg5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@mipmap/ic_chat_type_unselect"
+        app:layout_constraintBottom_toBottomOf="@+id/chatTypeTv5"
+        app:layout_constraintEnd_toEndOf="@+id/chatTypeImg1"
+        app:layout_constraintTop_toTopOf="@+id/chatTypeTv5" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/common/src/main/res/mipmap-mdpi/ic_chat_type_select.png b/common/src/main/res/mipmap-mdpi/ic_chat_type_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f5330bc3f344f1907cfcdfb74ff714b275adaa4
GIT binary patch
literal 642
zcmV-|0)737P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%JV``BR5(wKlU+ztVHkj)_e|SQTOmbYkP#JuSA`Hne^Tit3b~-Wf(RP@3hvCV
zz0Mt_q+)gx)LqaFEImrJey#$cix9*jGAf87NZp*ay>)i1L~QlleSgpQe((Fd!jhp4
z9oz8~&!8LtHkP)9H$aAhaa~5bUM#*Mzb0DW>BIZ&3K-3xmoXUN)6@jHuR?Xr7Aj}~
zIR`q7F?U`Dd-E<E(54Gs)N7;qfqX6|nQPNaBP*S&KO4mBOM$E>A8L|J=d23|n>RoM
z*xknkirQ$lBD90-L{x!M3eqhj$+Ut&*t`ugEp{>{dMLgFkI|1(E5pedjU>8&#Bvb;
zNf}CZxRC_LDN3_w#7v>Q7Tda{4T&fo?*8SnyIj<$3|svgHZLM<b^znd6P1V7m`2Q}
zAbZLJRG)}#?bm~5Efw4o4V!bkn+(d>ojHw|SrC7D0JCBz{aP2RWNm211$>@bDWiS!
z8cyU8d}RS>PKK<2)*fBKhMH*yFoD5g8MMYUY(7S0-#-A)WXRfE`a&gX(MB_cEF{q>
zpCRe8fI{JjjP#`cB+*gV(EH@G+Z=)ZyNtfTOA6AuAX2;!B#3PtD~Z(59>rtCfjU$K
z^f^jTseC1o;<rGuVq2$Nz^-;bt387#?@?loP|K>k`(%h<RSKvk|D{PXH(ixo&rkU9
zuIUA71ii|42KYGn3V)TdF0_>*EeLI>J|MrU&FO>R&9wNnlG+t=`e*yrqijM%QQji@
cXt{R&0q&go7V2N4V*mgE07*qoM6N<$f<wz8#Q*>R

literal 0
HcmV?d00001

diff --git a/common/src/main/res/mipmap-mdpi/ic_chat_type_unselect.png b/common/src/main/res/mipmap-mdpi/ic_chat_type_unselect.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f04b106f2cb4c44537e7ee50def9c9d6586f2f8
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$*hxe|R5(walfR1-K^(>3H=v$z14)rW8<A5aTb=)bSP140)MmHQKnjx+<x1<V
z?NoxS5>jZ99Rez7j<bn>f`w#}Q^djxq}dd^`Ee$BGT~N_a3`0WZst4h!@S`=!Q4_x
ztpK<W;2O#Ed*dG@KP3{0=ayxC-Y=1O(`vPry4~(m0IL9=h{*dO2(~+&j+mx-k>nbH
z2LL{%QmKdee14?0GeEQ1JQarF7RenEDOr{k&c96WE0v0o&1PKy=b|XOQ7jgRGl1uL
zFGVETZny6`jx#+-9G^LklgQ<AuK|R%ZI`6cXk3|0CT~Zhky$7dqW_8GnNrFi`Bg+#
zrCzVQBJ$m~?Z-zE$9Fu>dn6*u;(4AX-L@>Ny$C=lWs-cS0lU8M8;;}bE&^~}_e46K
zj%I*fuXm<gF8^Kxpp-gEG8CoMHh`PQwD3j)T$0E7M3T!IutM^Kh+IA_K=ao20`&#J
ztvE<802sdS-#JQ<Ow)WtvTxh=y%|6$bsE4XfM3Jmuyk0Us?}=BFbr+^>|ikX7iA5p
z)oM%0Wbzq+>pJ$jOaQ(GLBLEVb4f(jNN$j9_WS(}-Gjen+V4?EdpsVmi^x>~7es^r
geom*;)<Jdt1CAQ&DRIBC-2eap07*qoM6N<$f|OYHQvd(}

literal 0
HcmV?d00001

diff --git a/common/src/main/res/mipmap-xxhdpi/ic_chat_type_select.png b/common/src/main/res/mipmap-xxhdpi/ic_chat_type_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..b203b64264415894288a7226b9c5e3044516ba63
GIT binary patch
literal 2654
zcmV-k3ZeChP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px<7)eAyRA@upT6=I*)fxYN=iYq)31X49;`rzk+sa_I!jwmfMia6d9!?oxI&Cej
z(5bDqG|BGbgRv}Cv2HdA+G-t3TU)g=EmS%ZlHKr_paQ{4EtLVabc(jnKhT09$Yyu%
z`N}!>?wW9Sm&7Fe(KC~OviF?x{m%KGzwZ!+IJhP}27YfD(y1wc2mqK2U=o0d0Lq=^
zPXRav!dsBk1<)QCd<Y+$?xD^ndWIqbebmW3FFXa7Tm+&Du$T?g>xZ-emH-%F?!Ppt
ztq2eTAOpzu_5#=ga1zr09CbYOua6?jpaF2j%5s#;#{tX-=wc<4Ei3^_NKyi-KP66X
z`5Yhyq;x>4pD8!@xCTPvUTTm1doVx-41lM8$Ae4CSHLjh>VWN&*3w%5PJ;0^h<Ad;
zE=bx#TVu!i3c~YNUW07rGLV=H&;kG#0~iM)Lmz-J0GaIt#0sRw{FXYSseu3)5CEPN
zseq6Vz%XytYNAe9se+Z+4#q|>Z=sInL8$-->L-DWxd19bv{0|9ZpSczY-TSk4%4=#
zm(K^{yZ|^5z8!?01LV`Xtv9mvgXnwkl<lX@(GSkINvYqt@>_n4`S_<`Sx<wEFZQ|F
zG?>0d$;LmHnqLwC2gAz&{K8Rir7mXx5u-#bIuxOc&E-HS1fmB4^6SG=Lx^S67W;Lv
zIYj|*ZDbk9_$6f4Ha02u0ivFgjW3Oa@VPa)I`k!&XatEF+BR&5P!vQ#033)c0`W$@
zsO>4<MCMEdZGZf|krX};B2fP^kg*#?pLN_ZgRz{Fao0__0BD0Xcn1J)Uij3jQ>e2u
zTUwXv#=$El17Z#gnh)mB!}NOfoJ?;wNW1~aT@dtp^m-1{_J>Oz23J;^@J~C?2ShKj
zTz#%#_XEI{Q9pb=ogkWS3oE<8avmjH{##sc>n;V%Z-ZzFOwYC22(_=*zSf?W3t~zg
zbda;&0q9u(zoPcWe-vH2>aOuHM<qct)&7Qe;COeC_C1x!&FK#y7`_9B=Sf)l_Y|@`
zr<5z>n$Qm*=zf4EI2#N?!*mQe1|jaDw%9Yp52$`N$VdVhrDKJ1ugO@G3jkN&eFe<y
zTY&J{sv|>`h&LBnn4?jFuG4Xto_b`{gAlsFr>0l={T7rTiO_}(Dk!=J2UkWxSgmhY
zfq0+C(yo}wukx`T91L#&iN&_Z$-Y8~CP$6>ug6Q47&vw1CJ1AJ4r;?ObQHEWV@BDR
zDH>HF-VGuU`YVKSovlgoSxUsekq2O(zI+wn2^xT)$+RVQsPJh-nju8}unC{rM1znm
zlxS=yyl;3W40AUu?MqHTST|8y%j?<(xHfz@7(a2m&htpU`*rGk+LeoNZDc77&u@mT
zHpOmDsZ%=rL+Xe>cJ3#<AUYbEQ!fCb%CWa7CE{y{EAK3We{?H|ZUXDXtbq~*7O0JU
z8q6;`dH!%HPLVa}I5=}1CD;AO1tJjoE{J}n6F^`qEM7=FH}XkHJ_5i8;63F+3%NE9
zhSvggZ{9VI7z7<Se?-an11<nH4VOcR*8q$MC<U+QD&oM(o8j^7fXZZn!<2|$?V4D1
z?|699uK{%Vh{>H_SOYkK-t27ZTzAra3*mhrx&hjIov9`cgzkgsdB_Pq1&xU3hNlBY
z*RUIINn1!&P)GA_7l2@>8D!MkS#h?JI2e8bLM+h#uw*qQV%rN&5}taU*j<RBYJyBQ
zN*(bv?i+|Kf?;gbF@a^90`P{;H-rhmD(F5r5ZVio%hfLc0(F=y_faA~%>`i2%8Brr
zM<Fvh$y5NkHG5!sL9J_xWT&C`A;ef$p*~_*v>0hhG%Cm98a)3#c3k->1;Ea@OdqKA
zp~3(@oG@Y{yB02Wpz~L;<8<(U0pR>96b$zQ<Q@4K;M{}G$GDr4@rwqcLXHu8fOPh<
zbLkMZ00+Z=28n5Q!F>USHe!B-5{<5eQqwaq4r-66jW`f$g<;GClpD1c7h(aprXdQC
zceRs9jXVP75oM-@5>2kejsx}8FnwEf+=A7rY#;_<Mr^;zg#%el!z_6HyGAUDJNHOb
zW(sQtwZ-=q4P=U!%4Sv(2OFwjj@qV$WBv;z<4*bZ;Z&}y8wa2H5{RZ;5IZ2egS6*{
zLUl6-!++Q0vFQUcXKo?B^}bIaojC%qUng@?exVS{#)0ttAo}sh15o^`TubdutK3mo
zvw2;1GKXFWx{5SCPP_?1%+cvIi|<o1_N04q-K8LNKLDrx9Whfl2BI5_WW*}~G&_81
zCsH3QunU@C!)m~A*fzNxp7L7@QHEU8umWEHqa$VuD#Mh$OR25NRpe{N#NYEf&7*3<
z3-?fa{1F?#-1=)Fjh&h?Hav>7okfZGo`OC&5N?5C)D3%PstlKT9ks{m3+}7jr{seU
zm4Ezf4Lwz<dOmgFVE7r3xJ^%%az7>G*B4w!GZH<28s4H_Gt-+<{`SJ6%tURt3uM@F
zL0bKbdVLG3ad8p4wSTqw$Tiefn8el0ME8|(c)WE(Rwt!4R(c)U%R+>rj6?`R^(9o=
zCR3pF)ztn|-3aMVY$<lwFyoGToB>my6q(Dl4NJk|VSpwM&O7BhH^(9IV4)&Dcl!?2
zxeb8dR`2v3lxTV?_j`W;stYq=YyzNL^asrQko5#g@tCZOeQP;Dw?UYf>oaln$(;6+
z?vDu|lRj{^8TbdlyPlG3UB!D|cun$(Er6I||4()yRep2d?v0z=)$}$g#12EpZz5GT
zg*v09$z4@9`!bUt`72;i0m#q6;~T5@&8E`;{SDG;)oemq9xPPv_O&_P(wZ>#^*-co
z8d<I?N$%#6*EB4H5bL#y<>+;`W|bm&hcha0W#|(4>E%ActL$_Mbu`(Of1lyLfm}yG
zb!UXRKHuPAbRjDv1L<201q=rwvjN!xA*R~?Ua221qc(SMz-7eeZtS#})J^0%l8UWc
zRgCl<is0Jh0+BT!jsP^ub_&c8w7i(`=LMh_tqCoLpy%=hjpq2}UI=kJPLKZQK-;0k
zz-h{`xBGe!J)z0leESwD2)eUWe{4ViGzewb2I4Ti({)XtyosHDKM!Ch*lMF>%i+P?
z04tVFHOmDpg5jykH^A+F@eX9MdLZh0-ZpFAuyrod{mrx8`A0#9PXn+GTs4kQ0(=7C
z&0uPSnLSEd*7akzS<xYaXM$t}m~H~$O5Nzz?+%=1p7xXo<K2^w_3grxI+y_i$OEZf
zaRm%-GYB{8%ryU8K$(ft0M9);==apX>F(P%XSbU4Tz$tUz}$)+<E~ueVxYG<XaN0y
zc)VW)qZYsnm_DC=b&wOV&|?qXD^noVV~=zS#4kefE*Nr?;`#?FbV)Zl*hMrwKYC0V
zEbAJ8W`amX&Cj@=+c1uvjn;=j@{oSm;q@OtD&0dJ@zaCdv+wu+0}&5%*-7@;MgRZ+
M07*qoM6N<$f?^`#DgXcg

literal 0
HcmV?d00001

diff --git a/common/src/main/res/mipmap-xxhdpi/ic_chat_type_unselect.png b/common/src/main/res/mipmap-xxhdpi/ic_chat_type_unselect.png
new file mode 100644
index 0000000000000000000000000000000000000000..09da112064092e6a303dd18dd3ace261d601822b
GIT binary patch
literal 2179
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
FV1kng6(Rrt

literal 0
HcmV?d00001

diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_chat_type_select.png b/common/src/main/res/mipmap-xxxhdpi/ic_chat_type_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..f03e755b2a7f3c4a07996b6626af04bfaf1dce2d
GIT binary patch
literal 2055
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

literal 0
HcmV?d00001

diff --git a/common/src/main/res/mipmap-xxxhdpi/ic_chat_type_unselect.png b/common/src/main/res/mipmap-xxxhdpi/ic_chat_type_unselect.png
new file mode 100644
index 0000000000000000000000000000000000000000..e68a3dd8f238cb75d6d2a6c6d98efe81580352ff
GIT binary patch
literal 1713
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
Hu0mjfC(SKn

literal 0
HcmV?d00001

diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml
index 51b015de3..2c7e16aff 100644
--- a/common/src/main/res/values-en-rUS/strings.xml
+++ b/common/src/main/res/values-en-rUS/strings.xml
@@ -1474,4 +1474,11 @@ Limited ride And limited avatar frame</string>
     <string name="activity_msg_list_include">Include:</string>
     <string name="message_chat_msg_look_live">看直播%dmin</string>
     <string name="activity_msg_list_title_chat_records">Chat Records</string>
+    <string name="message_chat_msg_read_tip">[Read]</string>
+    <string name="message_chat_msg_unread_tip">[Unread]</string>
+    <string name="all_chats">All Chats</string>
+    <string name="online_only">Show Online Only</string>
+    <string name="offline_only">Show Offline Only</string>
+    <string name="read_only">Show Read Only</string>
+    <string name="unread_only">Show Unread Only</string>
 </resources>
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index c98de881c..ebbb31de6 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1604,5 +1604,11 @@
     <string name="live_end_view_ban_reason">違規原因:</string>
     <string name="live_end_view_ban_content">處罰內容:</string>
     <string name="live_end_view_ban_timer">處罰時間:</string>
-
+    <string name="message_chat_msg_read_tip">[已讀]</string>
+    <string name="message_chat_msg_unread_tip">[未讀]</string>
+    <string name="all_chats">全部聊天</string>
+    <string name="online_only">僅展示在線</string>
+    <string name="offline_only">僅展示離線</string>
+    <string name="read_only">僅展示已讀</string>
+    <string name="unread_only">僅展示未讀</string>
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index e59cb38c7..3c55e3931 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1412,5 +1412,11 @@ Limited ride And limited avatar frame</string>
     <string name="dialog_gift_wall_text_personal_hal">Personal hal</string>
     <string name="dialog_gift_wall_text_site_hal">Whole site hal</string>
     <string name="dialog_gift_wall_text_honors">Honors</string>
-
+    <string name="message_chat_msg_read_tip">[Read]</string>
+    <string name="message_chat_msg_unread_tip">[Unread]</string>
+    <string name="all_chats">All Chats</string>
+    <string name="online_only">Show Online Only</string>
+    <string name="offline_only">Show Offline Only</string>
+    <string name="read_only">Show Read Only</string>
+    <string name="unread_only">Show Unread Only</string>
 </resources>
diff --git a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java
index 220d8341a..1327fe7c7 100644
--- a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java
@@ -73,6 +73,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.ViewPageIndicatorUtils;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.AbsMainViewHolder;
+import com.yunbao.common.views.MsgChatTypeSelectPoPupView;
 import com.yunbao.common.views.MsgRecommendPopupView;
 import com.yunbao.common.views.MsgSysDelPopupView;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -134,12 +135,14 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
 
     private ConstraintLayout tabLayout1, tabLayout2, tabLayout3;
     private TextView tab1, tab2, tab3;
+    private ImageView imageView1, imageView2, imageView3;
     private View tab_line1, tab_line2, tab_line3;
     private ImageView tab_icon;
 
     private List<ConstraintLayout> relativeLayouts = new ArrayList<>();
     private List<TextView> tabTexts = new ArrayList<>();
     private List<View> tabLine = new ArrayList<>();
+    private List<ImageView> tabExpend = new ArrayList<>();
     private LinearLayout tabLayouts;
 
     private int userType = 0; // (0)普通用户  (1)主播A  (2)主播B
@@ -201,6 +204,20 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
         tab2 = findViewById(R.id.tab2);
         tab3 = findViewById(R.id.tab3);
 
+        imageView1 = findViewById(R.id.expendImg1);
+        imageView2 = findViewById(R.id.expendImg2);
+        imageView3 = findViewById(R.id.expendImg3);
+
+        imageView1.setOnClickListener(view -> {
+            selectChatType(view, 0);
+        });
+        imageView2.setOnClickListener(view -> {
+            selectChatType(view, 1);
+        });
+        imageView3.setOnClickListener(view -> {
+            selectChatType(view, 2);
+        });
+
         tab_line1 = findViewById(R.id.tab_line1);
         tab_line2 = findViewById(R.id.tab_line2);
         tab_line3 = findViewById(R.id.tab_line3);
@@ -224,6 +241,25 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
         });
     }
 
+    private void selectChatType(View view, int position) {
+        AbsMainMessageChatListFragment fragment = fragmentList.get(position);
+        if (!(fragment instanceof MainMessageChatListFragment) || !(view instanceof ImageView)) {
+            return;
+        }
+        MainMessageChatListFragment chatFragment = (MainMessageChatListFragment) fragment;
+        ImageView expendImg = (ImageView) view;
+        expendImg.setImageResource(R.mipmap.ic_expend_down);
+        XPopup.Builder builder = new XPopup.Builder(mContext).atView(relativeLayouts.get(position));
+        builder.asCustom(new MsgChatTypeSelectPoPupView(mContext, chatFragment.getFilter(), new MsgChatTypeSelectPoPupView.ResultCallBack() {
+            @Override
+            public void callBack(int i) {
+                chatFragment.setFilter(i);
+                expendImg.setImageResource(R.mipmap.ic_expend_up);
+            }
+        })).show();
+    }
+
+
     private void initFragment() {
         final String[] titles;
         fragmentList = new ArrayList<>();
@@ -264,9 +300,9 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
                 return fragmentList.get(i);
             }
         });
-        if(userType==1){
+        if (userType == 1) {
             viewPager.setCurrentItem(1);
-        }else{
+        } else {
             viewPager.setCurrentItem(0);
         }
         viewPager.setUserInputEnabled(false);
@@ -340,7 +376,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
             @Override
             public void onPageSelected(int position) {
                 super.onPageSelected(position);
-                if(!StringUtil.isEmpty(search.getText().toString())) {
+                if (!StringUtil.isEmpty(search.getText().toString())) {
                     search.setText("");
                 }
                 selectTab(position);
@@ -369,6 +405,12 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
         });
     }
 
+
+    private void showChatTypeSelect() {
+
+    }
+
+
     private void initTabView() {
         relativeLayouts = new ArrayList<>();
         tabTexts = new ArrayList<>();
@@ -382,6 +424,10 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
         tabTexts.add(tab2);
         tabTexts.add(tab3);
 
+        tabExpend.add(imageView1);
+        tabExpend.add(imageView2);
+        tabExpend.add(imageView3);
+
         tabLine.add(tab_line1);
         tabLine.add(tab_line2);
         tabLine.add(tab_line3);
@@ -390,6 +436,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
             tabTexts.get(0).setText(WordUtil.getNewString(R.string.message_chat_msg_all_an_a));
             ViewGroup.LayoutParams params = tabLayouts.getLayoutParams();
             params.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+            tabExpend.get(0).setVisibility(View.VISIBLE);
             tabLayouts.setLayoutParams(params);
         } else if (userType == 1) {//主播A
             tab_icon.setVisibility(View.VISIBLE);
@@ -410,7 +457,9 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
             tabTexts.get(0).setText(WordUtil.getNewString(R.string.message_chat_msg_recommend));
             relativeLayouts.get(1).setVisibility(View.VISIBLE);
             tabTexts.get(1).setText(WordUtil.getNewString(R.string.message_chat_msg_all_an_a));
+            tabExpend.get(1).setVisibility(View.VISIBLE);
         } else { //主播B
+            tabExpend.get(0).setVisibility(View.VISIBLE);
             relativeLayouts.get(0).setVisibility(View.VISIBLE);
             tabTexts.get(0).setText(WordUtil.getNewString(R.string.message_chat_msg_all));
             relativeLayouts.get(1).setVisibility(View.VISIBLE);
@@ -428,9 +477,9 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
                 }
             });
         }
-        if(userType==1){
+        if (userType == 1) {
             selectTab(1);
-        }else{
+        } else {
             selectTab(0);
         }
     }
diff --git a/main/src/main/res/layout/view_main_message.xml b/main/src/main/res/layout/view_main_message.xml
index 47097b605..ac0ba6b34 100644
--- a/main/src/main/res/layout/view_main_message.xml
+++ b/main/src/main/res/layout/view_main_message.xml
@@ -312,12 +312,12 @@
         android:paddingEnd="20dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:visibility="gone"
-            tools:visibility="visible"
             android:id="@+id/tabLayout1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <ImageView
                 android:id="@+id/tab_icon"
@@ -363,26 +363,39 @@
                     android:id="@+id/tab_line1"
                     android:layout_width="0dp"
                     android:layout_height="3dp"
-                    android:layout_marginStart="3dp"
-                    android:layout_marginEnd="3dp"
-                    android:layout_marginTop="3dp"
                     android:layout_below="@+id/tab_top1"
                     android:layout_centerHorizontal="true"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="3dp"
                     android:background="@drawable/bg_main_com_type"
                     app:layout_constraintEnd_toEndOf="@+id/tab1"
                     app:layout_constraintStart_toStartOf="@+id/tab1"
                     app:layout_constraintTop_toBottomOf="@+id/tab1" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <ImageView
+                android:id="@+id/expendImg1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="5dp"
+                android:visibility="gone"
+                tools:visibility="visible"
+                android:src="@mipmap/ic_expend_up"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/tab_top1"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:visibility="gone"
-            tools:visibility="visible"
             android:id="@+id/tabLayout2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/tab_top2"
@@ -414,27 +427,38 @@
                 <View
                     android:id="@+id/tab_line2"
                     android:layout_width="0dp"
-                    android:layout_marginTop="3dp"
-                    android:layout_marginStart="3dp"
-                    android:layout_marginEnd="3dp"
                     android:layout_height="3dp"
                     android:layout_below="@+id/tab_top2"
                     android:layout_centerHorizontal="true"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="3dp"
                     android:background="@drawable/bg_main_com_type"
                     app:layout_constraintEnd_toEndOf="@+id/tab2"
                     app:layout_constraintStart_toStartOf="@+id/tab2"
                     app:layout_constraintTop_toBottomOf="@+id/tab2" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
+            <ImageView
+                android:id="@+id/expendImg2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="5dp"
+                android:visibility="gone"
+                tools:visibility="visible"
+                android:src="@mipmap/ic_expend_up"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/tab_top2"
+                app:layout_constraintBottom_toBottomOf="parent"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:visibility="gone"
-            tools:visibility="visible"
             android:id="@+id/tabLayout3"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/tab_top3"
@@ -466,18 +490,31 @@
                 <View
                     android:id="@+id/tab_line3"
                     android:layout_width="0dp"
-                    android:layout_marginStart="3dp"
-                    android:layout_marginEnd="3dp"
                     android:layout_height="3dp"
-                    android:layout_marginTop="3dp"
                     android:layout_below="@+id/tab_top3"
                     android:layout_centerHorizontal="true"
+                    android:layout_marginStart="3dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginEnd="3dp"
                     android:background="@drawable/bg_main_com_type"
                     app:layout_constraintEnd_toEndOf="@+id/tab3"
                     app:layout_constraintStart_toStartOf="@+id/tab3"
                     app:layout_constraintTop_toBottomOf="@+id/tab3" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <ImageView
+                android:id="@+id/expendImg3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="5dp"
+                android:visibility="gone"
+                tools:visibility="visible"
+                android:layout_centerHorizontal="true"
+                android:src="@mipmap/ic_expend_up"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/tab_top3"
+                app:layout_constraintBottom_toBottomOf="parent"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
 
diff --git a/main/src/main/res/mipmap-mdpi/ic_expend_down.png b/main/src/main/res/mipmap-mdpi/ic_expend_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdb75c255aede3aecf47dc39930c1b1f04049f70
GIT binary patch
literal 377
zcmV-<0fzpGP)<h;3K|Lk000e1NJLTq000gE000OG1^@s6$q~-X00001b5ch_0Itp)
z=>Px$Gf6~2R47x0(7j6oK@bJ-nb}=?!Nx`uKMITF_LeIw>=Z>oZ1hjC6-zrUB3Q)F
zQbDY&Z3HbWtxUoh6G&+x*onvyFgvqyLPSOJmBah-V9;7Sj)=?5e3Yi?Bm5I<?F11`
zp|y6)7_-jI_w9Cjy4h?#{biFRNtpSPh<edEHy|SCTI)ze8X_`ZtJNNU;wXv|rPKug
z^ohtB=7mC`Fl3B5C89}YzG3E-G))^_9LMnt0Gtp}e+c0i09HR>o;Z$20N_w-J?p){
z27t9{wR-2ATLgezrPQGJeh(2hDwWF1C(N;PZa9RnqqSaO=Bp6GEdVSTV@5lj&SsWn
z<yNcpns>j!?lL0o6VaTAyb)0kGncX~+wP)YVSX$Yi(^Wu10tGX=Cb#`RIk^czdr08
XLdt}e{UV|;00000NkvXXu0mjf^p~J3

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-mdpi/ic_expend_up.png b/main/src/main/res/mipmap-mdpi/ic_expend_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..983c252517081cdb84b709488ee1f19f0aae9ac4
GIT binary patch
literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq000gE000OG1^@s6$q~-X00001b5ch_0Itp)
z=>Px$C`m*?R47wzkUvYqP!z@QdBkWP(jj*1kf9%-ea#2xSacOf7Y7GXP(jp1TvP-t
zC<qQNj^Ze&Ted9W<qLGk2QZK<{=ssuJkU@}?|9DnT{s6c<$ArIQ<mkbwd(cyeH2Bb
z$rvVuAPDAs-``eBomh{V5A!@9WLfq(p8W?lo6TCI(b#ev=Zu-(Y)~n+z|8xu>t4li
z{P71@V5`-d^*rwYz!4GU%)IjpUJ{WH;J7G?)8TOVW%UZwTAu^hC8Bo`Su@5w*nrl0
z1;8B<&5Ou|F=np<wbs`F)<wh-k)<?EpU3;O+wDcA)DwUafZHTVHW7y5Ktwi(XhuZ(
z#+cV>OKYwB0PMqWBDz7h+qEOqn0Yx((-$I=X`rpu>2&%^sYhGq2fKD^wpkych5!Hn
M07*qoM6N<$f@e0O`Tzg`

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxhdpi/ic_expend_down.png b/main/src/main/res/mipmap-xxhdpi/ic_expend_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b70c60e5fb6f07bde97c842d2804fb85d9a4544
GIT binary patch
literal 1009
zcmV<N0}lL&P)<h;3K|Lk000e1NJLTq001ih000>X1^@s6sPETi00001b5ch_0Itp)
z=>Px&t4TybR9HvVmQiRNRTPH*b9Z(v!H5Vx`B*6uUovx7m#|V+BZe(u5g)856^kP1
zgT;cPs1Owd1;M9+5UjSerTDNS^u;0#ibf$fyP4Hc5R|rxZKEJ;%qDYZ=9meyVRo}K
zvzvq#=XLHq=ey_s?>|HMA3YRh&FAw^GxJ>lE-9r>-|Takrdbg}>;tf@wLZBCo6qOJ
zWacsv8O*Gi`TI(x^3c@Olz%gzrIc?0cn!c%*#D;uSj(~w6440&xh}A(*7}fb+yCB3
zVAC|8H4J0g_dDmb0UMlxh~8o54kjT4eBVE{Zi~Z8DSab=Ez5evFpLj8&)d?j4f`B3
zf4mMXx>pbpnE8TIY8*i4X?B@jO8F*$w*hS72wH7=R!aE;fI>q5YA%<1YIb(Ewabhf
z<t)oOEQI)^Tir;nYn!m8QpspGo9BcOk92z_*brLcQvlEJwk4#LM>3hrN4=yEVSm$F
zk9R~@p-{NZb=}X1=+Ry$3@!1MQfgwirfXT&8$|SOROM)GX8xOq9#BeM?0^jxl}e>O
z%gf8(GIKu362rs8PtMHDtnLKbvaDx>5Xa-BXXX|W?Nv(s+2Pq})6f#<iKx`8P-uy1
z055LW5>m<+GMUV=IO&=Bvex>+Mx*g-n{CTv+b;r3c%F9>KqbKv=af>DgHBgU`TBaM
zzZbWUng8-Uue7kR@N;xcENqy+!Pn!PAc_-!zG$^t2NxF?oqnMEklt}!cdu>Rzi)}r
zv<6bjED>D*P>i!gkkKnED=(!12VbUaHandl{U2KE{ZZ-ro@~?-uIrv6qR9jgSCvwa
z#U0+VtXGNX{RHWk06aWDKX1paNwh)NrMtD+Y|f-v0>I<lmoAW=h>j<Ky3Blctya5~
zq;%h~p@#!Yd<WpZgb5#OwOTK?En%AGp=>sLA|ddvI*wC}lYU?uL^p&faR$JF1P`B`
zo11&WG|i(zhz}DcdfoT^iF&<WPrEy@Ih(dI1pYeZ!*K<`odEX4)bkw2+1JlRQ*$;A
zcw}TGH#9W#BY@F_pO2npf*jRa7X|^{_GH@x#bR-Ib#?V~BAVzIn3=D;u3NTkdp>O-
z1Ltg7!O_vt+YQ4wpJIuPGR*AzzJE`>UjHSnZm;(Pr9oVSa=CoV($bOwaBsp-$v;|a
zIjHnIN`pAyz!Ga~YgGW_J%F$IzCT&3)#kP{(H&o~UQNfw#_rHsSDAT#<bBg|ockM%
f#>Jh027CVl-a_3T)B7A|00000NkvXXu0mjfSjgw-

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxhdpi/ic_expend_up.png b/main/src/main/res/mipmap-xxhdpi/ic_expend_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..d75a1b232125e5b2294d2ffa6fb896ecbd772c09
GIT binary patch
literal 950
zcmV;n14;aeP)<h;3K|Lk000e1NJLTq001fg000>X1^@s6M=iWq00001b5ch_0Itp)
z=>Px&a7jc#R9HvVmrsZkM-;~2d(}MyCP9J+2?_>Wg~+heU0r)n4=#$V=*5G2QoI;J
z0uez-@GfX_i5>*egZSqV6~u!I8cjU7vopQhT?>*xR79enpac_9VY~aq3bQi1cJ<E8
zj)HZqs#m|R@74ESBYY$Sd&$|~-(PWEcQrGY(=@#}K0f|uuj2O%R7x2j;xz#H91($;
zpE-^*RIk^^dI8%LP~Z2fLI};wQ<w}e5qXV9V|=!-vj+7%Z%_zv2>|9;U|tf@`Y;S{
z&IWc?pq}S>LWti0VD1bM&xvR-3`5;5Y}cSt%CCs%_vv!mKuj7qj<alJWaN)-V7mhK
zJa2^%;wk`q(&3>mh-fGb!{HA1LC2s?3o>%g>-4bZ`e%qZI669dyOaGLfl4X+5b;jY
z0nEI{aU4j~^m@TME|p44Yqi?lc46BF^?hFnA#O19XO`d-S(fdH<M^bR4}xGj02~7V
zH*Y;6{zF7-8jZ$iJFsnmnumjkzXHJgyr4t`Ns?@i<M@2*d=LbiiRf&WWw|Vf_&Ce5
z)ln49_`qfa^?iSl5aJ#)3)`2cX}UpceK~JlDYYH|F4^1x5tCA>)Hggl{GjM&3qeiA
zAtGbcHlIw=G~K1OK3;T)l=5ptJOTiYW!-Zj#HykSW(BQQt4m$iz0S-FZE~k+x-E*L
z)9vJ#QfeC_o-9a%hs~VLZDevmtJUfP$8qifK-uyTOipgpT3>7ja&k=&1RD|YLO~k5
zc3roxR;xXl9`_y4=EJ#Vx*!XLk$bn++DO^)P)dEn%s&;R!QZayuAE-Mrhrx|mBr<9
z`4<5A(kA!B#KcamwXvP9hf-=MA|5SBgZs?9c5H0SsQUkS3tFjE=9kN5W5Ayl$h}2t
zeXeW5mW@)%EkcN&3t;~hLM*A*>rdW-HY?6ZL0L?hd2bX&MzWp_rPLl~{t*Cd*7uZ|
zmq$@_7lR=90sxE!EwRa+B+2eLjt}>Yuq99s1m6<TA=}LYfGOFl4CpyT+?4kcO>34U
z$yTlPnfC!X8FOG@U@HKe%7bnG)?7uU6kF`V$h|L$q95KTWQ%ou_ogq{Z%Kn!=0^Vl
zfGMWltli(oaeVMYK(@jX(Se+seTY)ZbwqTf^;WYi+dkO^eMnGqmg%|>@x&xgQ~II*
Y0NQ+07yERHH~;_u07*qoM6N<$f<RQbu>b%7

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_expend_down.png b/main/src/main/res/mipmap-xxxhdpi/ic_expend_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..3432b8e1b1848634e21a172b7da5d9ce80add403
GIT binary patch
literal 455
zcmV;&0XY7NP)<h;3K|Lk000e1NJLTq0021v001Ef1^@s6W1RzY00001b5ch_0Itp)
z=>Px$fk{L`R9Hvl*xhY|Fc1LX3tk{2bOcL?_ofqcl}ywT+6_7Y5A_JyAbCgFsUsQ%
zu<_p=Tou3YfF<t3KX>*Ho}lfXzz8Fxl=4Lg@c{r50QSGnufFe(N~zO-_!++V@5rIU
z&wzV0U8<@&v~8<6L#32b2=VQT|BkHd`V#=&JrLH=1>lYIh%|wbVhIfar^vHosHbjL
z&=}wpY3K86#JXbvjRlU73mcEiy(u&WXpFgxQb^M@Qfuwnq1ZrEfm-XstQg=7%>gQ<
zl(XXD2+akK*5q_Pa)Oos7m@ZQ2WTlUh};^A0gOU!1;qkJBiDvv0+WzyL9v0!NNOkr
zFbhcqr2=Lnv7wZ}A|w`+8d!`hg{}caLFPict^?1V%<RNtk4yG6VT<jE^X{w*+LdH#
z2{=SzZv+=xDG+TW|DsHUhJ1hlL`P;!T`v?1NP@(GVgkvKB~WZ2DKZC20VGGJK&gPM
xAY-7$n6uXUEjJH_wrR9H8Tybfy-)*fTvrC403BmaK_mbG002ovPDHLkV1m^9ybAyT

literal 0
HcmV?d00001

diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_expend_up.png b/main/src/main/res/mipmap-xxxhdpi/ic_expend_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7ebb6707f0fca33e2aea69360361ee3e733a1be
GIT binary patch
literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq001}u001Ef1^@s6j9+L?00001b5ch_0Itp)
z=>Px$Ye_^wR9Hvd*vnDFFc1ddl{LOo0wsvp1ppOL3k^|1sDKpU11f<IOaszp<cXOC
z9P70!i|Fcu{rT5ucO~G)m$-2s6agxw?xmD(0H6Ti4gmJXm{+a!7xxcl2P&nMl=5(b
zoqNWnX`Y8+(40tC;0kUwu_M`l0k|Sa7GMO99Z3#Mz_B7pff+b9BpHwZ$ATmQ65_~_
z*}xbaB7O@oz0wtX-y$g?S-@DFwf3oPTd>wH75*h~HZmEQg40@0T}$8h4~Y0tBFQ9R
z4sMRA6fzn}fh&oO0#f2iA%lS&xDv=9ASaF+=>?X+aUxfNC2?HHtH3RA9LPoBmN;tU
zA7BkQO5_EwCL9&=2UsJH0yzO|#^oZ#=~DJHq_cPPoEv%OslYeTQ9qAu(2X%W(RJM(
z0A73_vo$U;$%6ypf59anM+Y3&wr4HL{SF~;yP^ZS>x0Lo6l=vrB>8^zkf|N#Ln7j6
bt=$~~rg`j6OjPy300000NkvXXu0mjf7=5o5

literal 0
HcmV?d00001