From 9eef1c69f214882b5ada2dae2a55df21bdd3058b Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 26 六月 2023 16:02:48 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP
---
app/src/main/AndroidManifest.xml | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0b1b3dd..c5aaabe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="com.hdl.photovoltaic" >
+ package="com.hdl.photovoltaic">
+
<uses-permission
android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
@@ -12,7 +13,10 @@
<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" />
<application
@@ -22,20 +26,19 @@
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=".ui.device.FastScanActivity"
android:exported="false" />
<activity
android:name=".ui.MyPowerStationActivity"
- android:exported="false"
- />
+ android:exported="false" />
<activity
android:name=".ui.HomeLoginActivity"
android:exported="false" />
<activity
android:name=".ui.StartActivity"
- android:exported="true" >
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
--
Gitblit v1.8.0