From 11ac6690777a758ce25a7d030a37be87912ee12c Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Mon, 14 Oct 2024 18:23:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A4=BC=E7=89=A9=E6=A0=8F?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=EF=BC=8C=E5=AF=B9=E6=96=87=E5=AD=97=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E9=83=A8=E5=88=86=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/dialog_live_gift_popup2.xml    |  2 +-
 .../live/viewmodel/LivePositionViewModel.java | 41 ++++++++++++++++
 .../yunbao/live/viewmodel/ViewPosition.java   | 47 +++++++++++++++++++
 .../yunbao/live/views/LiveRoomViewHolder.java |  8 ++--
 live/src/main/res/layout/view_live_room.xml   |  4 +-
 live/src/main/res/layout/view_wish_list2.xml  |  3 +-
 6 files changed, 97 insertions(+), 8 deletions(-)
 create mode 100644 live/src/main/java/com/yunbao/live/viewmodel/ViewPosition.java

diff --git a/common/src/main/res/layout/dialog_live_gift_popup2.xml b/common/src/main/res/layout/dialog_live_gift_popup2.xml
index 2b69b1c36..a1f0f5d89 100644
--- a/common/src/main/res/layout/dialog_live_gift_popup2.xml
+++ b/common/src/main/res/layout/dialog_live_gift_popup2.xml
@@ -153,7 +153,7 @@
         android:layout_marginBottom="16dp"
         app:layout_constraintBottom_toTopOf="@+id/giftSendBgV"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintDimensionRatio="1.56"
+        app:layout_constraintDimensionRatio="1.5"
         app:layout_constraintStart_toStartOf="parent" />
 
     <View
diff --git a/live/src/main/java/com/yunbao/live/viewmodel/LivePositionViewModel.java b/live/src/main/java/com/yunbao/live/viewmodel/LivePositionViewModel.java
index a89c91189..e16fa00bf 100644
--- a/live/src/main/java/com/yunbao/live/viewmodel/LivePositionViewModel.java
+++ b/live/src/main/java/com/yunbao/live/viewmodel/LivePositionViewModel.java
@@ -1,13 +1,54 @@
 package com.yunbao.live.viewmodel;
 
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+
 import androidx.lifecycle.ViewModel;
 
 import com.yunbao.common.utils.SpUtil;
+import com.yunbao.live.R;
 
 //直播时候位置做的 viewModel 注意这里
 public class LivePositionViewModel extends ViewModel {
 
+    //值判断到此根节点的位置
+    private View RootView ;
 
+
+
+    /**
+     * 计算控件 Z 相对于 ViewGroupA 的位置
+     * @param child 当前控件 Z
+     * @param parent 目标 ViewGroupA
+     * @return 相对位置 [x, y]
+     */
+    public static int[] calculateRelativePosition(View child, View parent) {
+        int[] position = new int[2]; // 存储相对位置 [x, y]
+
+        child.getLocationInWindow(position);
+        child.getLocationOnScreen(position);
+        //child.getLocationInSurface(position);
+
+
+//        while (child != null && child != parent) {
+//            if (child instanceof ViewGroup) {
+//                ViewGroup viewGroup = (ViewGroup) child;
+//                int[] childLocation = new int[2];
+//                child.getLocationInParent(viewGroup);
+//                position[0] += childLocation[0];
+//                position[1] += childLocation[1];
+//            } else {
+//                int[] childLocation = new int[2];
+//                child.getLocationInParent((ViewGroup) child.getParent());
+//                position[0] += childLocation[0];
+//                position[1] += childLocation[1];
+//            }
+//            child = child.getParent() instanceof View ? (View) child.getParent() : null;
+//        }
+
+        return position;
+    }
 }
 
 
diff --git a/live/src/main/java/com/yunbao/live/viewmodel/ViewPosition.java b/live/src/main/java/com/yunbao/live/viewmodel/ViewPosition.java
new file mode 100644
index 000000000..fd0928b4a
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/viewmodel/ViewPosition.java
@@ -0,0 +1,47 @@
+package com.yunbao.live.viewmodel;
+
+public class ViewPosition {
+   private int x;
+   private int y;
+   private int width;
+   private int height;
+
+   public ViewPosition(int x, int y, int width, int height) {
+      this.x = x;
+      this.y = y;
+      this.width = width;
+      this.height = height;
+   }
+
+    public int getX() {
+        return x;
+    }
+
+    public void setX(int x) {
+        this.x = x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public void setY(int y) {
+        this.y = y;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+}
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 dfc28a828..236c622cd 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -2822,12 +2822,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         newDragonGroup.setVisibility(View.VISIBLE);
         isDragonTime = isTime;
         if (isTime) {
-            newDragonTv.setTextColor(ContextCompat.getColor(mContext, R.color.white));
-          //  newDragonTv.clearFocus();
+          //  newDragonTv.setTextColor(ContextCompat.getColor(mContext, R.color.white));
+            newDragonTv.clearFocus();
         } else {
-            newDragonTv.setTextColor(Color.parseColor("#F9BA03"));
+          //  newDragonTv.setTextColor(Color.parseColor("#F9BA03"));
             newDragonTv.setText(R.string.dragon_immediate_participation);
-            //  newDragonTv.requestFocus();
+            newDragonTv.requestFocus();
         }
     }
 
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index aed9547e1..868d05e6d 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -17,7 +17,7 @@
         <View
             android:id="@+id/group_1"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
             android:layout_marginStart="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="3.95"
@@ -112,7 +112,7 @@
             android:layout_height="wrap_content"
             android:includeFontPadding="false"
             android:textColor="#FFFFFF"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="1dp"
             android:textSize="8sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/good_nub_ico"
diff --git a/live/src/main/res/layout/view_wish_list2.xml b/live/src/main/res/layout/view_wish_list2.xml
index 2c2ab971b..e0ae54a5d 100644
--- a/live/src/main/res/layout/view_wish_list2.xml
+++ b/live/src/main/res/layout/view_wish_list2.xml
@@ -16,16 +16,17 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:src="@mipmap/ic_live_hot_rank"
         android:layout_marginStart="7dp"
+        android:layout_marginBottom="1dp"
         android:layout_width="11dp"
         android:layout_height="wrap_content" />
 
     <com.yunbao.common.views.weight.MarqueeTextView
         android:id="@+id/wish_index"
+        android:layout_marginBottom="1.3dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/wish_pic"
         android:layout_width="0dp"
-        android:layout_marginTop="1px"
         android:layout_height="wrap_content"
         tools:text="热度加成"
         android:ellipsize="marquee"