合并1

BaseModule/src/main/res/drawable/bg_me_gift_wall.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+       xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+            android:startColor="#fff7d1ff"
+            android:endColor="#ffe477ff"
+            android:angle="0"/>
+    <corners
+            android:topLeftRadius="10dp"
+            android:topRightRadius="10dp"
+            android:bottomLeftRadius="10dp"
+            android:bottomRightRadius="10dp"/>
+</shape>

BaseModule/src/main/res/drawable/bg_me_wallet.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+       xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+
+            android:startColor="#FFF1C2"
+            android:endColor="#FFd762"
+            android:angle="0"
+            />
+    <corners
+            android:topLeftRadius="10dp"
+            android:topRightRadius="10dp"
+            android:bottomLeftRadius="10dp"
+            android:bottomRightRadius="10dp"/>
+</shape>

BaseModule/src/main/res/drawable/bg_r4_2a2925.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+       xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#2A2925" />
+    <corners android:radius="@dimen/dp_4"/>
+</shape>

BaseModule/src/main/res/drawable/bg_r6_2a2a4e.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+       xmlns:android="http://schemas.android.com/apk/res/android">
+        <solid android:color="#4d2a2a4e" />
+        <corners android:topLeftRadius="6dp" android:topRightRadius="6dp" android:bottomLeftRadius="6dp" android:bottomRightRadius="6dp" />
+    </shape>

BaseModule/src/main/res/drawable/bg_r8_f8f6c7_fffff.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+       xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+            android:type="linear"
+            android:useLevel="true"
+            android:startColor="#F8F6C7"
+            android:endColor="#ffffffff"
+            android:angle="0"/>
+    <corners
+            android:topLeftRadius="8dp"
+            android:topRightRadius="8dp"
+            android:bottomLeftRadius="8dp"
+            android:bottomRightRadius="8dp"/>
+</shape>

BaseModule/src/main/res/drawable/tab_indicator_bg.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 用item标签限制整体尺寸：maxWidth=100dp，height=10dp（与tabIndicatorHeight一致） -->
+    <item
+        android:height="@dimen/dp_25"
+        android:gravity="center"
+        android:maxWidth="@dimen/dp_20">
+        <!-- 最大宽度（根据需求调整） -->
+        <!-- 固定高度（与tabIndicatorHeight匹配） -->
+        <!-- 图片在item内居中 -->
+        <!-- 嵌套bitmap设置图片资源和缩放模式 -->
+        <bitmap
+            android:dither="true"
+            android:scaleType="center"
+            android:src="@mipmap/tab_dy" />
+        <!-- 你的图片资源 -->
+        <!-- 等比例缩放，确保图片在maxWidth和height内完整显示 -->
+        <!-- 抗锯齿优化 -->
+    </item>
+</layer-list>

BaseModule/src/main/res/layout/item_gift_room.xml

@@ -5,15 +5,13 @@
     android:id="@+id/cl_gift"
     android:layout_width="@dimen/dp_77"
     android:layout_height="@dimen/dp_119"
-    android:background="@mipmap/gift_bj"
-    >
+    android:background="@mipmap/gift_bj">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_iv_down_on"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:ignore="MissingConstraints"
-       >
+        tools:ignore="MissingConstraints">
 
 
         <ImageView
@@ -44,8 +42,7 @@
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tv_gift_name"
@@ -63,10 +60,10 @@
             android:id="@+id/tv_gift_price"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="1"
+            android:layout_marginBottom="@dimen/dp_5"
             android:drawableLeft="@mipmap/jinb"
             android:drawablePadding="@dimen/dp_3"
-            android:layout_marginBottom="@dimen/dp_5"
+            android:text="1"
             android:textColor="@color/color_FFFFBC00"
             android:textSize="11sp"
             app:layout_constraintLeft_toLeftOf="@+id/iv_gift_pic"
@@ -79,13 +76,22 @@
             android:layout_height="@dimen/dp_13"
             android:layout_gravity="center_horizontal"
             android:background="@mipmap/text_bj"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             android:gravity="center"
             android:text="x30"
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/sp_10"
-            android:visibility="gone"/>
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <ImageView
+        android:id="@+id/iv_gift_select"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitCenter"
+        android:src="@mipmap/noble_is_lock"
+        android:visibility="gone"
+        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>

BaseModule/src/main/res/layout/me_view_decoration_head.xml

@@ -1,58 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   android:layout_width="wrap_content"
+                                                   android:layout_height="wrap_content"
+                                                   android:clipChildren="false"
+                                                   android:clipToPadding="false"
+                                                   xmlns:tools="http://schemas.android.com/tools">
 
     <com.xscm.moduleutil.widget.GifAvatarOvalView
-        android:id="@+id/riv"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/me_avatar_bg"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.90154"
-        android:src="@mipmap/default_avatar"
-        app:riv_oval="true" />
+            android:id="@+id/riv"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="@drawable/me_avatar_bg"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintWidth_percent="0.90154"
+            android:src="@mipmap/default_avatar"
+            app:riv_oval="true"/>
 
     <ImageView
-        android:id="@+id/iv_sex"
-        android:layout_width="@dimen/dp_16"
-        android:layout_height="@dimen/dp_16"
-        android:background="@mipmap/nan"
-        android:visibility="gone"
-        tools:visibility="visible"
-        app:layout_constraintBottom_toBottomOf="@id/riv"
-        app:layout_constraintEnd_toEndOf="@id/riv"
-        />
+            android:id="@+id/iv_sex"
+            android:layout_width="@dimen/dp_16"
+            android:layout_height="@dimen/dp_16"
+            android:background="@mipmap/nan"
+            android:visibility="gone"
+            tools:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="@id/riv"
+            app:layout_constraintEnd_toEndOf="@id/riv"
+            />
 
     <com.xscm.moduleutil.widget.AvatarFrameView
-        android:id="@+id/iv_frame"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:contentDescription="@null"
-        android:scaleType="fitXY"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+            android:id="@+id/iv_frame"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:contentDescription="@null"
+            android:scaleType="fitXY"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+    <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent="0.58"
+          />
 
     <ImageView
-        android:id="@+id/iv_online"
-        android:layout_width="@dimen/dp_13"
-        android:layout_height="@dimen/dp_13"
-        android:src="@mipmap/me_online_icon"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@id/riv"
-        app:layout_constraintEnd_toEndOf="@id/riv"
-        app:layout_constraintHorizontal_bias="0.9"
-        app:layout_constraintStart_toStartOf="@id/riv"
-        app:layout_constraintTop_toTopOf="@id/riv"
-        app:layout_constraintVertical_bias="0.9" />
+            android:id="@+id/iv_frame_bg"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:contentDescription="@null"
+            android:scaleType="fitXY"
+            tools:src="@mipmap/me_sj"
+            app:layout_constraintTop_toTopOf="@+id/guideline"
+            app:layout_constraintWidth_default="spread"
+            app:layout_constraintHeight_default="spread"
+          />
+
+    <ImageView
+            android:id="@+id/iv_online"
+            android:layout_width="@dimen/dp_13"
+            android:layout_height="@dimen/dp_13"
+            android:src="@mipmap/me_online_icon"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@id/riv"
+            app:layout_constraintEnd_toEndOf="@id/riv"
+            app:layout_constraintHorizontal_bias="0.9"
+            app:layout_constraintStart_toStartOf="@id/riv"
+            app:layout_constraintTop_toTopOf="@id/riv"
+            app:layout_constraintVertical_bias="0.9"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>