From dde2eeddbaf07246da7c2c352e7d49ec63fddcd2 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 28 三月 2025 14:56:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/AndroidManifest.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f471d9e..99381b1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,7 +83,13 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.FirstApp"
- tools:targetApi="31">
+ tools:targetApi="31"
+ android:usesCleartextTraffic="true"
+ >
+ <activity
+ android:name=".activity.VipActivity"
+ android:exported="false"
+ android:theme="@style/Theme.FirstApp" />
<activity
android:name=".ui.reminderOther.ReminderOtherAddActivity2"
android:configChanges="orientation|keyboardHidden|screenSize"
@@ -106,11 +112,17 @@
android:exported="false" />
<activity
android:name=".activity.PickupActivity"
- android:exported="false"/>
+ android:exported="false" />
<activity
android:name=".activity.ContentDetailActivity"
- android:theme="@style/Theme.ContentDetail"
- android:exported="false" />
+ android:exported="false"
+ android:theme="@style/Theme.ContentDetail" />
+ <activity
+ android:name=".ui.profile.EditProfileActivity"
+ android:exported="false"/>
+ <activity
+ android:name=".ui.invitation.InvitationActivity"
+ android:exported="false"/>
</application>
--
Gitblit v1.9.3