feat: 美颜参数

room/src/main/java/com/swago/room/anchor/AnchorRoomActivity.kt

@@ -192,7 +192,7 @@ class AnchorRoomActivity : AbsAnchorActivity<ActivityAnchorRoomBinding, IRoomInf
             }
         })
 
-        binding.ivBeauty.setOnClickListener(object : NoDoubleClickListener() {
+        binding.tvBeauty.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
                 BeautyDialogFragment().show(supportFragmentManager, "BeautyDialogFragment")
             }
@@ -205,7 +205,7 @@ class AnchorRoomActivity : AbsAnchorActivity<ActivityAnchorRoomBinding, IRoomInf
                 roomType = RoomType.VIDEO
                 binding.viewAudio.visibility = View.INVISIBLE
                 binding.viewVideo.visibility = View.VISIBLE
-                binding.ivBeauty.visibility = View.VISIBLE
+                binding.tvBeauty.visibility = View.VISIBLE
                 binding.tvVideo.setTextColor(ContextCompat.getColor(AppContext.getContext(),R.color._ffffff))
                 binding.tvAudio.setTextColor(ContextCompat.getColor(AppContext.getContext(),R.color._d4ffffff))
                 UserInfo.getUserInfo()?.let {
@@ -233,7 +233,7 @@ class AnchorRoomActivity : AbsAnchorActivity<ActivityAnchorRoomBinding, IRoomInf
                 roomType = RoomType.AUDIO
                 binding.viewAudio.visibility = View.VISIBLE
                 binding.viewVideo.visibility = View.INVISIBLE
-                binding.ivBeauty.visibility = View.GONE
+                binding.tvBeauty.visibility = View.GONE
                 binding.tvVideo.setTextColor(ContextCompat.getColor(AppContext.getContext(),R.color._d4ffffff))
                 binding.tvAudio.setTextColor(ContextCompat.getColor(AppContext.getContext(),R.color._ffffff))
                 AgoraManager.stopPreviewAndRemoveLocalView(binding.flLocal)

room/src/main/res/layout/activity_anchor_room.xml

@@ -98,6 +98,53 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
+            <TextView
+                android:id="@+id/tvBeauty"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="24dp"
+                android:drawableTop="@mipmap/wish_gift"
+                android:drawablePadding="4dp"
+                android:text="@string/beauty_filter"
+                android:textColor="#ffffff"
+                android:layout_marginTop="3dp"
+                android:textSize="14dp"/>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginBottom="24dp">
+                <TextView
+                    android:id="@+id/tvWishGift"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@mipmap/wish_gift"
+                    android:drawablePadding="4dp"
+                    android:text="@string/wish_gift"
+                    android:textColor="#ffffff"
+                    android:textSize="14dp"
+                    android:layout_marginTop="3dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/tvNew"/>
+                <TextView
+                    android:id="@+id/tvNew"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/shape_ff56b7_14"
+                    android:gravity="center"
+                    android:paddingStart="3dp"
+                    android:paddingEnd="3dp"
+                    android:text="New"
+                    android:textColor="#ffffff"
+                    android:textSize="10dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
             <CheckBox
                 android:id="@+id/cbPassword"
                 android:layout_width="wrap_content"
@@ -106,24 +153,12 @@
                 android:textColor="#ffffff"
                 android:textSize="14dp"
                 android:button="@null"
+                android:layout_marginTop="3dp"
                 android:text="@string/lock_room_off"
                 android:drawablePadding="4dp"
                 android:gravity="center_horizontal"
                 android:background="@android:color/transparent"
-                android:layout_marginBottom="24dp"
-                android:layout_marginEnd="@dimen/dp_10"/>
-
-            <TextView
-                android:id="@+id/tvWishGift"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="24dp"
-                android:drawableTop="@mipmap/wish_gift"
-                android:drawablePadding="4dp"
-                android:text="@string/wish_gift"
-                android:textColor="#ffffff"
-                android:textSize="14dp"
-                android:layout_marginStart="@dimen/dp_10"/>
+                android:layout_marginBottom="24dp"/>
 
         </LinearLayout>
 
@@ -165,22 +200,6 @@
 
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/tvNew"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-5dp"
-            android:layout_marginEnd="-5dp"
-            android:background="@drawable/shape_ff56b7_14"
-            android:gravity="center"
-            android:paddingStart="3dp"
-            android:paddingEnd="3dp"
-            android:text="New"
-            android:textColor="#ffffff"
-            android:textSize="10dp"
-            app:layout_constraintEnd_toEndOf="@+id/ll_change"
-            app:layout_constraintTop_toTopOf="@+id/ll_change" />
-
 
         <com.swago.baseswago.cusview.BoldTextView
             android:id="@+id/tvStartLive"
@@ -191,27 +210,13 @@
             android:background="@drawable/shape_ff56b7_37"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/ivBeauty"
+            app:layout_constraintEnd_toEndOf="parent"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
             android:layout_marginBottom="73dp"
             android:layout_width="0dp"
             android:layout_height="44dp"/>
 
-        <ImageView
-            android:id="@+id/ivBeauty"
-            app:layout_constraintStart_toEndOf="@+id/tvStartLive"
-            app:layout_constraintTop_toTopOf="@+id/tvStartLive"
-            app:layout_constraintBottom_toBottomOf="@+id/tvStartLive"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginEnd="24dp"
-            android:background="@drawable/shape_20000000_41"
-            android:padding="10dp"
-            android:visibility="visible"
-            android:src="@mipmap/icon_beauty"
-            android:layout_width="44dp"
-            android:layout_height="44dp"/>
-
 
         <LinearLayout
             android:id="@+id/llVideo"