From 989b4cf5a84e898e9682f8d9723a8ba1ff20c23b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 28 六月 2023 16:55:57 +0800
Subject: [PATCH] Merge branch 'hxb' into wjc
---
app/src/main/AndroidManifest.xml | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b020b3c..8173d25 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,24 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.hdl.photovoltaic" >
+ xmlns:tools="http://schemas.android.com/tools"
+ package="com.hdl.photovoltaic">
+
+
+ <uses-permission
+ android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
+ tools:ignore="ProtectedPermissions" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.VIBRATE" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
+
<application
- android:name="com.hdl.photovoltaic.HDLApp"
+ android:name=".HDLApp"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/Theme.PhotovoltaicDebug" >
+ android:theme="@style/Theme.PhotovoltaicDebug">
<activity
- android:name="com.hdl.photovoltaic.ui.home.MyPowerStationActivity"
+ android:name=".ui.device.FastScanActivity"
android:exported="false" />
<activity
- android:name="com.hdl.photovoltaic.ui.Login.HomeLoginActivity"
+ android:name=".ui.MyPowerStationActivity"
android:exported="false" />
<activity
- android:name="com.hdl.photovoltaic.ui.StartActivity"
- android:exported="true" >
+ android:name=".ui.HomeLoginActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.StartActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
--
Gitblit v1.8.0