From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 27 八月 2021 13:21:21 +0800 Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1 --- HDL-ON_Android/Properties/AndroidManifest.xml | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 155 insertions(+), 4 deletions(-) diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml index d2381a5..90d6ea9 100644 --- a/HDL-ON_Android/Properties/AndroidManifest.xml +++ b/HDL-ON_Android/Properties/AndroidManifest.xml @@ -1,6 +1,60 @@ 锘�<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202009241" android:versionName="1.0.1.202009241" package="com.hdl.onpro"> - <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" /> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202108272" android:versionName="1.2.202108272" package="com.hdl.onpro"> + <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" /> + <!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 --> + <!--<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" /> + <!--鍏佽绋嬪簭淇敼澹伴煶璁剧疆淇℃伅锛屽０娉㈤厤瀵癸紝鑷姩璋冨ぇ闊抽噺銆傞渶姹傚彉鏇翠箣鍚庡簲璇ヤ笉闇�瑕佷簡锛燂紵锛�--> + <!--<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" /> + <!--鍏佽绋嬪簭璇诲彇绯荤粺璁剧疆锛屽０娉㈤厤瀵硅幏鍙栧綋鍓嶇郴缁熼煶閲忕瓑--> + <!-- 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" /> + <!-- 鍙瀵硅鏉冮檺--> + <uses-permission android:name="android.permission.CAMERA" /> + <uses-feature android:name="android.hardware.camera" /> + <uses-feature android:name="android.hardware.camera.autofocus" /> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.VIBRATE" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.RECORD_AUDIO" /> + <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- 瀹氫綅鏉冮檺--> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> @@ -12,12 +66,109 @@ <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- 鎾斁鏈湴闊充箰鏉冮檺--> <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> - <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" /> - <application android:allowBackup="true" android:icon="@drawable/Icon" android:roundIcon="@mipmap/ic_launcher_round" android:label="ON +"></application> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <!--鏋佸厜鎺ㄩ�� Required 涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�--> + <!-- Required 涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�--> + <permission android:name="com.hdl.onpro.permission.JPUSH_MESSAGE" android:protectionLevel="signature" /> + <!-- Required --> + <uses-permission android:name="com.hdl.onpro.permission.JPUSH_MESSAGE" /> + <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" /> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.READ_PHONE_STATE" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> + <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_LOGS" /> + <!-- 鏋佸厜鎺ㄩ�佺粨鏉� --> <application android:allowBackup="true" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="ON+"> <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> + <!--鏋佸厜鎺ㄩ��--> + <!-- Required SDK 鏍稿績鍔熻兘--> + <!-- 鍙厤缃� android:process 鍙傛暟灏� PushService 鏀惧湪鍏朵粬杩涚▼涓� --> + <service android:name="cn.jpush.android.service.PushService" android:enabled="true" android:exported="false"> + <intent-filter> + <action android:name="cn.jpush.android.intent.REGISTER" /> + <action android:name="cn.jpush.android.intent.REPORT" /> + <action android:name="cn.jpush.android.intent.PushService" /> + <action android:name="cn.jpush.android.intent.PUSH_TIME" /> + </intent-filter> + </service> + <!-- since 3.0.9 Required SDK 鏍稿績鍔熻兘--> + <provider android:authorities="com.hdl.onpro.DataProvider" android:name="cn.jpush.android.service.DataProvider" android:exported="true" /> + <!-- since 1.8.0 option 鍙�夐」銆傜敤浜庡悓涓�璁惧涓笉鍚屽簲鐢ㄧ殑 JPush 鏈嶅姟鐩镐簰鎷夎捣鐨勫姛鑳姐�� --> + <!-- 鑻ヤ笉鍚敤璇ュ姛鑳藉彲鍒犻櫎璇ョ粍浠讹紝鎴栨妸 enabled 璁剧疆鎴� false 锛汚pp 涓嶄細琚叾浠� App 鎷夎捣锛屼絾浼氭媺璧峰叾浠栫殑 App銆� --> + <service android:name="cn.jpush.android.service.DaemonService" android:enabled="false" android:exported="true"> + <intent-filter> + <action android:name="cn.jpush.android.intent.DaemonService" /> + <category android:name="com.hdl.onpro" /> + </intent-filter> + </service> + <!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘--> + <provider android:authorities="com.hdl.onpro.DownloadProvider" android:name="cn.jpush.android.service.DownloadProvider" android:exported="true" /> + <!-- Required SDK 鏍稿績鍔熻兘--> + <receiver android:name="cn.jpush.android.service.PushReceiver" android:enabled="true"> + <intent-filter android:priority="1000"> + <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" /> + <category android:name="com.hdl.onpro" /> + </intent-filter> + <intent-filter> + <action android:name="android.intent.action.USER_PRESENT" /> + <action android:name="android.net.conn.CONNECTIVITY_CHANGE" /> + </intent-filter> + <!-- Optional --> + <intent-filter> + <action android:name="android.intent.action.PACKAGE_ADDED" /> + <action android:name="android.intent.action.PACKAGE_REMOVED" /> + <data android:scheme="package" /> + </intent-filter> + </receiver> + <!-- Required SDK 鏍稿績鍔熻兘--> + <!-- 鑻ユ偍鐨勪笟鍔′腑鏈変娇鐢ㄦ瀬鍏夊瘜濯掍綋鍔熻兘锛屾垨鑰呮瀬鍏夋棭涓婂ソ鍔熻兘锛岄渶瑕佹妸姝� Activity 鐨� exported 璁剧疆鎴� true銆� --> + <activity android:name="cn.jpush.android.ui.PushActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.NoTitleBar" android:exported="false"> + <intent-filter> + <action android:name="cn.jpush.android.ui.PushActivity" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="com.hdl.onpro" /> + </intent-filter> + </activity> + <!-- SDK 鏍稿績鍔熻兘--> + <!-- 鑻ユ偍鐨勪笟鍔′腑鏈変娇鐢ㄦ瀬鍏夊瘜濯掍綋鍔熻兘锛屾垨鑰呮瀬鍏夋棭涓婂ソ鍔熻兘锛岄渶瑕佹妸姝� Activity 鐨� exported 璁剧疆鎴� true銆� --> + <activity android:name="cn.jpush.android.ui.PopWinActivity" android:configChanges="orientation|keyboardHidden" android:exported="false" android:theme="@style/MyDialogStyle"> + <intent-filter> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="com.hdl.onpro" /> + </intent-filter> + </activity> + <!-- since 3.6.0 --> + <activity android:name="cn.jpush.android.service.DActivity" android:enabled="true" android:exported="true" android:theme="@android:style/Theme.Translucent.NoTitleBar" android:taskAffinity="jpush.custom"> + <intent-filter> + <action android:name="cn.jpush.android.intent.DActivity" /> + <category android:name="com.hdl.onpro" /> + </intent-filter> + </activity> + <!-- Required SDK 鏍稿績鍔熻兘--> + <receiver android:name="cn.jpush.android.service.AlarmReceiver" /> + <!-- 3.5.0鏂板锛岀敤浜庡畾鏃跺睍绀哄姛鑳� --> + <receiver android:name="cn.jpush.android.service.SchedulerReceiver" android:exported="false" /> + <!--Required SDK鏍稿績鍔熻兘 since 3.3.0--> + <activity android:name="cn.jpush.android.service.JNotifyActivity" android:exported="true" android:taskAffinity="jpush.custom" android:theme="@android:style/Theme.Translucent.NoTitleBar"> + <intent-filter> + <action android:name="cn.jpush.android.intent.JNotifyActivity" /> + <category android:name="com.hdl.onpro" /> + </intent-filter> + </activity> + <!-- Required. For publish channel feature --> + <!-- JPUSH_CHANNEL 鏄负浜嗘柟渚垮紑鍙戣�呯粺璁� APK 鍒嗗彂娓犻亾銆�--> + <!-- 渚嬪: --> + <!-- 鍙戝埌 Google Play 鐨� APK 鍙互璁剧疆涓� google-play; --> + <!-- 鍙戝埌鍏朵粬甯傚満鐨� APK 鍙互璁剧疆涓� xxx-market銆� --> + <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" /> + <!-- Required. AppKey copied from Portal --> + <meta-data android:name="JPUSH_APPKEY" android:value="cbd90743ac45cbca06c8118b" /> + <!-- 鏋佸厜鎺ㄩ�佺粨鏉� --> </application> </manifest> \ No newline at end of file -- Gitblit v1.8.0