From 63b0ee228bf52e8e9c4d7fc51a1117543c9a67af Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 03 七月 2023 19:02:40 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP
---
app/src/main/AndroidManifest.xml | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0b1b3dd..c346c9e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,18 +1,78 @@
<?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"
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.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.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" />
+<!-- <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />-->
+ <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+ <!-- wifi鐘舵�佹潈闄� -->
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+ <uses-permission android:name="android.permission.INTERNET" /> <!-- 浣嶇疆淇℃伅 -->
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 濡傛灉鏄畨鍗�10.0锛岄渶瑕佸悗鍙拌幏鍙栬繛鎺ョ殑wifi鍚嶇О鍒欐坊鍔犺繘绋嬭幏鍙栦綅缃俊鎭潈闄� -->
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- android 10.0浣跨敤wifi api鏂版坊鍔犵殑鏉冮檺 -->
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- bugly鎵�闇�鏉冮檺 -->
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
+ <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- bugly鎵�闇�鏉冮檺 start -->
+ <uses-permission android:name="android.permission.CAMERA" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
+ <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
+ <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.CHANGE_WIFI_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <!-- bugly鎵�闇�鏉冮檺 -->
+ <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
+ <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- bugly鎵�闇�鏉冮檺 start -->
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
+ <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- bugly鎵�闇�鏉冮檺 end -->
+ <!-- UNI SDK 鍩哄骇鍒犻櫎鐨勯儴鍒嗘潈闄� start -->
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.INTERNET" /> <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
+ <!-- <uses-feature android:name="android.hardware.camera.autofocus" /> -->
+ <!-- <uses-permission android:name="android.permission.CAMERA" /> -->
+ <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
+ <!-- <uses-permission android:name="android.permission.READ_PHONE_STATE" /> -->
+ <!-- 璁块棶闂厜鐏� -->
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+ <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+ <uses-permission android:name="android.permission.GET_TASKS" />
+ <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.FLASHLIGHT" />
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="com.hdl.debugtreasure.permission.JPUSH_MESSAGE" />
+ <uses-permission android:name="android.permission.CALL_PHONE" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.BLUETOOTH" /> <!-- 鍩哄骇鍒犻櫎鐨勯儴鍒嗘潈闄� -->
<application
@@ -22,20 +82,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