From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 19 一月 2022 11:32:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc --- HDL-ON_Android/Properties/AndroidManifest.xml | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml index 29ed200..3fc1704 100644 --- a/HDL-ON_Android/Properties/AndroidManifest.xml +++ b/HDL-ON_Android/Properties/AndroidManifest.xml @@ -1,6 +1,12 @@ 锘�<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202112131" android:versionName="1.4.3" package="com.hdl.onpro"> - <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" /> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202201141" android:versionName="1.5.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools"> + <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="30" /> + <!--鍙嬬洘--> + <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>--> + <!--<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_PHONE_STATE"/>--> + <!--<uses-permission android:name="android.permission.INTERNET"/>--> <!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 --> <!--<uses-permission android:name="android.permission.INTERNET" />--> <!--缃戠粶璁块棶--> @@ -82,7 +88,17 @@ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.READ_LOGS" /> <!-- 鏋佸厜鎺ㄩ�佺粨鏉� --> - <application android:allowBackup="true" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro"> + <application android:allowBackup="true" android:debuggable="true" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="On Pro"> + <!--/鎵弿浜岀淮鐮乤ctivity--> + <!--<activity + android:name="com.journeyapps.barcodescanner.CaptureActivity" + android:screenOrientation="portrait" + tools:replace="screenOrientation" />--> + <!--CustomCaptureActivity--> + <!--<activity + android:name=".CustomCaptureActivity" + android:screenOrientation="portrait" + tools:replace="screenOrientation" />--> <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.onpro.fileProvider" android:grantUriPermissions="true" android:exported="false"> <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" /> </provider> -- Gitblit v1.8.0