diff --git a/app/src/main/java/com/chwl/app/notify/GlobalNotifyManager.kt b/app/src/main/java/com/chwl/app/notify/GlobalNotifyManager.kt
index 5dae4bdd2..6f3287304 100644
--- a/app/src/main/java/com/chwl/app/notify/GlobalNotifyManager.kt
+++ b/app/src/main/java/com/chwl/app/notify/GlobalNotifyManager.kt
@@ -5,6 +5,8 @@ import androidx.lifecycle.lifecycleScope
 import com.alibaba.fastjson.JSON
 import com.chwl.app.NimMiddleActivity
 import com.chwl.app.avroom.activity.AVRoomActivity
+import com.chwl.app.avroom.anotherroompk.RoomPKCreateActivity
+import com.chwl.app.avroom.singleroompk.SingleRoomPKCreateActivity
 import com.chwl.app.base.TitleBar
 import com.chwl.app.other.activity.SplashActivity
 import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity
@@ -61,6 +63,8 @@ object GlobalNotifyManager : Observer<BroadcastMessage>, ILog {
         TreasureBoxActivity::class.java,
         BoxRankingActivity::class.java,
         TreasureBoxHonourActivity::class.java,
+        RoomPKCreateActivity::class.java,
+        SingleRoomPKCreateActivity::class.java,
         // 房间内私聊（该Activity用了透明主题且顶部区域还能看到房间页面，那就在房间页面展示飘屏即可）
         NimRoomP2PMessageActivity::class.java,
         RoomMsgActivity::class.java,
diff --git a/app/src/main/res/layout/activity_room_pk_create.xml b/app/src/main/res/layout/activity_room_pk_create.xml
index 8ef9cc472..afc625fe5 100644
--- a/app/src/main/res/layout/activity_room_pk_create.xml
+++ b/app/src/main/res/layout/activity_room_pk_create.xml
@@ -43,7 +43,7 @@
             android:layout_marginTop="40dp"
             android:text="@string/layout_activity_room_pk_create_02"
             android:textColor="@color/white"
-            android:textSize="16sp"
+            android:textSize="15sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title" />
 
@@ -121,7 +121,7 @@
             android:layout_marginTop="40dp"
             android:text="@string/layout_activity_room_pk_create_05"
             android:textColor="@color/white"
-            android:textSize="16sp"
+            android:textSize="15sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_pk_object" />
 
@@ -146,9 +146,13 @@
                 android:button="@null"
                 android:checked="true"
                 android:gravity="center"
+                app:autoSizeMaxTextSize="14sp"
+                app:autoSizeMinTextSize="7dp"
+                app:autoSizeStepGranularity="1px"
+                app:autoSizeTextType="uniform"
                 android:text="@string/layout_activity_room_pk_create_06"
                 android:textColor="@color/white"
-                android:textSize="15sp" />
+                android:textSize="14sp" />
 
             <RadioButton
                 android:id="@+id/rb_min_20"
@@ -159,9 +163,13 @@
                 android:background="@drawable/bg_room_pk_rb"
                 android:button="@null"
                 android:gravity="center"
+                app:autoSizeMaxTextSize="14sp"
+                app:autoSizeMinTextSize="7dp"
+                app:autoSizeStepGranularity="1px"
+                app:autoSizeTextType="uniform"
                 android:text="@string/layout_activity_room_pk_create_07"
                 android:textColor="@color/white"
-                android:textSize="15sp" />
+                android:textSize="14sp" />
 
             <RadioButton
                 android:id="@+id/rb_min_30"
@@ -172,9 +180,13 @@
                 android:background="@drawable/bg_room_pk_rb"
                 android:button="@null"
                 android:gravity="center"
+                app:autoSizeMaxTextSize="14sp"
+                app:autoSizeMinTextSize="7dp"
+                app:autoSizeStepGranularity="1px"
+                app:autoSizeTextType="uniform"
                 android:text="@string/layout_activity_room_pk_create_08"
                 android:textColor="@color/white"
-                android:textSize="15sp" />
+                android:textSize="14sp" />
 
         </RadioGroup>
 
@@ -187,11 +199,16 @@
             android:hint="@string/layout_activity_room_pk_create_09"
             android:inputType="number"
             android:maxLength="3"
-            android:paddingStart="20dp"
+            android:gravity="center_vertical"
+            app:autoSizeMaxTextSize="14sp"
+            app:autoSizeMinTextSize="7dp"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
+            android:paddingStart="10dp"
             android:paddingEnd="50dp"
             android:textColor="@color/white"
             android:textColorHint="@color/color_c6c6e9"
-            android:textSize="15dp"
+            android:textSize="12dp"
             app:layout_constraintStart_toStartOf="@id/rg"
             app:layout_constraintTop_toBottomOf="@id/rg" />
 
@@ -201,7 +218,7 @@
             android:layout_marginEnd="16dp"
             android:text="@string/layout_activity_room_pk_create_010"
             android:textColor="@color/white"
-            android:textSize="15sp"
+            android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="@id/edit_time"
             app:layout_constraintEnd_toEndOf="@id/edit_time"
             app:layout_constraintTop_toTopOf="@id/edit_time" />
@@ -213,7 +230,7 @@
             android:layout_marginTop="40dp"
             android:text="@string/layout_activity_room_pk_create_011"
             android:textColor="@color/white"
-            android:textSize="16sp"
+            android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="@id/tv_pk_time"
             app:layout_constraintTop_toBottomOf="@id/edit_time" />
 
@@ -225,11 +242,15 @@
             android:background="@drawable/bg_room_pk_common_btn"
             android:hint="@string/layout_activity_room_pk_create_012"
             android:maxLength="10"
-            android:paddingStart="20dp"
-            android:paddingEnd="50dp"
+            android:gravity="center_vertical"
+            android:paddingStart="10dp"
+            app:autoSizeMaxTextSize="14sp"
+            app:autoSizeMinTextSize="7dp"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
             android:textColor="@color/white"
             android:textColorHint="@color/color_c6c6e9"
-            android:textSize="15sp"
+            android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="@id/tv_pk_desc"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/edit_time"
diff --git a/app/src/main/res/layout/activity_single_room_pk_create.xml b/app/src/main/res/layout/activity_single_room_pk_create.xml
index efeca1697..268ea2db1 100644
--- a/app/src/main/res/layout/activity_single_room_pk_create.xml
+++ b/app/src/main/res/layout/activity_single_room_pk_create.xml
@@ -43,7 +43,7 @@
             android:layout_marginTop="40dp"
             android:text="@string/layout_activity_single_room_pk_create_02"
             android:textColor="@color/white"
-            android:textSize="16sp"
+            android:textSize="15sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title" />
 
@@ -121,7 +121,7 @@
             android:layout_marginTop="40dp"
             android:text="@string/layout_activity_single_room_pk_create_05"
             android:textColor="@color/white"
-            android:textSize="16sp"
+            android:textSize="15sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_pk_object" />
 
@@ -146,9 +146,13 @@
                 android:button="@null"
                 android:checked="true"
                 android:gravity="center"
+                app:autoSizeMaxTextSize="14sp"
+                app:autoSizeMinTextSize="7dp"
+                app:autoSizeStepGranularity="1px"
+                app:autoSizeTextType="uniform"
                 android:text="@string/layout_activity_single_room_pk_create_06"
                 android:textColor="@color/white"
-                android:textSize="15sp" />
+                android:textSize="14sp" />
 
             <RadioButton
                 android:id="@+id/rb_min_20"
@@ -158,10 +162,14 @@
                 android:layout_weight="1"
                 android:background="@drawable/bg_single_room_pk_rb"
                 android:button="@null"
+                app:autoSizeMaxTextSize="14sp"
+                app:autoSizeMinTextSize="7dp"
+                app:autoSizeStepGranularity="1px"
+                app:autoSizeTextType="uniform"
                 android:gravity="center"
                 android:text="@string/layout_activity_single_room_pk_create_07"
                 android:textColor="@color/white"
-                android:textSize="15sp" />
+                android:textSize="14sp" />
 
             <RadioButton
                 android:id="@+id/rb_min_30"
@@ -171,10 +179,14 @@
                 android:layout_weight="1"
                 android:background="@drawable/bg_single_room_pk_rb"
                 android:button="@null"
+                app:autoSizeMaxTextSize="14sp"
+                app:autoSizeMinTextSize="7dp"
+                app:autoSizeStepGranularity="1px"
+                app:autoSizeTextType="uniform"
                 android:gravity="center"
                 android:text="@string/layout_activity_single_room_pk_create_08"
                 android:textColor="@color/white"
-                android:textSize="15sp" />
+                android:textSize="14sp" />
 
         </RadioGroup>
 
@@ -186,12 +198,17 @@
             android:background="@drawable/bg_room_pk_common_btn"
             android:hint="@string/layout_activity_single_room_pk_create_09"
             android:inputType="number"
+            app:autoSizeMaxTextSize="14sp"
+            app:autoSizeMinTextSize="7dp"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
+            android:gravity="center_vertical"
             android:maxLength="3"
-            android:paddingStart="20dp"
+            android:paddingStart="10dp"
             android:paddingEnd="50dp"
             android:textColor="#FF43BDFF"
             android:textColorHint="@color/color_c6c6e9"
-            android:textSize="15dp"
+            android:textSize="12dp"
             app:layout_constraintStart_toStartOf="@id/rg"
             app:layout_constraintTop_toBottomOf="@id/rg" />
 
@@ -201,7 +218,7 @@
             android:layout_marginEnd="16dp"
             android:text="@string/layout_activity_single_room_pk_create_010"
             android:textColor="@color/white"
-            android:textSize="15sp"
+            android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="@id/edit_time"
             app:layout_constraintEnd_toEndOf="@id/edit_time"
             app:layout_constraintTop_toTopOf="@id/edit_time" />
@@ -213,7 +230,7 @@
             android:layout_marginTop="40dp"
             android:text="@string/layout_activity_single_room_pk_create_011"
             android:textColor="@color/white"
-            android:textSize="16sp"
+            android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="@id/tv_pk_time"
             app:layout_constraintTop_toBottomOf="@id/edit_time" />
 
@@ -222,14 +239,18 @@
             android:layout_width="0dp"
             android:layout_height="32dp"
             android:layout_marginEnd="12dp"
+            app:autoSizeMaxTextSize="15sp"
+            app:autoSizeMinTextSize="7dp"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
             android:background="@drawable/bg_room_pk_common_btn"
             android:hint="@string/layout_activity_single_room_pk_create_012"
             android:maxLength="10"
-            android:paddingStart="20dp"
-            android:paddingEnd="50dp"
+            android:paddingStart="10dp"
+            android:gravity="center_vertical"
             android:textColor="@color/white"
             android:textColorHint="@color/color_c6c6e9"
-            android:textSize="15sp"
+            android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="@id/tv_pk_desc"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/edit_time"
diff --git a/app/src/main/res/layout/dialog_gift_number.xml b/app/src/main/res/layout/dialog_gift_number.xml
index fb0ed58fd..b5f7cbf78 100644
--- a/app/src/main/res/layout/dialog_gift_number.xml
+++ b/app/src/main/res/layout/dialog_gift_number.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="135dp"
+    android:layout_width="@dimen/dp_155"
     android:layout_height="wrap_content"
+    android:minWidth="@dimen/dp_130"
     android:background="@drawable/shape_bg_dialog_gift_number"
     android:orientation="vertical">
 
@@ -10,25 +11,21 @@
         android:id="@+id/number_1"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_25"
-        android:layout_marginStart="@dimen/dp_21"
+        android:layout_marginStart="@dimen/dp_16"
         android:layout_marginTop="@dimen/dp_13"
-        android:layout_marginEnd="@dimen/dp_24"
+        android:layout_marginEnd="@dimen/dp_16"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <TextView
-            android:layout_width="@dimen/dp_50"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/layout_dialog_gift_number_01"
+            android:layout_weight="1"
             android:textColor="@color/white"
             android:textSize="@dimen/dp_11"
             tools:ignore="HardcodedText,SpUsage" />
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -43,24 +40,20 @@
         android:id="@+id/number_10"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_25"
-        android:layout_marginStart="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/dp_24"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <TextView
-            android:layout_width="@dimen/dp_50"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/layout_dialog_gift_number_02"
             android:textColor="@color/white"
             android:textSize="@dimen/dp_11"
+            android:layout_weight="1"
             tools:ignore="HardcodedText,SpUsage" />
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -74,24 +67,20 @@
         android:id="@+id/number_66"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_25"
-        android:layout_marginStart="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/dp_24"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <TextView
-            android:layout_width="@dimen/dp_50"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:text="@string/layout_dialog_gift_number_03"
             android:textColor="@color/white"
             android:textSize="@dimen/dp_11"
             tools:ignore="HardcodedText,SpUsage" />
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -105,24 +94,20 @@
         android:id="@+id/number_99"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_25"
-        android:layout_marginStart="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/dp_24"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <TextView
-            android:layout_width="@dimen/dp_50"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:text="@string/layout_dialog_gift_number_04"
             android:textColor="@color/white"
             android:textSize="@dimen/dp_11"
             tools:ignore="HardcodedText,SpUsage" />
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -136,24 +121,20 @@
         android:id="@+id/number_188"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_25"
-        android:layout_marginStart="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/dp_24"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <TextView
-            android:layout_width="@dimen/dp_50"
+            android:layout_weight="1"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/layout_dialog_gift_number_05"
             android:textColor="@color/white"
             android:textSize="@dimen/dp_11"
             tools:ignore="HardcodedText,SpUsage" />
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -167,24 +148,20 @@
         android:id="@+id/number_520"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_25"
-        android:layout_marginStart="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/dp_24"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <TextView
-            android:layout_width="@dimen/dp_50"
+            android:layout_weight="1"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/layout_dialog_gift_number_06"
             android:textColor="@color/white"
             android:textSize="@dimen/dp_11"
             tools:ignore="HardcodedText,SpUsage" />
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -198,25 +175,21 @@
         android:id="@+id/number_1314"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_25"
-        android:layout_marginStart="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/dp_24"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:layout_marginBottom="@dimen/dp_5"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <TextView
-            android:layout_width="@dimen/dp_50"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:text="@string/layout_dialog_gift_number_07"
             android:textColor="@color/white"
             android:textSize="@dimen/dp_11"
             tools:ignore="HardcodedText,SpUsage" />
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -230,25 +203,21 @@
         android:id="@+id/number_all"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_25"
-        android:layout_marginStart="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/dp_24"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:layout_marginBottom="@dimen/dp_5"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <TextView
-            android:layout_width="@dimen/dp_50"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:text="@string/layout_dialog_gift_number_08"
             android:textColor="@color/white"
             android:textSize="@dimen/dp_11"
             tools:ignore="HardcodedText,SpUsage" />
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -263,25 +232,21 @@
         android:id="@+id/number_manual"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_25"
-        android:layout_marginStart="@dimen/dp_21"
-        android:layout_marginEnd="@dimen/dp_24"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:layout_marginBottom="@dimen/dp_5"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
         <TextView
-            android:layout_width="@dimen/dp_50"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:text="@string/layout_dialog_gift_number_09"
             android:textColor="@color/white"
             android:textSize="@dimen/dp_11"
             tools:ignore="HardcodedText,SpUsage" />
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/list_item_dialog_gift.xml b/app/src/main/res/layout/list_item_dialog_gift.xml
index e08d26d90..751be7fc4 100644
--- a/app/src/main/res/layout/list_item_dialog_gift.xml
+++ b/app/src/main/res/layout/list_item_dialog_gift.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -56,6 +57,12 @@
             android:text="@{item.data().giftName}"
             android:textColor="@{item.isSelect ? @color/color_ffb606 : @color/white}"
             android:textSize="@dimen/dp_10"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:autoSizeMaxTextSize="@dimen/dp_10"
+            app:autoSizeMinTextSize="@dimen/dp_5"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
             tools:ignore="SpUsage"
             tools:text="123" />