@react-native-ohos/react-native-system-setting 1.8.0-rc.1 → 1.8.0-rc.3

package/harmony/react_native_system_setting/BuildProfile.ets

@@ -1,17 +1,17 @@
-/**
- * Use these variables when you tailor your ArkTS code. They must be of the const type.
- */
-export const HAR_VERSION = '1.8.0-rc.1';
-export const BUILD_MODE_NAME = 'debug';
-export const DEBUG = true;
-export const TARGET_NAME = 'default';
-
-/**
- * BuildProfile Class is used only for compatibility purposes.
- */
-export default class BuildProfile { 
-	static readonly HAR_VERSION = HAR_VERSION;
-	static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
-	static readonly DEBUG = DEBUG;
-	static readonly TARGET_NAME = TARGET_NAME;
+/**
+ * Use these variables when you tailor your ArkTS code. They must be of the const type.
+ */
+export const HAR_VERSION = '1.8.0-rc.3';
+export const BUILD_MODE_NAME = 'debug';
+export const DEBUG = true;
+export const TARGET_NAME = 'default';
+
+/**
+ * BuildProfile Class is used only for compatibility purposes.
+ */
+export default class BuildProfile { 
+	static readonly HAR_VERSION = HAR_VERSION;
+	static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
+	static readonly DEBUG = DEBUG;
+	static readonly TARGET_NAME = TARGET_NAME;
 }

package/harmony/react_native_system_setting/oh-package.json5

@@ -1,6 +1,6 @@
 {
     "name": "@react-native-ohos/react-native-system-setting",
-    "version": "1.8.0-rc.1",
+    "version": "1.8.0-rc.3",
     "description": "Please describe the basic information.",
     "main": "Index.ets",
     "author": "",

package/harmony/react_native_system_setting/src/main/ets/RNSystemSettingTurboModule.ts

@@ -31,25 +31,26 @@ import { BusinessError } from '@kit.BasicServicesKit';
 import { audio } from '@kit.AudioKit';
 import wifiManager from '@ohos.wifiManager';
 import geoLocationManager from '@ohos.geoLocationManager';
-import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';
+import abilityAccessCtrl, { PermissionRequestResult, Permissions } from '@ohos.abilityAccessCtrl';
 
 export class RNSystemSettingTurboModule extends TurboModule implements TM.ReactNativeSystemSetting.Spec {
   constructor(protected ctx: TurboModuleContext) {
     super(ctx)
     this.setWindowClass()
-    this.reqBluetoothPermissions()
   }
 
   private _windowClass: window.Window | undefined = undefined
   private _context: window.Window | undefined = undefined
 
-  private async reqBluetoothPermissions(): Promise<void> {
+  private async reqBluetoothPermissions(): Promise<PermissionRequestResult> {
     const permissions: Array<Permissions> = ['ohos.permission.ACCESS_BLUETOOTH'];
     let atManager: abilityAccessCtrl.AtManager = abilityAccessCtrl.createAtManager();
-    atManager.requestPermissionsFromUser(this.ctx.uiAbilityContext, permissions).catch((err: BusinessError) => {
-      console.error(`Failed to request permissions from user. Code is ${err.code}, message is ${err.message}`);
-    })
-    return
+    try {
+      let data = await atManager.requestPermissionsFromUser(this.ctx.uiAbilityContext, permissions)
+      return data;
+    } catch (err) {
+      console.error('Failed to request permissions from user. Code is ${err.code}, message is ${err.message}')
+    }
   }
 
   private async setWindowClass(): Promise<void> {
@@ -65,7 +66,10 @@ export class RNSystemSettingTurboModule extends TurboModule implements TM.ReactN
       bundleName: 'com.huawei.hmos.settings',
       abilityName: 'com.huawei.hmos.settings.MainAbility',
       action: 'action.settings',
-      uri: action
+      uri: action,
+      parameters: {
+        pushParams: context.applicationInfo.name
+      }
     };
     context.startAbility(want)
       .then(() => {
@@ -296,13 +300,19 @@ export class RNSystemSettingTurboModule extends TurboModule implements TM.ReactN
     }
   }
 
-  switchBluetoothSilence(onComplete?: () => void): void {
+  async switchBluetoothSilence(onComplete?: () => void): Promise<void> {
+    let data: PermissionRequestResult = await this.reqBluetoothPermissions()
     const bluetoothState = access.getState()
-    if (bluetoothState === 0 || bluetoothState === 3) {
-      access.enableBluetooth()
-    } else if (bluetoothState === 2 || bluetoothState === 1) {
-      access.disableBluetooth()
+    if (data.authResults[0] === 0) {
+      if (bluetoothState === 0 || bluetoothState === 3) {
+        access.enableBluetooth()
+      } else if (bluetoothState === 2 || bluetoothState === 1) {
+        access.disableBluetooth()
+      }
+    } else {
+      console.log('Failed to request permissions from user')
     }
+
     if (onComplete) {
       onComplete()
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@react-native-ohos/react-native-system-setting",
-    "version": "1.8.0-rc.1",
+    "version": "1.8.0-rc.3",
     "description": "provide some system setting APIs. Volume, brightness, wifi, location, bluetooth, airplane...",
     "main": "SystemSetting.js",
     "types": "SystemSetting.d.ts",