From fab25bd4f6e8fb8d994f749f229632b43e665866 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Tue, 7 Nov 2023 19:48:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=A5=BD=E5=8F=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8&=E7=B2=89=E4=B8=9D=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=9B=BE=E6=A0=87=E5=B1=95=E7=A4=BA=E8=BF=87?=
 =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nnbc123/app/avroom/widget/MessageView.java   | 6 +++---
 app/src/main/res/layout/activity_user_info.xml            | 4 ++--
 app/src/main/res/layout/dialog_user_info.xml              | 4 ++--
 app/src/main/res/layout/fans_list_item_new.xml            | 8 ++++----
 app/src/main/res/layout/fragment_me.xml                   | 4 ++--
 app/src/main/res/layout/list_item_friend_new.xml          | 8 ++++----
 app/src/main/res/layout/list_item_online_user.xml         | 4 ++--
 .../module_community/res/layout/layout_dy_nick_detail.xml | 4 ++--
 app/src/module_labour_union/res/layout/item_member.xml    | 4 ++--
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java b/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java
index 0d278c39e..8b530df8b 100644
--- a/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java
+++ b/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java
@@ -284,9 +284,9 @@ public class MessageView extends FrameLayout {
         sysIconHeight = Utils.dip2px(context, 14);
         smallFace = Utils.dip2px(context, 22);
         bigFace = Utils.dip2px(context, 30);
-        //经验等级图片后台已经更换尺寸了，公屏同步下，尺寸是38:18
-        expLevelHeight = Utils.dip2px(context, 18);
-        expLevelWidth = expLevelHeight * 38 / 18;//expLevelHeight * 114 / 45
+        //经验等级图片后台已经更换尺寸了，公屏同步下，尺寸是36:19
+        expLevelHeight = Utils.dip2px(context, 19);
+        expLevelWidth = expLevelHeight * 36 / 19;
         giftLength = Utils.dip2px(context, 35);
         // 内容区域
         layoutManger = new LinearLayoutManager(context, RecyclerView.VERTICAL, false);
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index 91735e5d4..e49b09d0e 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -223,7 +223,7 @@
                                     <androidx.appcompat.widget.AppCompatImageView
                                         android:id="@+id/iv_user_level"
                                         android:layout_width="wrap_content"
-                                        android:layout_height="@dimen/dp_17"
+                                        android:layout_height="19dp"
                                         android:layout_marginEnd="@dimen/dp_4"
                                         android:adjustViewBounds="true"
                                         android:visibility="visible"
@@ -232,7 +232,7 @@
                                     <androidx.appcompat.widget.AppCompatImageView
                                         android:id="@+id/iv_user_charm"
                                         android:layout_width="wrap_content"
-                                        android:layout_height="@dimen/dp_17"
+                                        android:layout_height="19dp"
                                         android:layout_marginEnd="3dp"
                                         android:adjustViewBounds="true"
                                         android:visibility="visible"
diff --git a/app/src/main/res/layout/dialog_user_info.xml b/app/src/main/res/layout/dialog_user_info.xml
index f6ab7d851..19dee0133 100644
--- a/app/src/main/res/layout/dialog_user_info.xml
+++ b/app/src/main/res/layout/dialog_user_info.xml
@@ -178,7 +178,7 @@
                     <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/iv_user_level"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
+                        android:layout_height="19dp"
                         android:layout_marginEnd="@dimen/dp_5"
                         android:adjustViewBounds="true"
                         android:visibility="gone"
@@ -188,7 +188,7 @@
                     <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/iv_user_charm"
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/dp_20"
+                        android:layout_height="19dp"
                         android:layout_marginEnd="5dp"
                         android:adjustViewBounds="true"
                         android:visibility="gone"
diff --git a/app/src/main/res/layout/fans_list_item_new.xml b/app/src/main/res/layout/fans_list_item_new.xml
index fd3efb1fa..e5ebc8d1e 100644
--- a/app/src/main/res/layout/fans_list_item_new.xml
+++ b/app/src/main/res/layout/fans_list_item_new.xml
@@ -71,8 +71,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_noble_level"
-                android:layout_width="17dp"
-                android:layout_height="17dp"
+                android:layout_width="36dp"
+                android:layout_height="19dp"
                 android:layout_marginEnd="2dp"
                 android:visibility="gone"
                 tools:src="@mipmap/ic_user_level_king"
@@ -80,8 +80,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_user_level"
-                android:layout_width="@dimen/dp_19"
-                android:layout_height="@dimen/dp_19"
+                android:layout_width="36dp"
+                android:layout_height="19dp"
                 android:layout_marginEnd="2dp"
                 android:scaleType="fitCenter"
                 android:visibility="gone"
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 76062f56d..14da2f33b 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -191,7 +191,7 @@
                         <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/iv_user_level"
                             android:layout_width="wrap_content"
-                            android:layout_height="17dp"
+                            android:layout_height="19dp"
                             android:layout_marginEnd="@dimen/dp_3"
                             android:adjustViewBounds="true"
                             android:visibility="visible"
@@ -200,7 +200,7 @@
                         <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/iv_user_charm"
                             android:layout_width="wrap_content"
-                            android:layout_height="17dp"
+                            android:layout_height="19dp"
                             android:layout_marginEnd="3dp"
                             android:adjustViewBounds="true"
                             android:visibility="visible"
diff --git a/app/src/main/res/layout/list_item_friend_new.xml b/app/src/main/res/layout/list_item_friend_new.xml
index 79a5c2843..1f14698ed 100644
--- a/app/src/main/res/layout/list_item_friend_new.xml
+++ b/app/src/main/res/layout/list_item_friend_new.xml
@@ -80,8 +80,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_user_level"
-                android:layout_width="@dimen/dp_19"
-                android:layout_height="@dimen/dp_19"
+                android:layout_width="36dp"
+                android:layout_height="19dp"
                 android:layout_marginEnd="2dp"
                 android:scaleType="fitCenter"
                 android:visibility="gone"
@@ -91,8 +91,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_charm_level"
-                android:layout_width="@dimen/dp_19"
-                android:layout_height="@dimen/dp_19"
+                android:layout_width="36dp"
+                android:layout_height="19dp"
                 android:layout_marginEnd="2dp"
                 android:scaleType="fitCenter"
                 android:visibility="gone"
diff --git a/app/src/main/res/layout/list_item_online_user.xml b/app/src/main/res/layout/list_item_online_user.xml
index 44c912742..21e2ed95e 100644
--- a/app/src/main/res/layout/list_item_online_user.xml
+++ b/app/src/main/res/layout/list_item_online_user.xml
@@ -122,7 +122,7 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_user_exper"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_20"
+            android:layout_height="19dp"
             android:layout_marginEnd="@dimen/dp_5"
             android:adjustViewBounds="true"
             android:minWidth="@dimen/dp_25"
@@ -133,7 +133,7 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_user_charm"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_20"
+            android:layout_height="19dp"
             android:layout_marginEnd="5.5dp"
             android:adjustViewBounds="true"
             android:minWidth="@dimen/dp_25"
diff --git a/app/src/module_community/res/layout/layout_dy_nick_detail.xml b/app/src/module_community/res/layout/layout_dy_nick_detail.xml
index ea6ebb310..b4419b986 100644
--- a/app/src/module_community/res/layout/layout_dy_nick_detail.xml
+++ b/app/src/module_community/res/layout/layout_dy_nick_detail.xml
@@ -77,7 +77,7 @@
     <ImageView
         android:id="@+id/iv_user_wealth_level"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_20"
+        android:layout_height="19dp"
         android:layout_marginTop="@dimen/dp_5"
         android:adjustViewBounds="true"
         android:scaleType="fitXY"
@@ -88,7 +88,7 @@
     <ImageView
         android:id="@+id/iv_user_charm_level"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_20"
+        android:layout_height="19dp"
         android:layout_marginStart="5dp"
         android:adjustViewBounds="true"
         android:scaleType="fitXY"
diff --git a/app/src/module_labour_union/res/layout/item_member.xml b/app/src/module_labour_union/res/layout/item_member.xml
index 743e966dc..c69841e31 100644
--- a/app/src/module_labour_union/res/layout/item_member.xml
+++ b/app/src/module_labour_union/res/layout/item_member.xml
@@ -75,7 +75,7 @@
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_user_level"
                 android:layout_width="wrap_content"
-                android:layout_height="17dp"
+                android:layout_height="19dp"
                 android:layout_marginStart="3dp"
                 android:layout_marginEnd="2dp"
                 android:visibility="gone"
@@ -85,7 +85,7 @@
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_user_charm_level"
                 android:layout_width="wrap_content"
-                android:layout_height="17dp"
+                android:layout_height="19dp"
                 android:layout_marginStart="3dp"
                 android:layout_marginEnd="2dp"
                 android:visibility="gone"