From b4e700397fa74a9f370d202702b8e9bb4516b704 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Mon, 8 Jan 2024 19:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5peko=EF=BC=9A=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=99=AE=E9=80=9A=E6=88=BF/=E7=89=8C=E7=85=A7?=
 =?UTF-8?q?=E6=88=BF=20=E4=B8=BB=E9=BA=A6=E4=BD=8D=E7=BD=AEUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../avroom/adapter/BaseMicroViewAdapter.java  |  2 +-
 .../drawable/room_ic_announcement_edit.xml    | 11 ++++
 app/src/main/res/layout/item_boss_micro.xml   | 62 ++++++++-----------
 3 files changed, 39 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/res/drawable/room_ic_announcement_edit.xml

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
index 0f2bb61e0..e2d7bbf74 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
@@ -527,7 +527,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
         /**
          * 主席位特有
          */
-        FrameLayout frTitle;
+        View frTitle;
         TextView tvRoomDesc;
         ImageView ivTag;
         TextView tvLabelLeaveMode;
diff --git a/app/src/main/res/drawable/room_ic_announcement_edit.xml b/app/src/main/res/drawable/room_ic_announcement_edit.xml
new file mode 100644
index 000000000..fb2f116f7
--- /dev/null
+++ b/app/src/main/res/drawable/room_ic_announcement_edit.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="9dp"
+    android:viewportWidth="8"
+    android:viewportHeight="9">
+  <path
+      android:pathData="M7.3829,3.4862L2.8651,8.6539C2.6726,8.8744 2.4071,8.9993 2.1296,9L0.8083,9C0.5918,8.9984 0.3849,8.9018 0.2332,8.7314C0.0815,8.5611 -0.0024,8.3311 0.0001,8.0924L0.0001,6.5477C-0.0006,6.2411 0.1088,5.9467 0.3043,5.7287L4.9038,0.6372L4.9674,0.5816C5.6308,-0.167 6.7139,-0.1968 7.4102,0.5145C7.7658,0.9068 7.9648,1.4394 7.9631,1.9942C7.9614,2.549 7.7591,3.0801 7.4011,3.4697L7.3829,3.4862ZM6.2205,0.9211C6.5146,0.922 6.7917,1.074 6.9697,1.3324C7.2621,1.7805 7.2118,2.3975 6.8516,2.7809L6.7971,2.8426L2.5199,7.7332C2.3274,7.9537 2.0619,8.0786 1.7844,8.0793L1.2441,8.0793C1.009,8.0763 0.8203,7.8643 0.8218,7.605L0.8218,6.9348C0.821,6.628 0.9304,6.3334 1.126,6.1153L4.4769,2.4053L5.3305,3.3299C5.4068,3.4128 5.5095,3.4594 5.6166,3.4596C5.7284,3.4606 5.8355,3.4097 5.9117,3.3194C6.0708,3.1362 6.0668,2.8459 5.9026,2.6682L5.0626,1.7571L5.4577,1.3209L5.4894,1.2913L5.5212,1.2638L5.5485,1.2327C5.7249,1.0326 5.9674,0.9201 6.2205,0.9211ZM5.8844,7.0276L7.5826,7.0276C7.8078,7.0194 7.9865,6.8156 7.9865,6.567C7.9865,6.3184 7.8078,6.1146 7.5826,6.1065L5.8844,6.1065C5.6592,6.1146 5.4805,6.3184 5.4805,6.567C5.4805,6.8156 5.6592,7.0194 5.8844,7.0276ZM7.5828,7.7817L4.7859,7.7817C4.5554,7.7818 4.3686,7.9878 4.3686,8.2421C4.3686,8.4963 4.5554,8.7023 4.7859,8.7024L7.5828,8.7024C7.8133,8.7023 8,8.4963 8,8.2421C8,7.9878 7.8133,7.7818 7.5828,7.7817Z"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.6"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/item_boss_micro.xml b/app/src/main/res/layout/item_boss_micro.xml
index c3ec2b58f..06b855bfe 100644
--- a/app/src/main/res/layout/item_boss_micro.xml
+++ b/app/src/main/res/layout/item_boss_micro.xml
@@ -13,7 +13,7 @@
         android:id="@+id/micro_layout"
         android:layout_width="@dimen/dp_room_boss_mic_header_wear_radius"
         android:layout_height="@dimen/dp_room_boss_mic_header_wear_radius"
-        android:layout_marginStart="@dimen/dp_10"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -111,7 +111,6 @@
             android:layout_gravity="center"
             tools:visibility="visible" />
 
-
     </FrameLayout>
 
     <TextView
@@ -128,7 +127,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@string/layout_item_boss_micro_01" />
+        tools:text="@string/layout_item_boss_micro_01"
+        tools:visibility="visible" />
 
     <ImageView
         android:id="@+id/iv_tag"
@@ -136,10 +136,12 @@
         android:layout_height="15dp"
         android:layout_marginEnd="@dimen/dp_5"
         android:visibility="gone"
-        app:layout_constraintEnd_toStartOf="@+id/nick"
+        app:layout_constraintBottom_toBottomOf="@id/nick"
+        app:layout_constraintEnd_toStartOf="@id/nick"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="@id/micro_layout"
-        app:layout_constraintTop_toBottomOf="@id/micro_layout"
+        app:layout_constraintTop_toTopOf="@id/nick"
+        tools:background="@color/red_font"
         tools:layout_width="15dp"
         tools:visibility="visible" />
 
@@ -147,6 +149,7 @@
         android:id="@+id/nick"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxWidth="52dp"
@@ -155,9 +158,9 @@
         android:text=""
         android:textColor="@color/white"
         android:textSize="@dimen/sp_10"
-        app:layout_constraintEnd_toEndOf="@id/micro_layout"
+        app:layout_constraintEnd_toStartOf="@id/ll_charm_click"
         app:layout_constraintStart_toEndOf="@+id/iv_tag"
-        app:layout_constraintTop_toTopOf="@id/iv_tag"
+        app:layout_constraintTop_toBottomOf="@id/micro_layout"
         tools:text="Name" />
 
     <LinearLayout
@@ -165,14 +168,15 @@
         android:layout_width="wrap_content"
         android:layout_height="16dp"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/dp_6"
+        android:layout_marginStart="@dimen/dp_4"
         android:background="@drawable/shape_bg_of_mic_charm"
         android:orientation="horizontal"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
+        app:layout_constraintBottom_toBottomOf="@id/nick"
         app:layout_constraintEnd_toEndOf="@id/micro_layout"
-        app:layout_constraintStart_toStartOf="@id/micro_layout"
-        app:layout_constraintTop_toBottomOf="@+id/nick">
+        app:layout_constraintStart_toEndOf="@id/nick"
+        app:layout_constraintTop_toTopOf="@+id/nick">
 
         <ImageView
             android:layout_width="11dp"
@@ -195,39 +199,27 @@
 
     </LinearLayout>
 
-    <FrameLayout
+    <LinearLayout
         android:id="@+id/fr_title"
-        android:layout_width="0dp"
-        android:layout_height="76dp"
-        android:layout_marginStart="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_10"
-        android:layout_marginEnd="80dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="11dp"
         android:layout_toEndOf="@+id/micro_layout"
-        android:background="@drawable/bg_micro_title"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/micro_layout"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintEnd_toEndOf="@id/micro_layout"
+        app:layout_constraintStart_toStartOf="@id/micro_layout"
+        app:layout_constraintTop_toBottomOf="@id/nick">
 
         <TextView
             android:id="@+id/tv_room_desc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:textColor="@color/color_75FBE2"
-            android:textSize="@dimen/sp_10" />
+            android:drawablePadding="@dimen/dp_4"
+            android:textColor="#b2ffffff"
+            android:textSize="@dimen/sp_10"
+            app:drawableEndCompat="@drawable/room_ic_announcement_edit"
+            tools:text="NNNNN" />
 
-    </FrameLayout>
-
-    <ImageView
-        android:id="@+id/iv_red_package"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:scaleType="centerInside"
-        android:src="@drawable/room_red_package_in"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="gone" />
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file