diff --git a/MainModule/src/main/AndroidManifest.xml b/MainModule/src/main/AndroidManifest.xml
index d003ca62..9a183c63 100644
--- a/MainModule/src/main/AndroidManifest.xml
+++ b/MainModule/src/main/AndroidManifest.xml
@@ -10,7 +10,6 @@
         <activity
             android:name=".activity.user.activity.PropMallActivity"
             android:exported="false"
-            android:label="@string/title_activity_prop_mall"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".activity.GroupUserListActivity"
@@ -43,6 +42,7 @@
             android:exported="false" />
         <activity
             android:name=".activity.user.activity.HeartCpActivity"
+            android:screenOrientation="portrait"
             android:exported="false" />
         <activity
             android:name=".activity.user.activity.RelationshipActivity"
@@ -70,6 +70,7 @@
             android:exported="false" />
         <activity
             android:name=".activity.main.activity.MainActivity"
+            android:screenOrientation="portrait"
             android:configChanges="fontScale" />
         <activity
             android:name=".activity.room.activity.RoomActivity"
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
index 3d94f8c7..2ad0da9e 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
@@ -2787,10 +2787,16 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             appStateListener!!.isAppInBackground = true
         }
 //        QXGiftPlayerManager.getInstance(applicationContext).destroyEffectSvga()
-        if (ActivityUtils.getActivityList().size <= 1) {
+        var isSkip = false
+        for (activity in ActivityUtils.getActivityList()) {
+            if (activity !is RoomActivity && activity !is TransparentActivity) {
+                singleTaskToActivity(activity::class.java)
+                isSkip = true
+                break
+            }
+        }
+        if (!isSkip) {
             singleTaskToActivity(MainActivity::class.java)
-        } else {
-            singleTaskToActivity(ActivityUtils.getActivityList()[1]::class.java)
         }
     }
 
diff --git a/MainModule/src/main/res/layout/fragment_friendship_room.xml b/MainModule/src/main/res/layout/fragment_friendship_room.xml
index ca14806e..95dfac8e 100644
--- a/MainModule/src/main/res/layout/fragment_friendship_room.xml
+++ b/MainModule/src/main/res/layout/fragment_friendship_room.xml
@@ -6,7 +6,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_340">
+        android:layout_height="@dimen/dp_370">
 
 
         <com.xscm.moduleutil.widget.RoomFriendshipWheatView
diff --git a/MainModule/src/main/res/layout/news_rv_item_system_news.xml b/MainModule/src/main/res/layout/news_rv_item_system_news.xml
index 5a373009..fb4bfe98 100644
--- a/MainModule/src/main/res/layout/news_rv_item_system_news.xml
+++ b/MainModule/src/main/res/layout/news_rv_item_system_news.xml
@@ -33,7 +33,7 @@
             android:backgroundTint="#EFF2F8"
             android:gravity="left|center"
             android:padding="@dimen/dp_12"
-            android:text="系统消息"
+            tools:text="系统消息"
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/sp_14" />
 
diff --git a/app/proguard/creash.txt b/app/proguard/creash.txt
new file mode 100644
index 00000000..192792ed
--- /dev/null
+++ b/app/proguard/creash.txt
@@ -0,0 +1,19 @@
+java.lang.NullPointerException: Attempt to invoke virtual method 'java.lang.String com.xscm.moduleutil.bean.room.RoomOwnerBean.getUser_id()' on a null object reference
+	at com.xscm.modulemain.activity.room.fragment.RoomCabinFragment.initView(SourceFile:73)
+	at com.xscm.moduleutil.base.BaseFragment.onViewCreated(SourceFile:17)
+	at com.xscm.moduleutil.base.BaseMvpFragment.onViewCreated(SourceFile:7)
+	at com.xscm.moduleutil.base.BaseRoomFragment.onViewCreated(SourceFile:1)
+	at androidx.fragment.app.Fragment.performViewCreated(SourceFile:5)
+	at androidx.fragment.app.c0.f(SourceFile:263)
+	at androidx.fragment.app.c0.m(SourceFile:119)
+	at androidx.fragment.app.FragmentManager.m0(SourceFile:231)
+	at androidx.fragment.app.FragmentManager.F1(SourceFile:82)
+	at androidx.fragment.app.FragmentManager.j0(SourceFile:22)
+	at androidx.fragment.app.FragmentManager$f.run(SourceFile:4)
+	at android.os.Handler.handleCallback(Handler.java:883)
+	at android.os.Handler.dispatchMessage(Handler.java:100)
+	at android.os.Looper.loop(Looper.java:230)
+	at android.app.ActivityThread.main(ActivityThread.java:8018)
+	at java.lang.reflect.Method.invoke(Native Method)
+	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:526)
+	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1034
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 54847f0a..d2dfe73d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -180,6 +180,7 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:exported="false"
             android:launchMode="singleTop"
+            android:screenOrientation="behind"
             android:theme="@style/authsdk_activity_dialog" />
 
         <!--        <activity-->