Skip to content

Commit 1ccdca5

Browse files
SuperMonster003SuperMonster003
authored
Merge pull request #488 from Willie169/master
适配 Android 12 及以上蓝牙权限模型变更
2 parents 380df40 + 24ca183 commit 1ccdca5

File tree

13 files changed

+40
-0
lines changed

13 files changed

+40
-0
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,10 @@
162162
<uses-permission android:name="android.permission.BLUETOOTH" />
163163
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
164164

165+
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
166+
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
167+
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
168+
165169
<uses-permission android:name="android.permission.SET_WALLPAPER" />
166170
<uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
167171

‎app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
141141
put("android.permission.ACCESS_WIFI_STATE", R.string.text_permission_desc_access_wifi_state);
142142
put("android.permission.BLUETOOTH", R.string.text_permission_desc_bluetooth);
143143
put("android.permission.BLUETOOTH_ADMIN", R.string.text_permission_desc_bluetooth_admin);
144+
put("android.permission.BLUETOOTH_CONNECT", R.string.text_permission_desc_bluetooth_connect);
145+
put("android.permission.BLUETOOTH_SCAN", R.string.text_permission_desc_bluetooth_scan);
146+
put("android.permission.BLUETOOTH_ADVERTISE", R.string.text_permission_desc_bluetooth_advertise);
144147
put("android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS", R.string.text_permission_desc_broadcast_close_system_dialogs);
145148
put("android.permission.CALL_PHONE", R.string.text_permission_desc_call_phone);
146149
put("android.permission.CAMERA", R.string.text_permission_desc_camera);

‎app/src/main/res/values-ar/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,9 @@
780780
<string name="text_permission_desc_billing">يسمح للتطبيق بإجراء عمليات الشراء داخل التطبيق</string>
781781
<string name="text_permission_desc_bluetooth">يسمح للتطبيق بالوصول إلى أجهزة Bluetooth</string>
782782
<string name="text_permission_desc_bluetooth_admin">يسمح للتطبيق بتهيئة أجهزة Bluetooth</string>
783+
<string name="text_permission_desc_bluetooth_connect">السماح للتطبيق بالوصول إلى أجهزة Bluetooth وحالة الاتصال</string>
784+
<string name="text_permission_desc_bluetooth_scan">السماح للتطبيق بالبحث عن أجهزة Bluetooth القريبة</string>
785+
<string name="text_permission_desc_bluetooth_advertise">السماح للتطبيق بالإعلان عبر Bluetooth</string>
783786
<string name="text_permission_desc_broadcast_close_system_dialogs">يسمح للتطبيق بإرسال نية لإغلاق مربعات حوار النظام</string>
784787
<string name="text_permission_desc_call_phone">يسمح للتطبيق بإجراء مكالمات هاتفية</string>
785788
<string name="text_permission_desc_camera">يسمح للتطبيق بالوصول إلى الكاميرا</string>

‎app/src/main/res/values-en/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,9 @@
775775
<string name="text_permission_desc_billing">Allow the app to perform in-app purchases</string>
776776
<string name="text_permission_desc_bluetooth">Allow the app to access Bluetooth devices</string>
777777
<string name="text_permission_desc_bluetooth_admin">Allow the app to configure Bluetooth devices</string>
778+
<string name="text_permission_desc_bluetooth_connect">Allow the app to access Bluetooth devices and connection state</string>
779+
<string name="text_permission_desc_bluetooth_scan">Allow the app to scan for nearby Bluetooth devices</string>
780+
<string name="text_permission_desc_bluetooth_advertise">Allow the app to advertise via Bluetooth</string>
778781
<string name="text_permission_desc_broadcast_close_system_dialogs">Allow the app to send an intent to close system dialogs</string>
779782
<string name="text_permission_desc_call_phone">Allow the app to make phone calls</string>
780783
<string name="text_permission_desc_camera">Allow the app to access the camera</string>

‎app/src/main/res/values-es/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,9 @@
778778
<string name="text_permission_desc_billing">Permitir que la aplicación realice compras dentro de la aplicación</string>
779779
<string name="text_permission_desc_bluetooth">Permitir que la aplicación acceda a dispositivos Bluetooth</string>
780780
<string name="text_permission_desc_bluetooth_admin">Permitir que la aplicación configure dispositivos Bluetooth</string>
781+
<string name="text_permission_desc_bluetooth_connect">Permitir que la aplicación acceda a los dispositivos Bluetooth y al estado de conexión</string>
782+
<string name="text_permission_desc_bluetooth_scan">Permitir que la aplicación busque dispositivos Bluetooth cercanos</string>
783+
<string name="text_permission_desc_bluetooth_advertise">Permitir que la aplicación se anuncie mediante Bluetooth</string>
781784
<string name="text_permission_desc_broadcast_close_system_dialogs">Permitir que la aplicación envíe una intención para cerrar los cuadros de diálogo del sistema</string>
782785
<string name="text_permission_desc_call_phone">Permitir que la aplicación realice llamadas telefónicas</string>
783786
<string name="text_permission_desc_camera">Permitir que la aplicación acceda a la cámara</string>

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,9 @@
778778
<string name="text_permission_desc_billing">Autoriser l\'application à effectuer des achats intégrés</string>
779779
<string name="text_permission_desc_bluetooth">Autoriser l\'application à accéder aux périphériques Bluetooth</string>
780780
<string name="text_permission_desc_bluetooth_admin">Autoriser l\'application à configurer les périphériques Bluetooth</string>
781+
<string name="text_permission_desc_bluetooth_connect">Autoriser l\'application à accéder aux périphériques et à l\'état de connexion Bluetooth</string>
782+
<string name="text_permission_desc_bluetooth_scan">Autoriser l\'application à rechercher des périphériques Bluetooth à proximité</string>
783+
<string name="text_permission_desc_bluetooth_advertise">Autoriser l\'application à se rendre visible via Bluetooth</string>
781784
<string name="text_permission_desc_broadcast_close_system_dialogs">Autoriser l\'application à envoyer une intention pour fermer les boîtes de dialogue système</string>
782785
<string name="text_permission_desc_call_phone">Autoriser l\'application à passer des appels téléphoniques</string>
783786
<string name="text_permission_desc_camera">Autoriser l\'application à accéder à la caméra</string>

‎app/src/main/res/values-ja/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,9 @@
779779
<string name="text_permission_desc_billing">アプリがアプリ内購入を実行することを許可します</string>
780780
<string name="text_permission_desc_bluetooth">アプリが Bluetooth デバイスにアクセスすることを許可します</string>
781781
<string name="text_permission_desc_bluetooth_admin">アプリが Bluetooth デバイスを設定することを許可します</string>
782+
<string name="text_permission_desc_bluetooth_connect">アプリが Bluetooth デバイスと接続状態にアクセスすることを許可します</string>
783+
<string name="text_permission_desc_bluetooth_scan">アプリが近くの Bluetooth デバイスをスキャンすることを許可します</string>
784+
<string name="text_permission_desc_bluetooth_advertise">アプリが Bluetooth でアドバタイズすることを許可します</string>
782785
<string name="text_permission_desc_broadcast_close_system_dialogs">アプリがシステムダイアログを閉じるためのインテントを送信することを許可します</string>
783786
<string name="text_permission_desc_call_phone">アプリが電話をかけることを許可します</string>
784787
<string name="text_permission_desc_camera">アプリがカメラにアクセスすることを許可します</string>

‎app/src/main/res/values-ko/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,9 @@
780780
<string name="text_permission_desc_billing">앱이 인앱 구매를 수행하도록 허용합니다</string>
781781
<string name="text_permission_desc_bluetooth">앱이 블루투스 기기에 접근하도록 허용합니다</string>
782782
<string name="text_permission_desc_bluetooth_admin">앱이 블루투스 기기를 구성하도록 허용합니다</string>
783+
<string name="text_permission_desc_bluetooth_connect">앱이 블루투스 장치 및 연결 상태에 접근하도록 허용합니다</string>
784+
<string name="text_permission_desc_bluetooth_scan">앱이 근처 블루투스 장치를 검색하도록 허용합니다</string>
785+
<string name="text_permission_desc_bluetooth_advertise">앱이 블루투스로 광고하도록 허용합니다</string>
783786
<string name="text_permission_desc_broadcast_close_system_dialogs">앱이 시스템 대화 상자를 닫기 위한 인텐트를 보내도록 허용합니다</string>
784787
<string name="text_permission_desc_call_phone">앱이 전화를 걸도록 허용합니다</string>
785788
<string name="text_permission_desc_camera">앱이 카메라에 접근하도록 허용합니다</string>

‎app/src/main/res/values-ru/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,9 @@
778778
<string name="text_permission_desc_billing">Разрешить приложению выполнять покупки внутри приложения</string>
779779
<string name="text_permission_desc_bluetooth">Разрешить приложению доступ к устройствам Bluetooth</string>
780780
<string name="text_permission_desc_bluetooth_admin">Разрешить приложению настраивать устройства Bluetooth</string>
781+
<string name="text_permission_desc_bluetooth_connect">Разрешить приложению доступ к устройствам Bluetooth и состоянию подключения</string>
782+
<string name="text_permission_desc_bluetooth_scan">Разрешить приложению сканировать близлежащие устройства Bluetooth</string>
783+
<string name="text_permission_desc_bluetooth_advertise">Разрешить приложению рекламировать себя через Bluetooth</string>
781784
<string name="text_permission_desc_broadcast_close_system_dialogs">Разрешить приложению отправлять намерение для закрытия системных диалогов</string>
782785
<string name="text_permission_desc_call_phone">Разрешить приложению совершать телефонные звонки</string>
783786
<string name="text_permission_desc_camera">Разрешить приложению доступ к камере</string>

‎app/src/main/res/values-zh-rHK/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,9 @@
776776
<string name="text_permission_desc_billing">允許應用執行應用內購買</string>
777777
<string name="text_permission_desc_bluetooth">允許應用訪問藍牙設備</string>
778778
<string name="text_permission_desc_bluetooth_admin">允許應用配置藍牙設備</string>
779+
<string name="text_permission_desc_bluetooth_connect">允許應用訪問藍牙設備及連接狀態</string>
780+
<string name="text_permission_desc_bluetooth_scan">允許應用搜尋附近的藍牙設備</string>
781+
<string name="text_permission_desc_bluetooth_advertise">允許應用透過藍牙廣播</string>
779782
<string name="text_permission_desc_broadcast_close_system_dialogs">允許應用發送一個意圖來關閉系統對話框</string>
780783
<string name="text_permission_desc_call_phone">允許應用撥打電話</string>
781784
<string name="text_permission_desc_camera">允許應用訪問相機</string>

0 commit comments

Comments
 (0)