From b17b9aa59bae6d03055f14d937821655dfaffa1f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 29 一月 2024 23:27:08 +0800
Subject: [PATCH] 1、调整成长经历页面\n2、删除婚姻个人信息
---
app/src/main/AndroidManifest.xml | 243 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 186 insertions(+), 57 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ce05cea..c4debca 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools">
+ xmlns:tools="http://schemas.android.com/tools"
+ >
<!-- 缃戠粶鐩稿叧 -->
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.READ_CONTACTS" /> <!-- 澶栭儴瀛樺偍 -->
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 缃戠粶鐘舵�� -->
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- wifi鐘舵�� -->
+ <uses-permission android:name="android.permission.INTERNET" /> <!-- 缃戠粶 -->
+
+ <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <!-- 鍙戦�侀�氱煡 -->
+ <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" /> <!-- 涓嬭浇鍣ㄩ殣钘忛�氱煡 -->
+ <uses-permission android:name="android.permission.READ_CONTACTS" /> <!-- 璇诲彇鑱旂郴浜� -->
+ <uses-permission android:name="android.permission.WRITE_CONTACTS" /> <!-- 鍐欏叆鑱旂郴浜� -->
<!-- Android 13寮�濮嬶紝濡傛灉浣犵殑搴旂敤targetSdk鎸囧畾鍒颁簡33鎴栦互涓�,READ_EXTERNAL_STORAGE鏉冮檺灏卞畬鍏ㄥけ鍘讳簡浣滅敤,闇�瑕佺粏鍖� -->
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"
@@ -14,16 +19,17 @@
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
- <uses-permission android:name="android.permission.RECORD_AUDIO" /> <!-- Android 13鐗堟湰閫傞厤锛岀粏鍖栧瓨鍌ㄦ潈闄�,READ_EXTERNAL_STORAGE鏃犳硶鍐嶄娇鐢� -->
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
+ <!-- Android 13鐗堟湰閫傞厤锛岀粏鍖栧瓨鍌ㄦ潈闄愪笅闈笁绉�,READ_EXTERNAL_STORAGE鏃犳硶鍐嶄娇鐢� -->
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
- <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> <!-- 闇囧姩鏉冮檺 -->
- <uses-permission android:name="android.permission.VIBRATE" /> <!-- 钃濈墮鏉冮檺 -->
- <uses-permission android:name="android.permission.BLUETOOTH" /> <!-- 鎷嶇収鏉冮檺 -->
- <uses-permission android:name="android.permission.CAMERA" /> <!-- 瀹夎鏉冮檺 -->
- <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- 瀹氫綅鏉冮檺锛堢敤浜� WebView 瀹氫綅锛� -->
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+<!-- <uses-permission android:name="android.permission.VIBRATE" /> <!– 闇囧姩鏉冮檺 –>-->
+<!-- <uses-permission android:name="android.permission.BLUETOOTH" /> <!– 钃濈墮鏉冮檺 –>-->
+ <uses-permission android:name="android.permission.CAMERA" /> <!-- 鎷嶇収鏉冮檺 -->
+ <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- 瀹夎鏉冮檺 -->
+<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /><!– 瀹氫綅鏉冮檺锛堢敤浜� WebView 瀹氫綅锛� –>-->
+<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
<queries package="${applicationId}">
<intent>
@@ -39,15 +45,16 @@
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
- android:icon="@mipmap/ic_launcher"
+ android:icon="@mipmap/ic_logo"
android:label="@string/app_name"
android:maxAspectRatio="2.4"
android:networkSecurityConfig="@xml/network_security_config"
android:resizeableActivity="true"
android:supportsRtl="true"
- android:theme="@style/Theme.app"
+ android:theme="@style/AppTheme.Normal"
android:usesCleartextTraffic="true"
tools:targetApi="31">
+
<!-- 娌夋蹈寮忕姸鎬佹爮鍏ㄩ潰灞� -->
<meta-data
android:name="android.max_aspect"
@@ -65,13 +72,28 @@
android:name="design_height_in_dp"
android:value="640" />
+ <!-- 瀹夎APP -->
+ <provider
+ android:name="androidx.core.content.FileProvider"
+ android:authorities="${applicationId}.file-provider"
+ android:exported="false"
+ android:grantUriPermissions="true">
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/file_paths" />
+ </provider>
+
<activity
android:name=".ui.main.MainActivity"
- android:exported="true" />
+ android:exported="true"
+ android:launchMode="singleTask"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+ />
<activity
android:name=".ui.login.LoginActivity"
android:exported="true"
- android:screenOrientation="portrait">
+ android:screenOrientation="portrait"
+ >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -80,118 +102,225 @@
</activity>
<activity
android:name=".ui.function.FamilyMemorabiliaActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
- android:name=".ui.function.CreateFamilyProjectActivity"
- android:exported="false" />
+ android:name=".ui.function.FamilyMemorabiliaDetailActivity"
+ android:exported="false"
+ android:screenOrientation="portrait"
+ />
<activity
android:name=".ui.function.FamilyAssetsActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.FamilyAssetsDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.HomeDevicesActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.HomeDevicesDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.GrowthExperienceActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.HonorCollectionDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.HonorCollectionActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.LittleDoctorDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.LittleDoctorActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.CleanStorageActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.CleanStorageDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.IncomeAndExpensesActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.IncomeAndExpensesDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.PropertyActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.PropertyDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.HundredWishActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.HundredWishDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.CertificateOfHonorActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.CertificateOfHonorDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.MarriageActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
- android:name=".ui.function.PetActivity"
- android:exported="false" />
+ android:name=".ui.function.PetDetailActivity"
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.PetMemoActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.PetMemoDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.HealthCareActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.AnnualHealthStatusActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.AnnualHealthStatusDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.PrivacyActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.PrivacyDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.TourismActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.TourismDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.TourismExperienceActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.TourismExperienceDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.personal_center.BasicInfoActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.ContactsActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name=".ui.function.ContactsImportActivity"
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.PersonalNotepadActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
<activity
android:name=".ui.function.PersonalNotepadDetailActivity"
- android:exported="false" />
+ android:exported="false"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name=".ui.function.PetActivity"
+ android:exported="false"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name=".ui.function.ExaminationInfoActivity"
+ android:exported="false"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name=".ui.function.ExaminationInfoDetailActivity"
+ android:exported="false"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name=".ui.function.ImageSelectActivity"
+ android:exported="false"
+ android:screenOrientation="portrait" />
+ <activity android:name=".ui.home.GenealogyActivity"
+ android:exported="false"
+ android:screenOrientation="portrait"/>
+ <activity android:name=".ui.personal_center.LoginBgChangeActivity"
+ android:exported="false"
+ android:screenOrientation="portrait"/>
+ <activity android:name=".ui.home.HomeMindMapActivity"
+ android:exported="false"
+ android:screenOrientation="portrait"/>
+
+ <!-- 鏌ョ湅澶у浘 -->
+ <activity
+ android:name=".ui.ImagePreviewActivity"
+ android:launchMode="singleTop"
+ android:screenOrientation="portrait" />
+
+ <!-- 鎾斁瑙嗛锛堣嚜閫傚簲鏂瑰悜锛� -->
+ <activity
+ android:name=".ui.VideoPlayActivity"
+ android:launchMode="singleTop"
+ android:theme="@style/FullScreenTheme" />
+
+ <!-- 鎾斁瑙嗛锛堢珫灞忔柟鍚戯級 -->
+ <activity
+ android:name=".ui.VideoPlayActivity$Portrait"
+ android:launchMode="singleTop"
+ android:screenOrientation="portrait"
+ android:theme="@style/FullScreenTheme" />
+
+ <!-- 鎾斁瑙嗛锛堟í灞忔柟鍚戯級 -->
+ <activity
+ android:name=".ui.VideoPlayActivity$Landscape"
+ android:launchMode="singleTop"
+ android:screenOrientation="landscape"
+ android:theme="@style/FullScreenTheme" />
+
+ <activity
+ android:name=".ui.PlayerActivity"
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+ android:screenOrientation="portrait"
+ android:theme="@style/FullScreenTheme"
+ />
+
+ <activity
+ android:name=".ui.BrowserActivity"
+ android:screenOrientation="portrait" />
+
+
</application>
</manifest>
\ No newline at end of file
--
Gitblit v1.9.1