From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app/src/main/AndroidManifest.xml | 76 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 1 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cf9de1b..a4eb621 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,56 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
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"/>
+
+ <!-- 澶栭儴瀛樺偍 -->
+ <!-- Android 13寮�濮嬶紝濡傛灉浣犵殑搴旂敤targetSdk鎸囧畾鍒颁簡33鎴栦互涓�,READ_EXTERNAL_STORAGE鏉冮檺灏卞畬鍏ㄥけ鍘讳簡浣滅敤,闇�瑕佺粏鍖�-->
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <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.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" />
+
+
+ <queries package="${applicationId}">
+ <intent>
+ <action android:name="android.media.action.IMAGE_CAPTURE">
+
+ </action>
+ </intent>
+ <intent>
+ <action android:name="android.media.action.ACTION_VIDEO_CAPTURE">
+
+ </action>
+ </intent>
+ </queries>
<application
android:name=".MyApplication"
@@ -15,7 +64,7 @@
android:networkSecurityConfig="@xml/network_security_config"
android:resizeableActivity="true"
android:supportsRtl="true"
- android:theme="@style/Theme.Zhangshi_app_android"
+ android:theme="@style/Theme.app"
android:usesCleartextTraffic="true"
tools:targetApi="31">
<!-- 娌夋蹈寮忕姸鎬佹爮鍏ㄩ潰灞� -->
@@ -28,6 +77,13 @@
<meta-data
android:name="notch.config"
android:value="portrait|landscape" />
+ <!-- 灞忓箷閫傞厤 锛堥粯璁や互瀹藉害閫傞厤锛�-->
+ <meta-data
+ android:name="design_width_in_dp"
+ android:value="360"/>
+ <meta-data
+ android:name="design_height_in_dp"
+ android:value="640"/>
<activity
android:name=".ui.main.MainActivity"
@@ -47,6 +103,24 @@
<activity
android:name=".ui.function.FamilyMemorabiliaActivity"
android:exported="false" />
+ <activity
+ android:name=".ui.function.CreateFamilyProjectActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.FamilyAssetsActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.FamilyAssetsDetailActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.HomeDevicesActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.HomeDevicesDetailActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.GrowthExperienceActivity"
+ android:exported="false" />
</application>
</manifest>
\ No newline at end of file
--
Gitblit v1.9.1