diff --git a/common/src/main/res/drawable/live_voice_chat_role_bg.xml b/common/src/main/res/drawable/live_voice_chat_role_bg.xml
new file mode 100644
index 000000000..0e13eb02d
--- /dev/null
+++ b/common/src/main/res/drawable/live_voice_chat_role_bg.xml
@@ -0,0 +1,17 @@
+
+ -
+
+
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index dc7d8c1f2..8a6e10173 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -330,9 +330,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
static ImageView pk5Ico;
static RelativeLayout pk5;
- RelativeLayout mic_view;
- RelativeLayout mic_view1;
- RelativeLayout mic_view2;
+ Group mic_view,mic_view1,mic_view2;
+ View video_chat_bg1,video_chat_bg2,video_chat_bg3;
+
static ImageView mic_ico;
static RoundedImageView mic_ico1;
@@ -830,19 +830,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
}
}
- mic_view.setOnClickListener(new View.OnClickListener() {
+ video_chat_bg1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
xz(mic_ids.get(0));
}
});
- mic_view1.setOnClickListener(new View.OnClickListener() {
+ video_chat_bg2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
xz(mic_ids.get(1));
}
});
- mic_view2.setOnClickListener(new View.OnClickListener() {
+ video_chat_bg3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
xz(mic_ids.get(2));
@@ -1739,9 +1739,14 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
pk4 = (RelativeLayout) findViewById(R.id.pk4);
pk5 = (RelativeLayout) findViewById(R.id.pk5);
- mic_view = (RelativeLayout) findViewById(R.id.mic_view);
- mic_view1 = (RelativeLayout) findViewById(R.id.mic_view1);
- mic_view2 = (RelativeLayout) findViewById(R.id.mic_view2);
+ mic_view = findViewById(R.id.mic_view);
+ mic_view1 = findViewById(R.id.mic_view1);
+ mic_view2 = findViewById(R.id.mic_view2);
+ video_chat_bg1 = findViewById(R.id.video_chat_bg1);
+ video_chat_bg2 = findViewById(R.id.video_chat_bg2);
+ video_chat_bg3 = findViewById(R.id.video_chat_bg3);
+
+
flipper = (ViewFlipper) findViewById(R.id.hour_rank_list);
mic_ico = (ImageView) findViewById(R.id.mic_ico);
newMessage = (ImageView) findViewById(R.id.new_message);
diff --git a/live/src/main/res/drawable/bg_live_video_chat.xml b/live/src/main/res/drawable/bg_live_video_chat.xml
new file mode 100644
index 000000000..212bb3cd3
--- /dev/null
+++ b/live/src/main/res/drawable/bg_live_video_chat.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml
index 087cf0acc..8e783c578 100644
--- a/live/src/main/res/layout/view_live_audience.xml
+++ b/live/src/main/res/layout/view_live_audience.xml
@@ -234,12 +234,13 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_centerHorizontal="true"
- android:layout_margin="5dp"
+ android:layout_margin="3dp"
+ android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/pd_pao"
app:layout_constraintEnd_toEndOf="@+id/pd_pao"
app:layout_constraintStart_toStartOf="@+id/pd_pao"
app:layout_constraintTop_toTopOf="@+id/pd_pao"
- tools:visibility="gone" />
+ tools:visibility="visible" />
+ android:orientation="vertical"
+ tools:visibility="gone">
+ android:layout_weight="1"
+ android:visibility="gone" />
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
-
-
+ android:layout_marginRight="10dp" />
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file