From 0e830e411aa226d6b4592e5d37682b7625d0567b Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Sun, 4 Jan 2026 11:16:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E6=9C=80=E5=B0=8F=E5=8C=96?=
=?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BF=94=E5=9B=9E=E9=97=AE=E9=A2=98=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=EF=BC=8CMainActivity=20=E7=AB=96=E5=B1=8F=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E3=80=82=E4=BA=92=E5=A8=B1=E6=88=BF=E9=AB=98=E5=BA=A6?=
=?UTF-8?q?340->370?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
MainModule/src/main/AndroidManifest.xml | 3 ++-
.../activity/room/activity/RoomActivity.kt | 12 +++++++++---
.../res/layout/fragment_friendship_room.xml | 2 +-
.../res/layout/news_rv_item_system_news.xml | 2 +-
app/proguard/creash.txt | 19 +++++++++++++++++++
app/src/main/AndroidManifest.xml | 1 +
6 files changed, 33 insertions(+), 6 deletions(-)
create mode 100644 app/proguard/creash.txt
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 @@
(),
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 @@
+ android:layout_height="@dimen/dp_370">
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" />