From 1ad33847e84874d4fec803190e92b8e3f49a59fe Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 28 三月 2023 19:00:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_android
---
app/src/main/AndroidManifest.xml | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 667c88a..7d6792f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
+
<uses-permission android:name="android.permission.INTERNET" />
-
-
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application
android:name=".MyApplication"
android:allowBackup="true"
@@ -11,19 +14,49 @@
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
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.Zhangshi_app_android"
- tools:targetApi="31" >
+ android:theme="@style/Theme.app"
+ android:usesCleartextTraffic="true"
+ tools:targetApi="31">
+ <!-- 娌夋蹈寮忕姸鎬佹爮鍏ㄩ潰灞� -->
+ <meta-data
+ android:name="android.max_aspect"
+ android:value="2.4" /> <!-- 閫傞厤鍗庝负锛坔uawei锛夊垬娴峰睆 -->
+ <meta-data
+ android:name="android.notch_support"
+ android:value="true" /> <!-- 閫傞厤灏忕背锛坸iaomi锛夊垬娴峰睆 -->
+ <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=".view.MainActivity"
+ android:name=".ui.main.MainActivity"
android:exported="true">
+ </activity>
+ <activity
+ android:name=".ui.login.LoginActivity"
+ android:exported="true"
+ android:screenOrientation="portrait"
+ >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
+
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <activity
+ android:name=".ui.function.FamilyMemorabiliaActivity"
+ android:exported="false" />
</application>
-
</manifest>
\ No newline at end of file
--
Gitblit v1.9.1