From 80655a866251310a54009e3cb51ef62c91423ba8 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Sat, 8 Oct 2022 10:01:58 +0800
Subject: [PATCH] =?UTF-8?q?@=E6=B6=88=E6=81=AF=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/bean/OlineModel.java    |  65 +++++
 .../common/bean/OlineUserlistModel.java       | 270 ++++++++++++++++++
 common/src/main/res/values-en/strings.xml     |   2 +-
 common/src/main/res/values/strings.xml        |   5 +
 live/src/main/AndroidManifest.xml             |   9 +-
 .../yunbao/live/activity/LiveActivity.java    |   1 +
 .../yunbao/live/adapter/LiveChatAdapter.java  |   4 +-
 .../yunbao/live/adapter/OlineListAdapter.java |  73 +++++
 .../live/adapter/OlineListItemAdapter.java    |  46 +++
 .../live/dialog/LiveInputDialogFragment.java  |  42 +--
 .../yunbao/live/socket/SocketLinkMicUtil.java |  28 --
 .../live/views/OlineAudienceViewHolder.java   |  41 +++
 .../yunbao/live/views/OlineListActivity.java  |  86 ++++++
 .../live/views/OlineListItemViewHolder.java   |  33 +++
 .../live/views/OlineNobleViewHolder.java      |  41 +++
 .../main/res/drawable/bg_search_input_2.xml   |   5 +
 .../main/res/layout/acticity_oline_list.xml   |  44 +++
 .../res/layout/dialog_live_chat_input.xml     |  21 +-
 live/src/main/res/layout/view_live_room.xml   |  74 ++---
 .../main/res/layout/view_oline_audience.xml   |  24 ++
 live/src/main/res/layout/view_oline_item.xml  |  28 ++
 .../main/res/mipmap-xxxhdpi/icon_emphasis.png | Bin 0 -> 4313 bytes
 ...view_anchor_search_results_item_holder.xml |   2 +-
 23 files changed, 848 insertions(+), 96 deletions(-)
 create mode 100644 common/src/main/java/com/yunbao/common/bean/OlineModel.java
 create mode 100644 common/src/main/java/com/yunbao/common/bean/OlineUserlistModel.java
 create mode 100644 live/src/main/java/com/yunbao/live/adapter/OlineListAdapter.java
 create mode 100644 live/src/main/java/com/yunbao/live/adapter/OlineListItemAdapter.java
 create mode 100644 live/src/main/java/com/yunbao/live/views/OlineAudienceViewHolder.java
 create mode 100644 live/src/main/java/com/yunbao/live/views/OlineListActivity.java
 create mode 100644 live/src/main/java/com/yunbao/live/views/OlineListItemViewHolder.java
 create mode 100644 live/src/main/java/com/yunbao/live/views/OlineNobleViewHolder.java
 create mode 100644 live/src/main/res/drawable/bg_search_input_2.xml
 create mode 100644 live/src/main/res/layout/acticity_oline_list.xml
 create mode 100644 live/src/main/res/layout/view_oline_audience.xml
 create mode 100644 live/src/main/res/layout/view_oline_item.xml
 create mode 100644 live/src/main/res/mipmap-xxxhdpi/icon_emphasis.png

diff --git a/common/src/main/java/com/yunbao/common/bean/OlineModel.java b/common/src/main/java/com/yunbao/common/bean/OlineModel.java
new file mode 100644
index 000000000..139b3ce0e
--- /dev/null
+++ b/common/src/main/java/com/yunbao/common/bean/OlineModel.java
@@ -0,0 +1,65 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class OlineModel extends BaseModel {
+
+    @SerializedName("userlist")
+    private List<OlineUserlistModel> userlist = new ArrayList<>();
+    @SerializedName("nums")
+    private String nums;
+    @SerializedName("medal_num")
+    private String medalNum;
+    @SerializedName("votestotal")
+    private String votestotal;
+    @SerializedName("medalRankNum")
+    private String medalRankNum;
+
+    public List<OlineUserlistModel> getUserlist() {
+        return userlist;
+    }
+
+    public OlineModel setUserlist(List<OlineUserlistModel> userlist) {
+        this.userlist = userlist;
+        return this;
+    }
+
+    public String getNums() {
+        return nums;
+    }
+
+    public OlineModel setNums(String nums) {
+        this.nums = nums;
+        return this;
+    }
+
+    public String getMedalNum() {
+        return medalNum;
+    }
+
+    public OlineModel setMedalNum(String medalNum) {
+        this.medalNum = medalNum;
+        return this;
+    }
+
+    public String getVotestotal() {
+        return votestotal;
+    }
+
+    public OlineModel setVotestotal(String votestotal) {
+        this.votestotal = votestotal;
+        return this;
+    }
+
+    public String getMedalRankNum() {
+        return medalRankNum;
+    }
+
+    public OlineModel setMedalRankNum(String medalRankNum) {
+        this.medalRankNum = medalRankNum;
+        return this;
+    }
+}
diff --git a/common/src/main/java/com/yunbao/common/bean/OlineUserlistModel.java b/common/src/main/java/com/yunbao/common/bean/OlineUserlistModel.java
new file mode 100644
index 000000000..87f126f40
--- /dev/null
+++ b/common/src/main/java/com/yunbao/common/bean/OlineUserlistModel.java
@@ -0,0 +1,270 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+public class OlineUserlistModel extends BaseModel {
+    @SerializedName("id")
+    private String id;
+    @SerializedName("user_nicename")
+    private String userNicename;
+    @SerializedName("avatar")
+    private String avatar;
+    @SerializedName("sex")
+    private String sex;
+    @SerializedName("noble_id")
+    private String nobleId;
+    @SerializedName("goodnum")
+    private String goodnum;
+    @SerializedName("is_guess")
+    private String isGuess;
+    @SerializedName("langue")
+    private String langue;
+    @SerializedName("goodnum_expire_time")
+    private String goodnumExpireTime;
+    @SerializedName("avatar2")
+    private String avatar2;
+    @SerializedName("version")
+    private String version;
+    @SerializedName("front_task")
+    private String frontTask;
+    @SerializedName("max_noble_end_time")
+    private String maxNobleEndTime;
+    @SerializedName("custom_color_id")
+    private String customColorId;
+    @SerializedName("is_chat")
+    private String isChat;
+    @SerializedName("level")
+    private String level;
+    @SerializedName("level_anchor")
+    private String levelAnchor;
+    @SerializedName("vip")
+    private VipModel vip;
+    @SerializedName("liang")
+    private LiangModel liang;
+    @SerializedName("medal_level")
+    private String medalLevel;
+    @SerializedName("medal_name")
+    private String medalName;
+    @SerializedName("contribution")
+    private String contribution;
+    @SerializedName("guard_type")
+    private String guardType;
+    @SerializedName("dress")
+    private DressModel dress;
+
+    public String getId() {
+        return id;
+    }
+
+    public OlineUserlistModel setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getUserNicename() {
+        return userNicename;
+    }
+
+    public OlineUserlistModel setUserNicename(String userNicename) {
+        this.userNicename = userNicename;
+        return this;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public OlineUserlistModel setAvatar(String avatar) {
+        this.avatar = avatar;
+        return this;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public OlineUserlistModel setSex(String sex) {
+        this.sex = sex;
+        return this;
+    }
+
+    public String getNobleId() {
+        return nobleId;
+    }
+
+    public OlineUserlistModel setNobleId(String nobleId) {
+        this.nobleId = nobleId;
+        return this;
+    }
+
+    public String getGoodnum() {
+        return goodnum;
+    }
+
+    public OlineUserlistModel setGoodnum(String goodnum) {
+        this.goodnum = goodnum;
+        return this;
+    }
+
+    public String getIsGuess() {
+        return isGuess;
+    }
+
+    public OlineUserlistModel setIsGuess(String isGuess) {
+        this.isGuess = isGuess;
+        return this;
+    }
+
+    public String getLangue() {
+        return langue;
+    }
+
+    public OlineUserlistModel setLangue(String langue) {
+        this.langue = langue;
+        return this;
+    }
+
+    public String getGoodnumExpireTime() {
+        return goodnumExpireTime;
+    }
+
+    public OlineUserlistModel setGoodnumExpireTime(String goodnumExpireTime) {
+        this.goodnumExpireTime = goodnumExpireTime;
+        return this;
+    }
+
+    public String getAvatar2() {
+        return avatar2;
+    }
+
+    public OlineUserlistModel setAvatar2(String avatar2) {
+        this.avatar2 = avatar2;
+        return this;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public OlineUserlistModel setVersion(String version) {
+        this.version = version;
+        return this;
+    }
+
+    public String getFrontTask() {
+        return frontTask;
+    }
+
+    public OlineUserlistModel setFrontTask(String frontTask) {
+        this.frontTask = frontTask;
+        return this;
+    }
+
+    public String getMaxNobleEndTime() {
+        return maxNobleEndTime;
+    }
+
+    public OlineUserlistModel setMaxNobleEndTime(String maxNobleEndTime) {
+        this.maxNobleEndTime = maxNobleEndTime;
+        return this;
+    }
+
+    public String getCustomColorId() {
+        return customColorId;
+    }
+
+    public OlineUserlistModel setCustomColorId(String customColorId) {
+        this.customColorId = customColorId;
+        return this;
+    }
+
+    public String getIsChat() {
+        return isChat;
+    }
+
+    public OlineUserlistModel setIsChat(String isChat) {
+        this.isChat = isChat;
+        return this;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public OlineUserlistModel setLevel(String level) {
+        this.level = level;
+        return this;
+    }
+
+    public String getLevelAnchor() {
+        return levelAnchor;
+    }
+
+    public OlineUserlistModel setLevelAnchor(String levelAnchor) {
+        this.levelAnchor = levelAnchor;
+        return this;
+    }
+
+    public VipModel getVip() {
+        return vip;
+    }
+
+    public OlineUserlistModel setVip(VipModel vip) {
+        this.vip = vip;
+        return this;
+    }
+
+    public LiangModel getLiang() {
+        return liang;
+    }
+
+    public OlineUserlistModel setLiang(LiangModel liang) {
+        this.liang = liang;
+        return this;
+    }
+
+    public String getMedalLevel() {
+        return medalLevel;
+    }
+
+    public OlineUserlistModel setMedalLevel(String medalLevel) {
+        this.medalLevel = medalLevel;
+        return this;
+    }
+
+    public String getMedalName() {
+        return medalName;
+    }
+
+    public OlineUserlistModel setMedalName(String medalName) {
+        this.medalName = medalName;
+        return this;
+    }
+
+    public String getContribution() {
+        return contribution;
+    }
+
+    public OlineUserlistModel setContribution(String contribution) {
+        this.contribution = contribution;
+        return this;
+    }
+
+    public String getGuardType() {
+        return guardType;
+    }
+
+    public OlineUserlistModel setGuardType(String guardType) {
+        this.guardType = guardType;
+        return this;
+    }
+
+    public DressModel getDress() {
+        return dress;
+    }
+
+    public OlineUserlistModel setDress(DressModel dress) {
+        this.dress = dress;
+        return this;
+    }
+}
diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml
index 7e5371430..dd4ce8222 100644
--- a/common/src/main/res/values-en/strings.xml
+++ b/common/src/main/res/values-en/strings.xml
@@ -859,7 +859,7 @@ Limited ride And limited avatar frame</string>
     <string name="you_may_also_like">you may also like</string>
     <string name="anchor">anchor</string>
     <string name="anchor_more">More</string>
-    <string name="wonderful_live">Wonderful live</string>
+    <string name="wonderful_live">Live</string>
     <string name="recommended_for_you">More</string>
     <string name="fun_games">Fun Games</string>
     <string name="value_added_benefits">Value-added benefits</string>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 676a36515..8c0e2a226 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -914,6 +914,11 @@
     <string name="login_invalid">登錄失效，請重新登錄</string>
     <string name="slide_settings">滑動設置</string>
     <string name="up_slide_settings">上下滑動切換直播間</string>
+    <string name="live_say_something_a">\@用户昵称\t\t你好啊～</string>
+    <string name="oline_list">在线列表</string>
+    <string name="search_want">搜索想要@的人</string>
+    <string name="online_audience">在線觀眾</string>
+    <string name="audience">觀眾</string>
 
 
 </resources>
diff --git a/live/src/main/AndroidManifest.xml b/live/src/main/AndroidManifest.xml
index 6740a04d5..e04abfdfa 100644
--- a/live/src/main/AndroidManifest.xml
+++ b/live/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
         android:allowBackup="true"
 
         android:theme="@style/AppTheme">
-        <activity android:name=".activity.LiveTRTCAnchorActivity"/>
+        <activity android:name=".activity.LiveTRTCAnchorActivity" />
         <activity
             android:name=".activity.LiveAnchorActivity"
             android:screenOrientation="portrait"
@@ -85,14 +85,17 @@
             android:name=".activity.PDLiveConversationActivity"
             android:hardwareAccelerated="true"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustResize"/>
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
         <activity
             android:name=".activity.PDLIiveChatActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/DialogActivity"/>
+            android:theme="@style/DialogActivity" />
         <activity
             android:name=".activity.EditNameRemarksActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".views.OlineListActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java
index c01cf2387..1ec757e10 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java
@@ -855,6 +855,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
         bundle.putString(Constants.LIVE_DANMU_PRICE, mDanmuPrice);
         bundle.putString(Constants.COIN_NAME, mCoinName);
         bundle.putString(Constants.LIVE_UID, mLiveUid);
+        bundle.putString(Constants.LIVE_STREAM, mStream);
         bundle.putString(Constants.LIVE_UID, mLiveUid);
         fragment.setArguments(bundle);
         fragment.show(getSupportFragmentManager(), "LiveInputDialogFragment");
diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
index 799363de0..336a4bb4d 100644
--- a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
+++ b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
@@ -289,7 +289,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
             } else if (bean.getType() == LiveChatBean.SYSTEM) {
                 boolean isContains = false;
                 for (LiveChatBean model : mList) {
-                    if (!TextUtils.isEmpty(model.getContent()) && model.getContent().contains("堅決維護青少年群體精神文明健康")) {
+                    if (!TextUtils.isEmpty(model.getContent()) && (model.getContent().contains("堅決維護青少年群體精神文明健康")||model.getContent().contains("click to register if you like. pdlive conducts"))) {
                         isContains = true;
                     }
                 }
@@ -408,7 +408,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
 
     public void scrollToBottom() {
         if (mList.size() > 0) {
-            mRecyclerView.smoothScrollToPosition(mList.size() - 1);
+            mRecyclerView.smoothScrollToPosition(getItemCount());
         }
     }
 
diff --git a/live/src/main/java/com/yunbao/live/adapter/OlineListAdapter.java b/live/src/main/java/com/yunbao/live/adapter/OlineListAdapter.java
new file mode 100644
index 000000000..d67df15b1
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/adapter/OlineListAdapter.java
@@ -0,0 +1,73 @@
+package com.yunbao.live.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.bean.OlineUserlistModel;
+import com.yunbao.live.R;
+import com.yunbao.live.views.OlineAudienceViewHolder;
+import com.yunbao.live.views.OlineNobleViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class OlineListAdapter extends RecyclerView.Adapter {
+
+    private int nobleType = 0;
+
+    private int audienceType = 1;
+
+    private List<Map<Integer, List<OlineUserlistModel>>> mapList = new ArrayList<>();
+
+    private Context mContext;
+
+    public OlineListAdapter(Context mContext) {
+        this.mContext = mContext;
+    }
+
+    public void addAll(List<Map<Integer, List<OlineUserlistModel>>> models) {
+        mapList.addAll(models);
+        notifyDataSetChanged();
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        if (viewType == nobleType) {
+            return new OlineNobleViewHolder(LayoutInflater.from(mContext).inflate(R.layout.view_oline_audience, parent, false));
+        } else {
+            return new OlineAudienceViewHolder(LayoutInflater.from(mContext).inflate(R.layout.view_oline_audience, parent, false));
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        if (holder instanceof OlineNobleViewHolder) {
+            OlineNobleViewHolder nobleViewHolder = (OlineNobleViewHolder) holder;
+            nobleViewHolder.setData(mapList.get(position).get(nobleType));
+        } else {
+            OlineAudienceViewHolder audienceViewHolder = (OlineAudienceViewHolder) holder;
+            audienceViewHolder.setData(mapList.get(position).get(audienceType));
+        }
+
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        boolean isNoble = true;
+        for (int number : mapList.get(position).keySet()) {
+            isNoble = number == nobleType;
+        }
+        return isNoble ? nobleType : audienceType;
+    }
+
+    @Override
+    public int getItemCount() {
+        return mapList.size();
+    }
+}
diff --git a/live/src/main/java/com/yunbao/live/adapter/OlineListItemAdapter.java b/live/src/main/java/com/yunbao/live/adapter/OlineListItemAdapter.java
new file mode 100644
index 000000000..46d58b235
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/adapter/OlineListItemAdapter.java
@@ -0,0 +1,46 @@
+package com.yunbao.live.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.bean.OlineUserlistModel;
+import com.yunbao.live.R;
+import com.yunbao.live.views.OlineListItemViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class OlineListItemAdapter extends RecyclerView.Adapter {
+    private Context mContext;
+    private List<OlineUserlistModel> models = new ArrayList<>();
+
+    public void addAll(List<OlineUserlistModel> userlistModels) {
+        models.addAll(userlistModels);
+        notifyDataSetChanged();
+    }
+
+    public OlineListItemAdapter(Context mContext) {
+        this.mContext = mContext;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new OlineListItemViewHolder(LayoutInflater.from(mContext).inflate(R.layout.view_oline_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        OlineListItemViewHolder itemViewHolder = (OlineListItemViewHolder) holder;
+        itemViewHolder.setData(models.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return models.size();
+    }
+}
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveInputDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveInputDialogFragment.java
index 1ac176c7a..bb1e17c22 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveInputDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveInputDialogFragment.java
@@ -3,6 +3,7 @@ package com.yunbao.live.dialog;
 import static android.content.Context.INPUT_METHOD_SERVICE;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -12,7 +13,6 @@ import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Gravity;
-import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -23,7 +23,6 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
-import android.widget.TextView;
 
 import androidx.fragment.app.FragmentActivity;
 
@@ -37,10 +36,11 @@ import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
-import com.yunbao.live.activity.LiveAnchorActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
+import com.yunbao.live.views.OlineListActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -94,6 +94,7 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
         params.height = DpUtil.dp2px(100);
         params.gravity = Gravity.BOTTOM;
         window.setAttributes(params);
+
     }
 
     @Override
@@ -103,6 +104,7 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
         imm = (InputMethodManager) mContext.getSystemService(INPUT_METHOD_SERVICE);
         mInput = (EditText) mRootView.findViewById(R.id.input);
         radioHornType = mRootView.findViewById(R.id.radio_horn_type);
+
         for (int id : radioList) {
             RadioButton radioButton = mRootView.findViewById(id);
             radioHornTypes.add(radioButton);
@@ -116,15 +118,12 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
         mInput.setFocusableInTouchMode(true);
         mInput.requestFocus();
 
-        mInput.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND) {
-                    sendMessage();
-                    return true;
-                }
-                return false;
+        mInput.setOnEditorActionListener((v, actionId, event) -> {
+            if (actionId == EditorInfo.IME_ACTION_SEND) {
+                sendMessage();
+                return true;
             }
+            return false;
         });
         mInput.addTextChangedListener(new TextWatcher() {
             @Override
@@ -146,13 +145,10 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
 
             }
         });
-        mInput.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                //软键盘弹出
-                imm.showSoftInput(mInput, InputMethodManager.SHOW_FORCED);
-                mInput.requestFocus();
-            }
+        mInput.postDelayed(() -> {
+            //软键盘弹出
+            imm.showSoftInput(mInput, InputMethodManager.SHOW_FORCED);
+            mInput.requestFocus();
         }, 200);
         mCheckBox = (CheckBox) mRootView.findViewById(R.id.danmu);
         mMyRadioButton = (MyRadioButton) mRootView.findViewById(R.id.btn_send);
@@ -180,6 +176,16 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
         radioHornType.setOnCheckedChangeListener(changeListener);
         radioHornType.getCheckedRadioButtonId();
         netHandler.post(getNobleTrumpetNumRunnable);
+        ViewClicksAntiShake.clicksAntiShake(mRootView.findViewById(R.id.ai_te), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                Intent intent = new Intent(getActivity(), OlineListActivity.class);
+                intent.putExtra("liveID", mLiveUid);
+                intent.putExtra("stream", bundle.getString(Constants.LIVE_STREAM));
+                getActivity().startActivity(intent);
+            }
+        });
+        ;
     }
 
     @Override
diff --git a/live/src/main/java/com/yunbao/live/socket/SocketLinkMicUtil.java b/live/src/main/java/com/yunbao/live/socket/SocketLinkMicUtil.java
index 4dbd93fd8..d9480b84f 100644
--- a/live/src/main/java/com/yunbao/live/socket/SocketLinkMicUtil.java
+++ b/live/src/main/java/com/yunbao/live/socket/SocketLinkMicUtil.java
@@ -44,15 +44,6 @@ public class SocketLinkMicUtil {
         if (u == null) {
             return;
         }
-//        client.send(new SocketSendBean()
-//                .param("_method_", Constants.SOCKET_LINK_MIC)
-//                .param("action", 2)
-//                .param("msgtype", 10)
-//                .param("uid", u.getId())
-//                .param("uname", u.getUserNiceName())
-//                .param("level", u.getLevel())
-//                .param("touid", toUid)
-//                .param("ct", ""));
     }
 
 
@@ -67,15 +58,6 @@ public class SocketLinkMicUtil {
         if (u == null) {
             return;
         }
-//        client.send(new SocketSendBean()
-//                .param("_method_", Constants.SOCKET_LINK_MIC)
-//                .param("action", 3)
-//                .param("msgtype", 10)
-//                .param("uid", u.getId())
-//                .param("uname", u.getUserNiceName())
-//                .param("level", u.getLevel())
-//                .param("touid", touid)
-//                .param("ct", ""));
     }
 
     /**
@@ -144,11 +126,6 @@ public class SocketLinkMicUtil {
         if (client == null) {
             return;
         }
-//        client.send(new SocketSendBean()
-//                .param("_method_", Constants.SOCKET_LINK_MIC)
-//                .param("action", 7)
-//                .param("msgtype", 10)
-//                .param("touid", touid));
     }
 
     /**
@@ -158,10 +135,5 @@ public class SocketLinkMicUtil {
         if (client == null) {
             return;
         }
-//        client.send(new SocketSendBean()
-//                .param("_method_", Constants.SOCKET_LINK_MIC)
-//                .param("action", 8)
-//                .param("msgtype", 10)
-//                .param("touid", touid));
     }
 }
diff --git a/live/src/main/java/com/yunbao/live/views/OlineAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/OlineAudienceViewHolder.java
new file mode 100644
index 000000000..7cfc5fd63
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/views/OlineAudienceViewHolder.java
@@ -0,0 +1,41 @@
+package com.yunbao.live.views;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.bean.OlineUserlistModel;
+import com.yunbao.live.R;
+import com.yunbao.live.adapter.OlineListItemAdapter;
+
+import java.util.List;
+
+/**
+ * 在线普通观众
+ */
+public class OlineAudienceViewHolder extends RecyclerView.ViewHolder {
+    private TextView avatarType;
+    private RecyclerView audienceList;
+    private OlineListItemAdapter itemAdapter;
+
+    public OlineAudienceViewHolder(@NonNull View itemView) {
+        super(itemView);
+        avatarType = itemView.findViewById(R.id.avatar_type);
+        itemAdapter = new OlineListItemAdapter(itemView.getContext());
+        audienceList = itemView.findViewById(R.id.audience_list);
+        audienceList.setLayoutManager(new LinearLayoutManager(itemView.getContext(), LinearLayoutManager.VERTICAL, false));
+        audienceList.setAdapter(itemAdapter);
+    }
+
+    /**
+     * 设置列表数据
+     */
+    public void setData(List<OlineUserlistModel> models) {
+        avatarType.setText(R.string.audience);
+        avatarType.setVisibility(View.VISIBLE);
+        itemAdapter.addAll(models);
+    }
+}
diff --git a/live/src/main/java/com/yunbao/live/views/OlineListActivity.java b/live/src/main/java/com/yunbao/live/views/OlineListActivity.java
new file mode 100644
index 000000000..ce3db8da7
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/views/OlineListActivity.java
@@ -0,0 +1,86 @@
+package com.yunbao.live.views;
+
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.blankj.utilcode.util.GsonUtils;
+import com.yunbao.common.activity.AbsActivity;
+import com.yunbao.common.bean.OlineModel;
+import com.yunbao.common.bean.OlineUserlistModel;
+import com.yunbao.common.http.HttpCallback;
+import com.yunbao.live.R;
+import com.yunbao.live.adapter.OlineListAdapter;
+import com.yunbao.live.http.LiveHttpUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class OlineListActivity extends AbsActivity {
+    private RecyclerView audienceList;
+    private OlineListAdapter itemAdapter;
+
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.acticity_oline_list;
+    }
+
+    @Override
+    protected void main() {
+        super.main();
+        initView();
+        initData();
+    }
+
+    /**
+     * 初始化数据
+     */
+    private void initData() {
+        LiveHttpUtil.
+                getUserList(
+                        getIntent().getStringExtra("liveID"),
+                        getIntent().getStringExtra("stream"), "guanzhong", 1, new HttpCallback() {
+                            @Override
+                            public void onSuccess(int code, String msg, String[] info) {
+                                OlineModel responseData = GsonUtils.fromJson(info[0], OlineModel.class);
+                                List<OlineUserlistModel> userlistModels = responseData.getUserlist();
+                                List<OlineUserlistModel> noblelistModels = new ArrayList<>();
+                                List<OlineUserlistModel> audiencelistModels = new ArrayList<>();
+                                List<Map<Integer, List<OlineUserlistModel>>> mapList = new ArrayList<>();
+                                //讲贵族前置顺序
+                                for (OlineUserlistModel model : userlistModels) {
+                                    int nobleId = Integer.parseInt(model.getNobleId());
+                                    if (nobleId > 0) {
+                                        noblelistModels.add(model);
+                                    } else {
+                                        audiencelistModels.add(model);
+                                    }
+                                }
+                                Map<Integer, List<OlineUserlistModel>> noblerMap = new HashMap<>();
+                                noblerMap.put(0, noblelistModels);
+                                Map<Integer, List<OlineUserlistModel>> audienceMap = new HashMap<>();
+                                audienceMap.put(1,audiencelistModels);
+                                mapList.add(0,noblerMap);
+                                mapList.add(1, audienceMap);
+                                itemAdapter.addAll(mapList);
+                            }
+                        });
+    }
+
+    /**
+     * 初始化控件
+     */
+    private void initView() {
+        itemAdapter = new OlineListAdapter(mContext);
+        audienceList = findViewById(R.id.audience_list);
+       TextView titleView = findViewById(R.id.titleView);
+        titleView.setText(R.string.online_audience);
+        audienceList.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
+        audienceList.setAdapter(itemAdapter);
+
+    }
+}
diff --git a/live/src/main/java/com/yunbao/live/views/OlineListItemViewHolder.java b/live/src/main/java/com/yunbao/live/views/OlineListItemViewHolder.java
new file mode 100644
index 000000000..66e2ddab7
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/views/OlineListItemViewHolder.java
@@ -0,0 +1,33 @@
+package com.yunbao.live.views;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.bean.OlineUserlistModel;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.views.weight.ClipPathCircleImage;
+import com.yunbao.live.R;
+
+public class OlineListItemViewHolder extends RecyclerView.ViewHolder {
+    private TextView userName;
+    private ClipPathCircleImage avatar;
+
+    public OlineListItemViewHolder(@NonNull View itemView) {
+        super(itemView);
+        userName = itemView.findViewById(R.id.user_name);
+        avatar = itemView.findViewById(R.id.avatar);
+    }
+
+    /**
+     * 设置列表数据
+     *
+     * @param model 数据
+     */
+    public void setData(OlineUserlistModel model) {
+        ImgLoader.displayAvatar(itemView.getContext(), model.getAvatar(), avatar);
+        userName.setText(model.getUserNicename());
+    }
+}
diff --git a/live/src/main/java/com/yunbao/live/views/OlineNobleViewHolder.java b/live/src/main/java/com/yunbao/live/views/OlineNobleViewHolder.java
new file mode 100644
index 000000000..94c5350e3
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/views/OlineNobleViewHolder.java
@@ -0,0 +1,41 @@
+package com.yunbao.live.views;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.common.bean.OlineUserlistModel;
+import com.yunbao.live.R;
+import com.yunbao.live.adapter.OlineListItemAdapter;
+
+import java.util.List;
+
+/**
+ * 在线贵族
+ */
+public class OlineNobleViewHolder extends RecyclerView.ViewHolder {
+    private TextView avatarType;
+    private RecyclerView audienceList;
+    private OlineListItemAdapter itemAdapter;
+
+    public OlineNobleViewHolder(@NonNull View itemView) {
+        super(itemView);
+        avatarType = itemView.findViewById(R.id.avatar_type);
+        itemAdapter = new OlineListItemAdapter(itemView.getContext());
+        audienceList = itemView.findViewById(R.id.audience_list);
+        audienceList.setLayoutManager(new LinearLayoutManager(itemView.getContext(), LinearLayoutManager.VERTICAL, false));
+        audienceList.setAdapter(itemAdapter);
+    }
+
+    /**
+     * 设置列表数据
+     */
+    public void setData(List<OlineUserlistModel> models) {
+        avatarType.setText(R.string.noble);
+        avatarType.setVisibility(View.VISIBLE);
+        itemAdapter.addAll(models);
+    }
+}
diff --git a/live/src/main/res/drawable/bg_search_input_2.xml b/live/src/main/res/drawable/bg_search_input_2.xml
new file mode 100644
index 000000000..dcbd299eb
--- /dev/null
+++ b/live/src/main/res/drawable/bg_search_input_2.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="20dp"/>
+    <solid android:color="#F6F6F6"/>
+</shape>
\ No newline at end of file
diff --git a/live/src/main/res/layout/acticity_oline_list.xml b/live/src/main/res/layout/acticity_oline_list.xml
new file mode 100644
index 000000000..e7fe924b6
--- /dev/null
+++ b/live/src/main/res/layout/acticity_oline_list.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <include layout="@layout/view_title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="18.67dp"
+        android:layout_marginEnd="20dp"
+        android:background="@drawable/bg_search_input_2"
+        android:orientation="horizontal">
+
+
+        <EditText
+            android:id="@+id/edit"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@null"
+            android:hint="@string/search_want"
+            android:imeActionLabel="@string/search"
+            android:imeOptions="actionSearch"
+            android:paddingStart="22.67dp"
+            android:paddingRight="10dp"
+            android:singleLine="true"
+            android:textColor="@color/textColor"
+            android:textColorHint="#BFBFBF"
+            android:textSize="15sp" />
+
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/audience_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="23.33dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/live/src/main/res/layout/dialog_live_chat_input.xml b/live/src/main/res/layout/dialog_live_chat_input.xml
index e0d7805ca..b99e0c3b7 100644
--- a/live/src/main/res/layout/dialog_live_chat_input.xml
+++ b/live/src/main/res/layout/dialog_live_chat_input.xml
@@ -26,10 +26,10 @@
                 android:background="@drawable/radio_horn_type"
                 android:button="@null"
                 android:checked="true"
+                android:drawableLeft="@mipmap/icon_general_message_p"
                 android:gravity="center"
                 android:text="@string/normal_barrage"
                 android:textColor="@color/white"
-                android:drawableLeft="@mipmap/icon_general_message_p"
                 android:textSize="12sp" />
 
             <RadioButton
@@ -40,8 +40,8 @@
                 android:layout_weight="1"
                 android:background="@drawable/radio_horn_type"
                 android:button="@null"
-                android:gravity="center"
                 android:drawableLeft="@mipmap/icon_popup_screen"
+                android:gravity="center"
                 android:text="@string/floating_screen"
                 android:textColor="#FFB1B6C7"
                 android:textSize="12sp" />
@@ -54,12 +54,12 @@
                 android:layout_weight="1"
                 android:background="@drawable/radio_horn_type"
                 android:button="@null"
-                android:gravity="center"
                 android:drawableStart="@mipmap/icon_world_horn"
+                android:gravity="center"
                 android:text="@string/whole_station_horn"
                 android:textColor="#FFB1B6C7"
-                android:visibility="visible"
-                android:textSize="12sp" />
+                android:textSize="12sp"
+                android:visibility="visible" />
 
             <View
                 android:layout_width="match_parent"
@@ -82,6 +82,15 @@
         android:layout_width="match_parent"
         android:layout_height="50dp">
 
+        <ImageView
+            android:id="@+id/ai_te"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="12.33dp"
+            android:layout_marginEnd="10.33dp"
+            android:layout_gravity="center_vertical"
+            android:src="@mipmap/icon_emphasis" />
+
         <EditText
             android:id="@+id/input"
             android:layout_width="0dp"
@@ -90,7 +99,7 @@
             android:layout_weight="1"
             android:background="@drawable/bg_live_input"
             android:gravity="center_vertical"
-            android:hint="@string/live_say_something"
+            android:hint="@string/live_say_something_a"
             android:imeActionLabel="@string/send"
             android:imeOptions="actionSend"
             android:maxLength="50"
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 6ddc32cf0..a422be806 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -287,6 +287,43 @@
         </LinearLayout>
     </LinearLayout>
 
+    <RelativeLayout
+        android:id="@+id/chat_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:gravity="top"
+        android:orientation="vertical">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/chat_recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="370dp"
+            android:overScrollMode="never"
+            android:scrollbars="none" />
+
+        <LinearLayout
+            android:id="@+id/gif_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="13dp"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:id="@+id/gift_group_2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <FrameLayout
+                android:id="@+id/gift_group_1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
+
+    </RelativeLayout>
 
     <LinearLayout
         android:id="@+id/hour_rank_layout"
@@ -830,43 +867,6 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <RelativeLayout
-        android:id="@+id/chat_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:gravity="top"
-        android:orientation="vertical">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/chat_recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="370dp"
-            android:overScrollMode="never"
-            android:scrollbars="none" />
-
-        <LinearLayout
-            android:id="@+id/gif_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="13dp"
-            android:orientation="vertical">
-
-            <FrameLayout
-                android:id="@+id/gift_group_2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <FrameLayout
-                android:id="@+id/gift_group_1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        </LinearLayout>
-
-
-    </RelativeLayout>
 
     <com.yunbao.common.custom.MyFrameLayout2
         android:id="@+id/enter_room_group"
diff --git a/live/src/main/res/layout/view_oline_audience.xml b/live/src/main/res/layout/view_oline_audience.xml
new file mode 100644
index 000000000..f0082e1e6
--- /dev/null
+++ b/live/src/main/res/layout/view_oline_audience.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/avatar_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20.67dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="18dp"
+        android:text="@string/noble"
+        android:textColor="#B3B3B3"
+        android:textSize="14sp" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/audience_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/live/src/main/res/layout/view_oline_item.xml b/live/src/main/res/layout/view_oline_item.xml
new file mode 100644
index 000000000..2a70923a5
--- /dev/null
+++ b/live/src/main/res/layout/view_oline_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="18dp"
+        android:gravity="center_vertical">
+
+        <com.yunbao.common.views.weight.ClipPathCircleImage
+            android:id="@+id/avatar"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="20dp"
+            android:scaleType="centerCrop" />
+
+        <TextView
+            android:id="@+id/user_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12.33dp"
+            android:text="@string/noble"
+            android:textColor="#222324"
+            android:textSize="16sp" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/live/src/main/res/mipmap-xxxhdpi/icon_emphasis.png b/live/src/main/res/mipmap-xxxhdpi/icon_emphasis.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d4c0cd2c0ec214f8ff52927b7f22eae800fe9ae
GIT binary patch
literal 4313
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%0DHef)eT}nBtppzZt2c&4c^$#*<(e_X{g-R2OBG
zrACc$?LaT5sOQi=$d383)aNv)jzsN@+?6e{`j;i+2uc$O0L8rB^=>ENDuJN)!`W=K
zscGul0@?#4`A0s8{|1at0hsuqzQn%+8&BkXJaFpFh^l@m+LEdC7n$is04L~Z`~9w-
zv3#Cj+?KHFlq0TUEieFW?#8$QLpU3P7cA@_sakEvPfwp1%F$%@DP+Lky$?v2a`MPO
z4w$VyAB+Wnf7$?#a;TcJEeyO&OwYr}J#EM8)k?2;3k*QtULZRSDO!SYcBN-gP%FLk
z+H2!S_ZS~zpK5#k&@Sq(*<P)R{gMDkc6#SBLG+rSdW<9M(=5s7BB&w%6zEF=Apfke
zn^_IQDMBN-*)hFyW>1@@QX5BFKMRxuK>jn->CFS-7Xhrf65akh+pbr)>5*2jK*<28
z{*sE3LoA&%YK-~P2lxIzpfn@^IyyETmksA$30PG329xo*mROx6h44=vgCPN+tdn%p
z7cfZ0OoQ<11!IZ7chpVQI(-~2$ObXmpgOm^-YtZD5F=<ygXlYn#=0kUdH+Ef4@93#
zWljT(-zQ=xc9nx)Ie3%>fP#xcrLGq(`5#PS23{fNyRnZSEB7YdSKqtmLiLP*dRn2B
zw3KofdN3Yk0YEYDdy0O{&p|k62nz3F!ZHJRHWwcCoTPwyAXzI@>0?4n=Yn}Yh}0wD
z{j25Q9$(Xad?^_WLm1bfUCRc5lAwY%6L%Xw)z#7p2jYWx12~@+@`}OO>Vr2^*w`83
z?18s|a$Iu^`8nkroWd{~VED7ZG`*ONpgH_PeM=%MD*#G^z9gy45->z%swHVX^iD6>
zmZ{#5u6ipw0Q*N&s3=r5SVvTSlpj`r{TxqeJtdm1wr&*zKn-l=x{YSorw6ok1y!&D
z0k<S9Q<hCvLH#NUfYLkv2B+&?MuhJNd7HU{W8TmD594dPCs%tjt~dbuN2@Z~jB!1S
z!1)|bZA7i201&;SN}t{to4c*ljJ9&=H*5g(2ZCyQFD2qDhVmj-i3WHbgdb%`_da;I
zcxHzkfc}OnJkYd&fpZ9X*S6$QzM!^$3xxkNh<-L}M%{|xxN!$ju&My`S2TZl%D)$6
z%mlLnL)D`N{pSr8sP~w##$a@Ch@MZJT(|CUGkX7VA2t9CG;7rJXvP>!^4T~6L`Q@D
zS^_5cL}UQ(GqVqa-tlwB+u+<Aqxikek{ab8GqlpQhcy6|9{l0Je*}Okqc8%%2mn>K
zK$XRhtbh>!s%(KOiyv75BLGy{0#z12vI0f`sImpBEdGB034}?z7PPC500000NkvXX
Hu0mjfyDBCm

literal 0
HcmV?d00001

diff --git a/main/src/main/res/layout/view_anchor_search_results_item_holder.xml b/main/src/main/res/layout/view_anchor_search_results_item_holder.xml
index af1b5f8d0..061333863 100644
--- a/main/src/main/res/layout/view_anchor_search_results_item_holder.xml
+++ b/main/src/main/res/layout/view_anchor_search_results_item_holder.xml
@@ -46,9 +46,9 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/anchor_list"
-        android:layout_below="@id/type_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_below="@id/type_title"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         android:fadingEdge="none" />