Merge branch 'master' into wjc

陈嘉乐

2021-03-26 d878a20366ed2aa0cf3a8e0a560441d1ff5f07af

 Crabtree/ON/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.603031" android:versionCode="202103031">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.603241" android:versionCode="202103241">
   <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
   <!-- 在安卓P版本之后，必须要授予FOREGROUND_SERVICE权限，才能够使用前台服务 -->
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -20,7 +20,7 @@
   <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" />
   <application android:allowBackup="false" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="Crabtree-ON">
   <application android:allowBackup="false" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="Crabtree-ON+">
      <!-- 自动更新 -->
      <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.crabtreenew.fileProvider" android:grantUriPermissions="true" android:exported="false">
         <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />