@mpxjs/api-proxy 2.10.16-beta.1 → 2.10.16-beta.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.16-beta.1",
+  "version": "2.10.16-beta.11",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/didi/mpx#readme",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.16",
+    "@mpxjs/utils": "^2.10.16-beta.6",
     "axios": "^1.7.3"
   },
   "peerDependencies": {

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

@@ -1,5 +1,4 @@
-import BleManager from 'react-native-ble-manager'
-import { noop } from '@mpxjs/utils'
+import { noop, type } from '@mpxjs/utils'
 import mpx from '@mpxjs/core'
 import { Platform, PermissionsAndroid } from 'react-native'
 import { base64ToArrayBuffer } from '../base/index'
@@ -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,
@@ -197,12 +199,12 @@ function startBluetoothDevicesDiscovery (options = {}) {
   }
   DiscoverPeripheralSubscription = BleManager.onDiscoverPeripheral((device) => {
     const advertising = device.advertising || {}
-    const advertisData = advertising.manufacturerData?.data || null
+    const advertisData = (advertising.manufacturerData && Object.values(advertising.manufacturerData)[0]?.data) || null
     const deviceInfo = {
       deviceId: device.id,
       name: device.name || advertising.localName || '未知设备',
       RSSI: device.rssi || 0,
-      advertisData: advertisData ? base64ToArrayBuffer(advertisData) : advertisData, // todo需要转换
+      advertisData: advertisData ? base64ToArrayBuffer(advertisData) : advertisData,
       advertisServiceUUIDs: advertising.serviceUUIDs || [],
       localName: advertising.localName || '',
       serviceData: advertising.serviceData || {},
@@ -211,23 +213,30 @@ function startBluetoothDevicesDiscovery (options = {}) {
     if (allowDuplicatesKey === false) {
       const existingDeviceIndex = getDevices.findIndex(existingDevice => existingDevice.deviceId === deviceInfo.deviceId)
       if (existingDeviceIndex > -1) {
+        if (device.name) {
+          getDevices.splice(existingDeviceIndex, 1, deviceInfo)
+        }
         return
       }
     }
     deviceFoundCallbacks.forEach(cb => {
-      cb({
-        devices: [deviceInfo]
-      })
+      if (type(cb) === 'Function') {
+        cb({
+          devices: [deviceInfo]
+        })
+      }
     })
     getDevices.push(deviceInfo)
     // 处理设备发现逻辑
   })
   BleManager.scan(services, 0, allowDuplicatesKey).then((res) => { // 必须，没有开启扫描，onDiscoverPeripheral回调不会触发
     onStateChangeCallbacks.forEach(cb => {
-      cb({
-        available: true,
-        discovering: true
-      })
+      if (type(cb) === 'Function') {
+        cb({
+          available: true,
+          discovering: true
+        })
+      }
     })
     discovering = true
     getDevices = [] // 清空之前的发现设备列表
@@ -243,6 +252,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) {
@@ -253,10 +263,12 @@ function stopBluetoothDevicesDiscovery (options = {}) {
   BleManager.stopScan().then(() => {
     discovering = false
     onStateChangeCallbacks.forEach(cb => {
-      cb({
-        available: true,
-        discovering: false
-      })
+      if (type(cb) === 'Function') {
+        cb({
+          available: true,
+          discovering: false
+        })
+      }
     })
     const result = {
       errMsg: 'stopBluetoothDevicesDiscovery:ok'
@@ -282,6 +294,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 +319,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,20 +340,25 @@ function getBluetoothAdapterState (options = {}) {
   })
 }
 function onDidUpdateState () {
+  const BleManager = require('react-native-ble-manager').default
   updateStateSubscription = BleManager.onDidUpdateState((state) => {
     onStateChangeCallbacks.forEach(cb => {
-      cb({
-        available: state.state === 'on',
-        discovering: state.state === 'on' ? discovering : false
-      })
+      if (type(cb) === 'Function') {
+        cb({
+          available: state.state === 'on',
+          discovering: state.state === 'on' ? discovering : false
+        })
+      }
     })
     if (onBLEConnectionStateCallbacks.length && connectedDeviceId.length && state.state !== 'on') {
       connectedDeviceId.forEach((id) => {
         onBLEConnectionStateCallbacks.forEach(cb => {
-          cb({
-            deviceId: id,
-            connected: false
-          })
+          if (type(cb) === 'Function') {
+            cb({
+              deviceId: id,
+              connected: false
+            })
+          }
         })
       })
     }
@@ -384,6 +403,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 +433,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 +470,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 +524,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
@@ -517,7 +540,9 @@ function onBLECharacteristicValueChange (callback) {
         value: buffer
       }
       characteristicCallbacks.forEach(cb => {
-        cb(result)
+        if (type(cb) === 'Function') {
+          cb(result)
+        }
       })
     })
   }
@@ -538,6 +563,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 +595,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 +626,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 +699,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 +717,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) {
@@ -703,10 +738,12 @@ function createBLEConnection (options = {}) {
     }
     clearTimeout(createBLEConnectionTimeout)
     onBLEConnectionStateCallbacks.forEach(cb => {
-      cb({
-        deviceId,
-        connected: true
-      })
+      if (type(cb) === 'Function') {
+        cb({
+          deviceId,
+          connected: true
+        })
+      }
     })
     connectedDevices.add(deviceId)
     const result = {
@@ -730,6 +767,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) {
@@ -748,10 +786,12 @@ function closeBLEConnection (options = {}) {
       connectedDeviceId.splice(index, 1) // 记录一下已连接的设备id
     }
     onBLEConnectionStateCallbacks.forEach(cb => {
-      cb({
-        deviceId,
-        connected: false
-      })
+      if (type(cb) === 'Function') {
+        cb({
+          deviceId,
+          connected: false
+        })
+      }
     })
     connectedDevices.delete(deviceId)
     const result = {

package/src/platform/api/camera/index.ios.js

@@ -0,0 +1,9 @@
+import CreateCamera from './rnCamera'
+
+function createCameraContext () {
+  return new CreateCamera()
+}
+
+export {
+  createCameraContext
+}

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

@@ -0,0 +1,7 @@
+import { ENV_OBJ, envError } from '../../../common/js'
+
+const createCameraContext = ENV_OBJ.createCameraContext || envError('createCameraContext')
+
+export {
+  createCameraContext
+}

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

@@ -0,0 +1,44 @@
+import { noop, getFocusedNavigation } from '@mpxjs/utils'
+
+export default class CreateCamera {
+  constructor () {
+    const navigation = getFocusedNavigation() || {}
+    this.camera = navigation.camera || {}
+  }
+
+  setZoom (options = {}) {
+    const { zoom, success = noop, fail = noop, complete = noop } = options
+    try {
+      if (this.camera.setZoom) {
+        const result = { errMsg: 'setZoom:ok' }
+        success(result)
+        complete(result)
+        this.camera.setZoom(zoom)
+      } else {
+        const result = {
+          errMsg: 'setZoom:fail camera instance not found'
+        }
+        fail(result)
+        complete(result)
+      }
+    } catch (error) {
+      const result = {
+        errMsg: 'setZoom:fail ' + (error?.message || '')
+      }
+      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,6 +1,5 @@
-import WifiManager from 'react-native-wifi-reborn'
 import { PermissionsAndroid } from 'react-native'
-import { noop } from '@mpxjs/utils'
+import { noop, type } from '@mpxjs/utils'
 import mpx from '@mpxjs/core'
 let startWifiReady = false
 const wifiListListeners = []
@@ -31,10 +30,10 @@ function startWifi (options = {}) {
     complete(result)
     return
   }
-  startWifiReady = true
+  const WifiManager = require('react-native-wifi-reborn').default
   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
@@ -43,17 +42,21 @@ function startWifi (options = {}) {
     } catch (e) {
       enabled = false
     }
-    const result = {
-      errMsg: 'startWifi:success'
-    }
     if (!enabled) {
-      WifiManager.setEnabled(true)
-      success(result)
-      complete(result)
-    } else {
-      success(result)
+      const result = {
+        errMsg: 'startWifi:fail wifi not turned on',
+        errCode: 12005
+      }
+      fail(result)
       complete(result)
+      return
+    }
+    startWifiReady = true
+    const result = {
+      errMsg: 'startWifi:success'
     }
+    success(result)
+    complete(result)
   }).catch((err) => {
     const result = {
       errMsg: 'startWifi:fail ' + (typeof err === 'string' ? err : ''),
@@ -68,13 +71,14 @@ function stopWifi (options = {}) {
   const { success = noop, fail = noop, complete = noop } = options
   if (__mpx_mode__ === 'ios') {
     const result = {
-      errMsg: 'startWifi:fail ios system not support, you need to manually go to the Settings to enable wifi'
+      errMsg: 'stopWifi:fail ios system not support, you need to manually go to the Settings to enable wifi'
     }
     fail(result)
     complete(result)
     return
   }
-  WifiManager.setEnabled(false)
+  startWifiReady = false
+  wifiListListeners.length = 0
   const result = {
     errMsg: 'stopWifi:success'
   }
@@ -86,7 +90,7 @@ function getWifiList (options = {}) {
   const { success = noop, fail = noop, complete = noop } = options
   if (__mpx_mode__ === 'ios') {
     const result = {
-      errMsg: 'startWifi:fail ios system not support'
+      errMsg: 'getWifiList:fail ios system not support'
     }
     fail(result)
     complete(result)
@@ -94,26 +98,28 @@ function getWifiList (options = {}) {
   }
   if (!startWifiReady) {
     const result = {
-      errMsg: 'startWifi:fail not init startWifi',
+      errMsg: 'getWifiList:fail not init startWifi',
       errCode: 12000
     }
     fail(result)
     complete(result)
     return
   }
-  WifiManager.loadWifiList().then((res) => {
-    if (wifiListListeners.length) {
-      const result = res.map(item => {
-        return {
-          SSID: item.SSID,
-          BSSID: item.BSSID,
-          frequency: item.frequency
-        }
-      })
-      wifiListListeners.forEach(callback => {
-        callback({ wifiList: result })
-      })
-    }
+  const WifiManager = require('react-native-wifi-reborn').default
+  WifiManager.reScanAndLoadWifiList().then((res) => {
+    const wifiList = res.map(item => {
+      return {
+        SSID: item.SSID,
+        BSSID: item.BSSID,
+        frequency: item.frequency,
+        signalStrength: 100 + (item.level || 0)
+      }
+    })
+    wifiListListeners.forEach(callback => {
+      if (type(callback) === 'Function') {
+        callback({ wifiList })
+      }
+    })
     const result = {
       errMsg: 'getWifiList:success',
       errno: 0,
@@ -152,14 +158,14 @@ function getConnectedWifi (options = {}) {
 
   if (!startWifiReady) {
     const result = {
-      errMsg: 'startWifi:fail not init startWifi',
+      errMsg: 'getConnectedWifi:fail not init startWifi',
       errCode: 12000
     }
     fail(result)
     complete(result)
     return
   }
-
+  const WifiManager = require('react-native-wifi-reborn').default
   if (partialInfo) {
     WifiManager.getCurrentWifiSSID().then((res) => {
       const wifi = {
@@ -174,8 +180,7 @@ function getConnectedWifi (options = {}) {
       }
       success(result)
       complete(result)
-    }).catch((error) => {
-      console.log(error)
+    }).catch(() => {
       const result = {
         errMsg: 'getConnectedWifi:fail'
       }

package/src/platform/index.js

@@ -122,3 +122,6 @@ export * from './api/keyboard'
 
 // getSetting, openSetting, enableAlertBeforeUnload, disableAlertBeforeUnload, getMenuButtonBoundingClientRect
 export * from './api/setting'
+
+// createCameraContext
+export * from './api/camera'