From 1ee407dd57a7273ef6b686ac25a40d4199f5bce9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 10:14:41 +0800
Subject: [PATCH] Merge branch 'wxr6' into wxr4

---
 HDL-ON_Android/Properties/AndroidManifest.xml |   47 ++---------------------------------------------
 1 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index f5d8738..a12b1bc 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,49 +1,6 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202104131" android:versionName="1.2.202104131" package="com.hdl.onpro">
-	<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
-	<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
-	<!--<uses-permission android:name="android.permission.INTERNET" />-->
-	<!--缃戠粶璁块棶-->
-	<!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />-->
-	<!--鍏佽绋嬪簭鍐欏叆澶栭儴瀛樺偍,濡係D鍗′笂鍐欐枃浠讹紝鎶撳浘銆佸綍鍒剁瓑-->
-	<!--<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
-	<!--绋嬪簭鍙互璇诲彇璁惧澶栭儴瀛樺偍绌洪棿(鍐呯疆SDcard鍜屽缃甋DCard)鐨勬枃浠讹紝鎴戠殑鏂囦欢绛�-->
-	<uses-permission android:name="android.permission.USE_CREDENTIALS" />
-	<!--鍏佽绋嬪簭璇锋眰楠岃瘉浠嶢ccountManager锛燂紵锛�-->
-	<!--<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />-->
-	<!--鍏佽鏀瑰彉WiFi澶氭挱鐘舵�侊紵锛燂紵-->
-	<!--<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />-->
-	<!--鍏佽绋嬪簭鏄剧ず绯荤粺绐楀彛锛屽簲璇ュ凡缁忎笉閫傜敤浜嗭紵锛燂紵-->
-	<!--<uses-permission android:name="android.permission.RECORD_AUDIO" />-->
-	<!--鍏佽绋嬪簭褰曞埗澹伴煶閫氳繃鎵嬫満鎴栬�虫満鐨勯害鍏嬶紝瀵硅銆佽嚜瀹氫箟鎶ヨ闊崇瓑-->
-	<!--<uses-permission android:name="android.permission.CAMERA" />-->
-	<!--鍏佽绋嬪簭璁块棶鎽勫儚澶磋繘琛屾媿鐓э紝浜岀淮鐮佹壂鎻忚ˉ鍏夈�佹媿鐓т笂浼犲浘鐗囩瓑-->
-	<uses-permission android:name="android.permission.FLASHLIGHT" />
-	<!--鍏佽璁块棶闂厜鐏紝浜岀淮鐮佹壂鎻忚ˉ鍏�-->
-	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-	<!--鍏佽绋嬪簭淇敼澹伴煶璁剧疆淇℃伅锛屽0娉㈤厤瀵癸紝鑷姩璋冨ぇ闊抽噺銆傞渶姹傚彉鏇翠箣鍚庡簲璇ヤ笉闇�瑕佷簡锛燂紵锛�-->
-	<!--<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />-->
-	<!--鍏佽绋嬪簭鑾峰彇褰撳墠WiFi鎺ュ叆鐨勭姸鎬佷互鍙奧LAN鐑偣鐨勪俊鎭紝璁惧娣诲姞浣曠閰嶇綉娴佺▼浣跨敤-->
-	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-	<!--鍏佽绋嬪簭鏀瑰彉WiFi鐘舵�侊紝閰嶇綉绛�-->
-	<!--<uses-feature android:name="android.hardware.camera" />-->
-	<!--<uses-feature android:name="android.hardware.camera.autofocus" />-->
-	<!-- 纭欢鍔犻�熷X5瑙嗛鎾斁闈炲父閲嶈锛屽缓璁紑鍚� -->
-	<uses-permission android:name="android.permission.READ_SETTINGS" />
-	<!--鍏佽绋嬪簭璇诲彇绯荤粺璁剧疆锛屽0娉㈤厤瀵硅幏鍙栧綋鍓嶇郴缁熼煶閲忕瓑-->
-	<!-- Optional for location -->
-	<!--<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
-	<!--鍏佽涓�涓▼搴忚闂瓹ellID鎴� WiFi鐑偣鏉ヨ幏鍙栫矖鐣ョ殑浣嶇疆锛岀櫥闄嗐�佽澶囨坊鍔犵瓑-->
-	<!--<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
-	<!--鍏佽涓�涓▼搴忚闂瓹ellID鎴� WiFi鐑偣鏉ヨ幏鍙栫簿纭殑浣嶇疆锛岀櫥闄嗐�佽澶囨坊鍔犵瓑锛燂紵锛�-->
-	<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-	<!--鍏佽搴旂敤绋嬪簭璁块棶棰濆鐨勪綅缃彁渚涘懡浠わ紝鐧婚檰銆佽澶囨坊鍔犵瓑锛燂紵锛�-->
-	<!--<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />-->
-	<!--鍏佽绋嬪簭鏀瑰彉缃戠粶鐘舵��,濡傛槸鍚﹁仈缃戯紝閰嶇綉锛燂紵锛�-->
-	<!--<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />-->
-	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-	<!--鍏佽搴旂敤绋嬪簭璇锋眰瀹夎鍖呫�傞拡瀵笰PI澶т簬22蹇呴』鎸佹湁璇ヨ鍙娇鐢ˋCTION_INSTALL_PACKAGE搴旂敤銆傚簲璇ユ病鍦ㄧ敤锛燂紵锛�-->
-	<uses-permission android:name="android.permission.VIBRATE" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202107023" android:versionName="1.2.202107023" package="com.hdl.onpro">
+	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
 	<!--  鍙瀵硅鏉冮檺-->
 	<uses-permission android:name="android.permission.CAMERA" />
 	<uses-feature android:name="android.hardware.camera" />

--
Gitblit v1.8.0