添加老师端连麦UI显示

BaseLibrary/src/main/res/drawable/bg_gray_20dp_shape.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="19.5dp"/>
-    <solid android:color="@color/color_52000000"/>
+    <solid android:color="@color/color_25333333"/>
 </shape>

BaseLibrary/src/main/res/values/colors.xml

@@ -127,5 +127,6 @@
     <color name="color_e4f8f7">#E4F8F7</color>
     <color name="color_01c1b5">#01C1B5</color>
     <color name="color_FF806F">#FF806F</color>
+    <color name="color_25333333">#25333333</color>
 
 </resources>

rong_im/live/src/main/java/com/rong/io/live/widget/LiveRoomMicIconView.java

@@ -12,6 +12,7 @@ import android.widget.TextView;
 
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.rong.io.live.R;
+import com.rong.io.live.bean.User;
 
 import java.util.ArrayList;
 
@@ -128,6 +129,16 @@ public class LiveRoomMicIconView extends LinearLayout {
         return pos;
     }
 
+    public void refreshUIByUser(ArrayList<User> users) {
+        mMicUserInfos.clear();
+        for (int i = 0; i < users.size(); i++) {
+            User user = users.get(i);
+            UserInfo userInfo = new UserInfo(user.getUserId(), user.getUserName(), null);
+            mMicUserInfos.add(userInfo);
+        }
+        refreshAllUser();
+    }
+
     public void refreshUI(ArrayList<String> onMicUserIds) {
         post(new Runnable() {
             @Override

teacher/src/main/java/com/cooleshow/teacher/ui/live/LiveOnMicFragment.java

@@ -1,5 +1,6 @@
 package com.cooleshow.teacher.ui.live;
 
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -125,8 +126,9 @@ public class LiveOnMicFragment extends BaseFragment<FragmentLiveOnMicLayoutBindi
             //创建人头像
             Glide.with(getContext()).load(user.getPortraitUrl()).placeholder(R.drawable.icon_teacher_default_head).error(R.drawable.icon_teacher_default_head).into(viewHolder.ivAvatar);
             //名称
+            String userName = user.getUserName();
+            viewHolder.tvName.setText(!TextUtils.isEmpty(userName) ? userName : "连麦用户");
 
-            viewHolder.tvName.setText(user.getUserName());
             viewHolder.tvTip.setText("连麦中");
             viewHolder.tvHandle.setText("下麦");
         }

teacher/src/main/java/com/cooleshow/teacher/ui/live/TeacherLiveRoomActivity.java

@@ -63,6 +63,7 @@ import com.rong.io.live.message.RCChatJoinRoomMessage;
 import com.rong.io.live.message.RCOnSnappingUpMessage;
 import com.rong.io.live.message.RCUserAddLikeMessage;
 import com.rong.io.live.message.RCUserSeatApplyMessage;
+import com.rong.io.live.widget.LiveRoomMicIconView;
 import com.tbruyelle.rxpermissions3.RxPermissions;
 
 import java.util.ArrayList;
@@ -138,6 +139,7 @@ public class TeacherLiveRoomActivity extends BaseMVPActivity<ActivityTeacherLive
     TextView mTvJoinBarrage;
     FrameLayout mFlSnapUpBarrage;
     TextView mTvSnapUpBarrage;
+    LiveRoomMicIconView llMicContainer;
 
     public String mRoomId = "";
     private VideoViewManager mVideoViewManager;
@@ -268,6 +270,7 @@ public class TeacherLiveRoomActivity extends BaseMVPActivity<ActivityTeacherLive
         mTvJoinBarrage = viewBinding.viewMainLayout.tvJoinBarrage;
         mFlSnapUpBarrage = viewBinding.viewMainLayout.flSnapUpBarrage;
         mTvSnapUpBarrage = viewBinding.viewMainLayout.tvSnapUpBarrage;
+        llMicContainer = viewBinding.viewMainLayout.llMicContainer;
         ivReverseCamera.setOnClickListener(this);
         ivLiveBeauty.setOnClickListener(this);
         ivLiveShare.setOnClickListener(this);
@@ -1031,6 +1034,9 @@ public class TeacherLiveRoomActivity extends BaseMVPActivity<ActivityTeacherLive
             mLiveMicManagerDialog.setApplyListData(mRoomMicMemberHelper.getOnApplyMicUsers());
             mLiveMicManagerDialog.setOnMicListData(mRoomMicMemberHelper.getOnMicUsers());
         }
+        if (llMicContainer != null) {
+            llMicContainer.refreshUIByUser(mRoomMicMemberHelper.getOnMicUsers());
+        }
         if (mTvOnMicNumTip != null) {
             ArrayList<User> onApplyMicUsers = mRoomMicMemberHelper.getOnApplyMicUsers();
             if (onApplyMicUsers != null && onApplyMicUsers.size() > 0) {

teacher/src/main/res/drawable/shape_live_msg_text_bg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_52000000" />
+    <solid android:color="@color/color_25333333" />
     <corners android:radius="10dp" />
 </shape>

teacher/src/main/res/layout/view_live_room_main_layout.xml

@@ -120,6 +120,7 @@
         </LinearLayout>
 
         <FrameLayout
+            android:id="@+id/fl_time_count"
             android:layout_width="wrap_content"
             android:layout_height="18dp"
             android:layout_marginTop="10dp"
@@ -154,6 +155,18 @@
         </FrameLayout>
 
 
+        <com.rong.io.live.widget.LiveRoomMicIconView
+            android:id="@+id/ll_mic_container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="9dp"
+            android:layout_marginBottom="9dp"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/fl_time_count" />
+
         <LinearLayout
             android:id="@+id/ll_live_delay"
             android:layout_width="wrap_content"