@mpxjs/api-proxy 2.10.16-beta.7 → 2.10.16-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.16-beta.7",
+  "version": "2.10.16-beta.9",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",

package/src/platform/api/ble-connection/index.ios.js

@@ -1,4 +1,3 @@
-import BleManager from 'react-native-ble-manager'
 import { noop } from '@mpxjs/utils'
 import mpx from '@mpxjs/core'
 import { Platform, PermissionsAndroid } from 'react-native'
@@ -72,10 +71,11 @@ const commonFailHandler = function (errMsg, fail, complete) {
 }
 
 function openBluetoothAdapter (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { success = noop, fail = noop, complete = noop } = options
   let bluetoothPermission = requestBluetoothPermission
-  if (__mpx_env__ === 'android' && mpx.rnConfig?.bluetoothPermission) { // 安卓需要验证权限，开放给用户可以自定义验证权限的方法
-    bluetoothPermission = mpx.rnConfig.bluetoothPermission
+  if (mpx.config?.rnConfig?.bluetoothPermission) { // 安卓需要验证权限，开放给用户可以自定义验证权限的方法
+    bluetoothPermission = mpx.config.rnConfig.bluetoothPermission
   }
   // 先请求权限，再初始化蓝牙管理器
   bluetoothPermission().then((hasPermissions) => {
@@ -118,6 +118,7 @@ function openBluetoothAdapter (options = {}) {
 }
 
 function closeBluetoothAdapter (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { success = noop, fail = noop, complete = noop } = options
   if (!bleManagerInitialized) {
     const result = {
@@ -183,6 +184,7 @@ function closeBluetoothAdapter (options = {}) {
 }
 
 function startBluetoothDevicesDiscovery (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const {
     services = [],
     allowDuplicatesKey = false,
@@ -243,6 +245,7 @@ function startBluetoothDevicesDiscovery (options = {}) {
 }
 
 function stopBluetoothDevicesDiscovery (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { success = noop, fail = noop, complete = noop } = options
 
   if (!bleManagerInitialized) {
@@ -282,6 +285,7 @@ function offBluetoothDeviceFound (callback) {
 }
 
 function getConnectedBluetoothDevices (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { services = [], success = noop, fail = noop, complete = noop } = options
 
   if (!bleManagerInitialized) {
@@ -306,6 +310,7 @@ function getConnectedBluetoothDevices (options = {}) {
 }
 
 function getBluetoothAdapterState (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { success = noop, fail = noop, complete = noop } = options
 
   if (!bleManagerInitialized) {
@@ -326,6 +331,7 @@ function getBluetoothAdapterState (options = {}) {
   })
 }
 function onDidUpdateState () {
+  const BleManager = require('react-native-ble-manager').default
   updateStateSubscription = BleManager.onDidUpdateState((state) => {
     onStateChangeCallbacks.forEach(cb => {
       cb({
@@ -384,6 +390,7 @@ function getBluetoothDevices (options = {}) { // 该能力只是获取应用级
 }
 
 function writeBLECharacteristicValue (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { deviceId, serviceId, characteristicId, value, success = noop, fail = noop, complete = noop } = options
   if (!deviceId || !serviceId || !characteristicId || !value) {
     const result = {
@@ -413,6 +420,7 @@ function writeBLECharacteristicValue (options = {}) {
 }
 
 function readBLECharacteristicValue (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { deviceId, serviceId, characteristicId, success = noop, fail = noop, complete = noop } = options
 
   if (!deviceId || !serviceId || !characteristicId) {
@@ -449,6 +457,7 @@ function readBLECharacteristicValue (options = {}) {
 }
 
 function notifyBLECharacteristicValueChange (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { deviceId, serviceId, characteristicId, state = true, success = noop, fail = noop, complete = noop } = options
 
   if (!deviceId || !serviceId || !characteristicId) {
@@ -502,6 +511,7 @@ function notifyBLECharacteristicValueChange (options = {}) {
 
 let valueForCharacteristicSubscriptions = null
 function onBLECharacteristicValueChange (callback) {
+  const BleManager = require('react-native-ble-manager').default
   if (characteristicCallbacks.length === 0) {
     valueForCharacteristicSubscriptions = BleManager.onDidUpdateValueForCharacteristic((data) => {
       // 将byte array转换为ArrayBuffer
@@ -538,6 +548,7 @@ function offBLECharacteristicValueChange (callback) {
 }
 
 function setBLEMTU (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { deviceId, mtu, success = noop, fail = noop, complete = noop } = options
   if (!mtu) {
     commonFailHandler('setBLEMTU:fail parameter error: parameter.mtu should be Number instead of Undefined;', fail, complete)
@@ -569,6 +580,7 @@ function setBLEMTU (options = {}) {
 }
 
 function getBLEDeviceRSSI (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { deviceId, success = noop, fail = noop, complete = noop } = options
 
   if (!deviceId) {
@@ -599,6 +611,7 @@ function getBLEDeviceRSSI (options = {}) {
 }
 
 function getBLEDeviceServices (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { deviceId, success = noop, fail = noop, complete = noop } = options
 
   if (!deviceId) {
@@ -671,7 +684,13 @@ function getBLEDeviceCharacteristics (options = {}) {
   }
   const characteristics = characteristicsList.map(char => ({
     uuid: char.characteristic,
-    properties: char.properties
+    properties: {
+      read: !!char.properties.Read,
+      write: !!char.properties.Write,
+      notify: !!char.properties.Notify,
+      indicate: !!char.properties.Indicate,
+      writeNoResponse: !!char.properties.writeWithoutResponse
+    }
   }))
 
   const result = {
@@ -683,6 +702,7 @@ function getBLEDeviceCharacteristics (options = {}) {
 }
 
 function createBLEConnection (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { deviceId, timeout, success = noop, fail = noop, complete = noop } = options
 
   if (!deviceId) {
@@ -730,6 +750,7 @@ function createBLEConnection (options = {}) {
 }
 
 function closeBLEConnection (options = {}) {
+  const BleManager = require('react-native-ble-manager').default
   const { deviceId, success = noop, fail = noop, complete = noop } = options
 
   if (!deviceId) {

package/src/platform/api/camera/rnCamera.js

@@ -1,114 +1,44 @@
-import { noop } from '@mpxjs/utils'
+import { noop, getFocusedNavigation } from '@mpxjs/utils'
 
-const qualityValue = {
-  high: 90,
-  normal: 75,
-  low: 50,
-  original: 100
-}
 export default class CreateCamera {
   constructor () {
-    const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
-    this.camera = navigation?.camera || {}
+    const navigation = getFocusedNavigation() || {}
+    this.camera = navigation.camera || {}
   }
 
   setZoom (options = {}) {
-    const { zoom } = options
-    if (this.camera.setZoom) {
-      this.camera.setZoom(zoom)
-    }
-  }
-
-  takePhoto (options = {}) {
-    const { success = noop, fail = noop, complete = noop } = options
-    const takePhoto = this.camera.getTakePhoto?.()
-    if (takePhoto) {
-      takePhoto({
-        quality: qualityValue[options.quality || 'normal']
-      }).then((res) => {
-        const result = {
-          errMsg: 'takePhoto:ok',
-          tempImagePath: res.path
-        }
+    const { zoom, success = noop, fail = noop, complete = noop } = options
+    try {
+      if (this.camera.setZoom) {
+        const result = { errMsg: 'setZoom:ok' }
         success(result)
         complete(result)
-      }).catch(() => {
+        this.camera.setZoom(zoom)
+      } else {
         const result = {
-          errMsg: 'takePhoto:fail'
+          errMsg: 'setZoom:fail camera instance not found'
         }
         fail(result)
         complete(result)
-      })
-    }
-  }
-
-  startRecord (options = {}) {
-    let { timeout = 30, success = noop, fail = noop, complete = noop, timeoutCallback = noop } = options
-    timeout = timeout > 300 ? 300 : timeout
-    let recordTimer = null
-    const isTimeout = false
-    const startRecord = this.camera.getStartRecord?.()
-    if (startRecord) {
-      const result = {
-        errMsg: 'startRecord:ok'
       }
-      success(result)
-      complete(result)
-      startRecord({
-        onRecordingError: (res) => {
-          clearTimeout(recordTimer)
-          timeoutCallback()
-        },
-        onRecordingFinished: (res) => {
-          if (isTimeout) {
-            console.log('record timeout, ignore', res)
-          }
-          clearTimeout(recordTimer)
-          console.log('record finished', res)
-        }
-      })
-      recordTimer = setTimeout(() => { // 超时自动停止
-        if (this.camera.stopRecord) {
-          this.camera.stopRecord().catch(() => {})
-        }
-      }, timeout * 1000)
-    } else {
+    } catch (error) {
       const result = {
-        errMsg: 'startRecord:fail to initialize the camera'
+        errMsg: 'setZoom:fail ' + (error?.message || '')
       }
       fail(result)
       complete(result)
     }
   }
 
-  stopRecord (options = {}) {
-    const { success = noop, fail = noop, complete = noop } = options
-    const stopRecord = this.camera.getStopRecord?.()
-    if (stopRecord) {
-      stopRecord().then((res) => {
-        console.log('stopRecord res', res)
-        const result = {
-          errMsg: 'stopRecord:ok',
-          tempVideoPath: res.path,
-          duration: res.duration * 1000, // 转成ms
-          size: res.fileSize
-        }
-        success(result)
-        complete(result)
-      }).catch((e) => {
-        console.log('stopRecord error', e)
-        const result = {
-          errMsg: 'stopRecord:fail'
-        }
-        fail(result)
-        complete(result)
-      })
-    } else {
-      const result = {
-        errMsg: 'stopRecord:fail to initialize the camera'
-      }
-      fail(result)
-      complete(result)
-    }
+  takePhoto (options) {
+    this.camera?.takePhoto(options)
+  }
+
+  startRecord (options) {
+    this.camera?.startRecord(options)
+  }
+
+  stopRecord (options) {
+    this.camera?.stopRecord(options)
   }
 }

package/src/platform/api/device/wifi/index.ios.js

@@ -1,4 +1,3 @@
-import WifiManager from 'react-native-wifi-reborn'
 import { PermissionsAndroid } from 'react-native'
 import { noop } from '@mpxjs/utils'
 import mpx from '@mpxjs/core'
@@ -22,6 +21,7 @@ async function requestWifiPermission () {
 }
 
 function startWifi (options = {}) {
+  const WifiManager = require('react-native-wifi-reborn').default
   const { success = noop, fail = noop, complete = noop } = options
   if (__mpx_mode__ === 'ios') {
     const result = {
@@ -33,8 +33,8 @@ function startWifi (options = {}) {
   }
   startWifiReady = true
   let wifiPermission = requestWifiPermission
-  if (mpx.rnConfig?.wifiPermission) {
-    wifiPermission = mpx.rnConfig.wifiPermission
+  if (mpx.config?.rnConfig?.wifiPermission) {
+    wifiPermission = mpx.config.rnConfig.wifiPermission
   }
   wifiPermission().then(async () => {
     let enabled
@@ -65,6 +65,7 @@ function startWifi (options = {}) {
 }
 
 function stopWifi (options = {}) {
+  const WifiManager = require('react-native-wifi-reborn').default
   const { success = noop, fail = noop, complete = noop } = options
   if (__mpx_mode__ === 'ios') {
     const result = {
@@ -83,6 +84,7 @@ function stopWifi (options = {}) {
 }
 
 function getWifiList (options = {}) {
+  const WifiManager = require('react-native-wifi-reborn').default
   const { success = noop, fail = noop, complete = noop } = options
   if (__mpx_mode__ === 'ios') {
     const result = {
@@ -148,6 +150,7 @@ function offGetWifiList (callback) {
 }
 
 function getConnectedWifi (options = {}) {
+  const WifiManager = require('react-native-wifi-reborn').default
   const { partialInfo = false, success = noop, fail = noop, complete = noop } = options
 
   if (!startWifiReady) {