From 88b00f3fc74446a1727c93722c7b64179b45a9db Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 17:40:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/AndroidManifest.xml | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d826628..a5aca2e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -72,6 +72,9 @@
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" /> <!-- 允许语言识别。 -->
<uses-permission android:name="android.permission.RECORD_AUDIO" />
+ <!-- Android 13 及以上 -->
+ <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+
<application
android:name=".App"
android:allowBackup="true"
@@ -83,7 +86,37 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.FirstApp"
+ 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"
+ android:theme="@style/Theme.FirstApp" />
<activity
android:name=".ui.reminderOther.ReminderOtherAddActivity2"
android:configChanges="orientation|keyboardHidden|screenSize"
@@ -106,18 +139,34 @@
android:exported="false" />
<activity
android:name=".activity.PickupActivity"
- android:exported="false"/>
- <activity
- android:name=".activity.ContentDetailActivity"
- android:theme="@style/Theme.ContentDetail"
android:exported="false" />
<activity
+ android:name=".activity.ContentDetailActivity"
+ android:exported="false"
+ 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="设置提醒" />
+ <provider
+ android:name="androidx.core.content.FileProvider"
+ android:authorities="${applicationId}.fileprovider"
+ android:exported="false"
+ android:grantUriPermissions="true">
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths" />
+ </provider>
</application>
</manifest>
\ No newline at end of file
--
Gitblit v1.9.3