From 27776d1761b597e91deb740be4bf2e9b5aa8c6b3 Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Tue, 24 Sep 2024 11:22:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=87=E6=8D=A2=E8=A7=82?=
 =?UTF-8?q?=E4=BC=97=E7=B1=BB=E5=9E=8B=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dialog/LiveUserMoreDialogFragment.java    |  32 ++-
 .../yunbao/live/views/LiveRoomViewHolder.java |   1 -
 live/src/main/res/layout/view_live_room.xml   |   6 +-
 .../main/res/layout/view_live_room_pk_ad.xml  | 263 ++++++++++++++++++
 4 files changed, 284 insertions(+), 18 deletions(-)
 create mode 100644 live/src/main/res/layout/view_live_room_pk_ad.xml

diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
index 730eeb7c2..14cad59c4 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
@@ -382,21 +382,23 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
         noMoreText.setVisibility(View.GONE);
         LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) mRefreshView.getLayoutParams();
         params.bottomMargin = DpUtil.dp2px(65);
-        if(noble){
-            tags.setText(R.string.enjoy_a_lot);
-            btn.setBackgroundResource(R.mipmap.btn_openvip);
-            btn.setText(R.string.live_ktgz);
-            setTextColor(gz_view,audience_btn, guard_btn, fans_btn, weekRank, dayRank);
-            userMoreInfoAdapter.type = "1";
-            type = "guanzhong";
-        }else if (Tips.equals("1")) {
-            tags.setText(R.string.enjoy_a_lot);
-            btn.setBackgroundResource(R.mipmap.btn_openvip);
-            btn.setText(R.string.live_ktgz);
-            setTextColor(audience_btn, guard_btn, fans_btn, weekRank, dayRank,gz_view);
-            userMoreInfoAdapter.type = "1";
-            type = "guanzhong";
-        } else if (Tips.equals("2")) {
+        if(Tips.equals("1")){
+            if (noble){
+                tags.setText(R.string.enjoy_a_lot);
+                btn.setBackgroundResource(R.mipmap.btn_openvip);
+                btn.setText(R.string.live_ktgz);
+                setTextColor(gz_view,audience_btn, guard_btn, fans_btn, weekRank, dayRank);
+                userMoreInfoAdapter.type = "1";
+                type = "guanzhong";
+            }else {
+                tags.setText(R.string.enjoy_a_lot);
+                btn.setBackgroundResource(R.mipmap.btn_openvip);
+                btn.setText(R.string.live_ktgz);
+                setTextColor(audience_btn, guard_btn, fans_btn, weekRank, dayRank,gz_view);
+                userMoreInfoAdapter.type = "1";
+                type = "guanzhong";
+            }
+        }else if (Tips.equals("2")) {
             tags.setText(R.string.guard_for_your);
             btn.setBackgroundResource(R.mipmap.btn_openprotection);
             btn.setText(R.string.daemon_list);
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 0284c1036..9bbd2da2f 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -3969,7 +3969,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 params.height = mScreenWdith * 720 / PK_LINE_HEIGHT;
                 //params.bottomMargin = (mScreenWdith * 720 / 960);
                 lt_pk_line.requestLayout();
-
                 lt_pk_line.setVisibility(View.VISIBLE);
             }
             Boolean idB = true;
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 88fb3f7bf..74ab1bfd9 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -1800,7 +1800,7 @@
         android:id="@+id/lt_pk_line"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="156dp"
+        android:layout_marginTop="180dp"
         android:visibility="gone"
         tools:visibility="visible">
 
@@ -1819,7 +1819,8 @@
             android:textColor="#FFFFFF"
             android:textSize="12sp"
             android:textStyle="bold"
-            android:visibility="gone" />
+            android:visibility="gone"
+            tools:visibility="visible"/>
 
         <TextView
             android:id="@+id/pk_rank_blue_val"
@@ -1837,6 +1838,7 @@
             android:textColor="#FFFFFF"
             android:textSize="12sp"
             android:textStyle="bold"
+            tools:visibility="visible"
             android:visibility="gone" />
 
         <LinearLayout
diff --git a/live/src/main/res/layout/view_live_room_pk_ad.xml b/live/src/main/res/layout/view_live_room_pk_ad.xml
new file mode 100644
index 000000000..e01282baf
--- /dev/null
+++ b/live/src/main/res/layout/view_live_room_pk_ad.xml
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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/lt_pk_line"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="180dp"
+    tools:visibility="visible">
+
+    <TextView
+        android:id="@+id/pk_rank_red_val"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/pk_red_layout"
+        android:layout_marginStart="13dp"
+        android:layout_marginBottom="10dp"
+        android:background="@drawable/bg_live_item_pk_rank_red"
+        android:paddingStart="10dp"
+        android:paddingTop="3dp"
+        android:paddingEnd="10dp"
+        android:paddingBottom="3dp"
+        android:textColor="#FFFFFF"
+        android:textSize="12sp"
+        android:textStyle="bold"
+        tools:visibility="visible"/>
+
+    <TextView
+        android:id="@+id/pk_rank_blue_val"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/pk_red_layout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="13dp"
+        android:layout_marginBottom="10dp"
+        android:background="@drawable/bg_live_item_pk_rank_blue"
+        android:paddingStart="10dp"
+        android:paddingTop="3dp"
+        android:paddingEnd="10dp"
+        android:paddingBottom="3dp"
+        android:textColor="#FFFFFF"
+        android:textSize="12sp"
+        android:textStyle="bold"
+        tools:visibility="visible"
+        />
+
+    <LinearLayout
+        android:id="@+id/pk_red_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <RelativeLayout
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:layout_marginLeft="6dp"
+                android:scaleType="centerCrop">
+
+                <ImageView
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_sofa_red" />
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/avatar_l3"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_centerInParent="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:scaleType="centerCrop"
+                    app:riv_oval="true" />
+
+                <ImageView
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="6dp"
+                    android:background="@mipmap/icon_red_no3" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:layout_marginLeft="6dp"
+                android:scaleType="centerCrop">
+
+                <ImageView
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_sofa_red" />
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/avatar_l2"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_centerInParent="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:scaleType="centerCrop"
+                    app:riv_oval="true" />
+
+                <ImageView
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="6dp"
+                    android:background="@mipmap/icon_red_no2" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:layout_marginLeft="6dp"
+                android:scaleType="centerCrop">
+
+                <ImageView
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_sofa_red" />
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/avatar_l1"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_centerInParent="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:scaleType="centerCrop"
+                    app:riv_oval="true" />
+
+                <ImageView
+                    android:id="@+id/img_pk_fist_l"
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="6dp"
+                    android:background="@mipmap/icon_red_no1" />
+            </RelativeLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="right"
+            android:orientation="horizontal">
+
+            <RelativeLayout
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:layout_marginRight="6dp"
+                android:scaleType="centerCrop">
+
+                <ImageView
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_sofa_blue" />
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/avatar_r1"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_centerInParent="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:scaleType="centerCrop"
+                    app:riv_oval="true" />
+
+                <ImageView
+                    android:id="@+id/img_pk_fist_r"
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="6dp"
+                    android:background="@mipmap/icon_blue_no1" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:layout_marginRight="6dp"
+                android:scaleType="centerCrop">
+
+                <ImageView
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_sofa_blue" />
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/avatar_r2"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_centerInParent="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:scaleType="centerCrop"
+                    app:riv_oval="true" />
+
+                <ImageView
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="6dp"
+                    android:background="@mipmap/icon_blue_no2" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="42dp"
+                android:layout_height="42dp"
+                android:layout_marginRight="6dp"
+                android:scaleType="centerCrop">
+
+                <ImageView
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/icon_sofa_blue" />
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/avatar_r3"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_centerInParent="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_centerVertical="true"
+                    android:scaleType="centerCrop"
+                    app:riv_oval="true" />
+
+                <ImageView
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="6dp"
+                    android:background="@mipmap/icon_blue_no3" />
+            </RelativeLayout>
+        </LinearLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file