From 66a4a5c3aa78869a3c51e79f2a6a610c99016c24 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 16 四月 2025 08:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/AndroidManifest.xml | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 99381b1..17c8460 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,9 +83,33 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.FirstApp"
- tools:targetApi="31"
android:usesCleartextTraffic="true"
- >
+ tools:targetApi="31">
+ <activity
+ android:name=".activity.AboutCompanyActivity"
+ android:exported="false" />
+ <activity
+ android:name=".activity.SettingActivity"
+ android:configChanges="orientation|keyboardHidden|screenSize"
+ android:exported="false"
+ android:label="@string/title_activity_setting"
+ android:theme="@style/Theme.FirstApp.Fullscreen" />
+ <activity
+ android:name=".pay.wxpay.WXPayEntryActivity"
+ android:exported="true"
+ android:launchMode="singleTop" /> <!-- 微信支付回调组件别名 -->
+ <activity-alias
+ android:name="${applicationId}.wxapi.WXPayEntryActivity"
+ android:exported="true"
+ android:targetActivity=".pay.wxpay.WXPayEntryActivity"
+ android:theme="@android:style/Theme.NoDisplay" />
+
+ <provider
+ android:name="androidx.startup.InitializationProvider"
+ android:authorities="${applicationId}.androidx-startup"
+ android:exported="false"
+ tools:node="remove" />
+
<activity
android:name=".activity.VipActivity"
android:exported="false"
@@ -119,11 +143,18 @@
android:theme="@style/Theme.ContentDetail" />
<activity
android:name=".ui.profile.EditProfileActivity"
- android:exported="false"/>
+ android:exported="false" />
<activity
android:name=".ui.invitation.InvitationActivity"
- android:exported="false"/>
-
+ android:exported="false" />
+ <activity
+ android:name=".activity.ReminderListActivity"
+ android:exported="false"
+ android:label="提醒列表" />
+ <activity
+ android:name=".activity.ReminderSettingsActivity"
+ android:exported="false"
+ android:label="设置提醒" />
</application>
</manifest>
\ No newline at end of file
--
Gitblit v1.9.3