@mpxjs/api-proxy 2.10.16 → 2.10.17-beta.4

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

@@ -6,8 +6,71 @@ const createBLEConnection = ENV_OBJ.createBLEConnection || envError('createBLECo
 
 const onBLEConnectionStateChange = ENV_OBJ.onBLEConnectionStateChange || envError('onBLEConnectionStateChange')
 
+const offBLEConnectionStateChange = ENV_OBJ.offBLEConnectionStateChange || envError('offBLEConnectionStateChange')
+
+const openBluetoothAdapter = ENV_OBJ.openBluetoothAdapter || envError('openBluetoothAdapter')
+
+const closeBluetoothAdapter = ENV_OBJ.closeBluetoothAdapter || envError('closeBluetoothAdapter')
+
+const startBluetoothDevicesDiscovery = ENV_OBJ.startBluetoothDevicesDiscovery || envError('startBluetoothDevicesDiscovery')
+
+const stopBluetoothDevicesDiscovery = ENV_OBJ.stopBluetoothDevicesDiscovery || envError('stopBluetoothDevicesDiscovery')
+
+const onBluetoothDeviceFound = ENV_OBJ.onBluetoothDeviceFound || envError('onBluetoothDeviceFound')
+
+const offBluetoothDeviceFound = ENV_OBJ.offBluetoothDeviceFound || envError('offBluetoothDeviceFound')
+
+const getConnectedBluetoothDevices = ENV_OBJ.getConnectedBluetoothDevices || envError('getConnectedBluetoothDevices')
+
+const getBluetoothAdapterState = ENV_OBJ.getBluetoothAdapterState || envError('getBluetoothAdapterState')
+
+const onBluetoothAdapterStateChange = ENV_OBJ.onBluetoothAdapterStateChange || envError('onBluetoothAdapterStateChange')
+
+const offBluetoothAdapterStateChange = ENV_OBJ.offBluetoothAdapterStateChange || envError('offBluetoothAdapterStateChange')
+
+const getBluetoothDevices = ENV_OBJ.getBluetoothDevices || envError('getBluetoothDevices')
+
+const writeBLECharacteristicValue = ENV_OBJ.writeBLECharacteristicValue || envError('writeBLECharacteristicValue')
+
+const readBLECharacteristicValue = ENV_OBJ.readBLECharacteristicValue || envError('readBLECharacteristicValue')
+
+const notifyBLECharacteristicValueChange = ENV_OBJ.notifyBLECharacteristicValueChange || envError('notifyBLECharacteristicValueChange')
+
+const onBLECharacteristicValueChange = ENV_OBJ.onBLECharacteristicValueChange || envError('onBLECharacteristicValueChange')
+
+const offBLECharacteristicValueChange = ENV_OBJ.offBLECharacteristicValueChange || envError('offBLECharacteristicValueChange')
+
+const setBLEMTU = ENV_OBJ.setBLEMTU || envError('setBLEMTU')
+
+const getBLEDeviceRSSI = ENV_OBJ.getBLEDeviceRSSI || envError('getBLEDeviceRSSI')
+
+const getBLEDeviceServices = ENV_OBJ.getBLEDeviceServices || envError('getBLEDeviceServices')
+
+const getBLEDeviceCharacteristics = ENV_OBJ.getBLEDeviceCharacteristics || envError('getBLEDeviceCharacteristics')
+
 export {
-  closeBLEConnection,
+  onBLEConnectionStateChange,
+  offBLEConnectionStateChange,
+  openBluetoothAdapter,
+  closeBluetoothAdapter,
+  startBluetoothDevicesDiscovery,
+  stopBluetoothDevicesDiscovery,
+  onBluetoothDeviceFound,
+  offBluetoothDeviceFound,
+  getConnectedBluetoothDevices,
+  getBluetoothAdapterState,
+  onBluetoothAdapterStateChange,
+  offBluetoothAdapterStateChange,
+  getBluetoothDevices,
+  writeBLECharacteristicValue,
+  readBLECharacteristicValue,
+  notifyBLECharacteristicValueChange,
+  onBLECharacteristicValueChange,
+  offBLECharacteristicValueChange,
+  setBLEMTU,
+  getBLEDeviceRSSI,
+  getBLEDeviceServices,
+  getBLEDeviceCharacteristics,
   createBLEConnection,
-  onBLEConnectionStateChange
+  closeBLEConnection
 }

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/create-intersection-observer/rnIntersectionObserver.js

@@ -201,6 +201,9 @@ class RNIntersectionObserver {
 
   // 计算节点的rect信息
   _measureTarget (isInit = false) {
+    if (!this.observerRefs || !this.relativeRef) {
+      return
+    }
     Promise.all([
       this._getReferenceRect(this.observerRefs),
       this._getReferenceRect(this.relativeRef)

package/src/platform/api/device/network/onNetworkStatusChange.js

@@ -5,10 +5,10 @@ const oldObserveList = new Set()
 
 if (isBrowser) {
   window.addEventListener('offline', () => {
-    oldObserveList.forEach(fn => fn({ isConnected: false, type: 'none' }))
+    oldObserveList.forEach(fn => fn({ isConnected: false, networkType: 'none' }))
   })
   window.addEventListener('online', () => {
-    oldObserveList.forEach(fn => fn({ isConnected: true, type: 'unknow' }))
+    oldObserveList.forEach(fn => fn({ isConnected: true, networkType: 'unknow' }))
   })
 }
 
@@ -22,7 +22,7 @@ export function onNetworkStatusChange (callbackFn) {
       const isConnected = navigator.onLine
       callbackFn({
         isConnected,
-        type: isConnected ? evt.currentTarget.effectiveType : 'none'
+        networkType: isConnected ? evt.currentTarget.effectiveType : 'none'
       })
     }
     fnMap.set(callbackFn, proxyCallback)

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

@@ -0,0 +1,236 @@
+import { PermissionsAndroid } from 'react-native'
+import { noop, type } from '@mpxjs/utils'
+import mpx from '@mpxjs/core'
+let startWifiReady = false
+const wifiListListeners = []
+
+async function requestWifiPermission () {
+  const granted = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.ACCESS_FINE_LOCATION, {
+    title: 'Location permission is required for WiFi connections',
+    message:
+      'This app needs location permission as this is required  ' +
+      'to scan for wifi networks.',
+    buttonNegative: 'DENY',
+    buttonPositive: 'ALLOW'
+  })
+  if (granted === PermissionsAndroid.RESULTS.GRANTED) {
+    return true
+  } else {
+    return false
+  }
+}
+
+function startWifi (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'
+    }
+    fail(result)
+    complete(result)
+    return
+  }
+  const WifiManager = require('react-native-wifi-reborn').default
+  let wifiPermission = requestWifiPermission
+  if (mpx.config?.rnConfig?.wifiPermission) {
+    wifiPermission = mpx.config.rnConfig.wifiPermission
+  }
+  wifiPermission().then(async () => {
+    let enabled
+    try {
+      enabled = await WifiManager.isEnabled()
+    } catch (e) {
+      enabled = false
+    }
+    if (!enabled) {
+      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 : ''),
+      errCode: 12001
+    }
+    fail(result)
+    complete(result)
+  })
+}
+
+function stopWifi (options = {}) {
+  const { success = noop, fail = noop, complete = noop } = options
+  if (__mpx_mode__ === 'ios') {
+    const result = {
+      errMsg: 'stopWifi:fail ios system not support, you need to manually go to the Settings to enable wifi'
+    }
+    fail(result)
+    complete(result)
+    return
+  }
+  startWifiReady = false
+  wifiListListeners.length = 0
+  const result = {
+    errMsg: 'stopWifi:success'
+  }
+  success(result)
+  complete(result)
+}
+
+function getWifiList (options = {}) {
+  const { success = noop, fail = noop, complete = noop } = options
+  if (__mpx_mode__ === 'ios') {
+    const result = {
+      errMsg: 'getWifiList:fail ios system not support'
+    }
+    fail(result)
+    complete(result)
+    return
+  }
+  if (!startWifiReady) {
+    const result = {
+      errMsg: 'getWifiList:fail not init startWifi',
+      errCode: 12000
+    }
+    fail(result)
+    complete(result)
+    return
+  }
+  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,
+      errCode: 0
+    }
+    success(result)
+    complete(result)
+  }).catch(() => {
+    const result = {
+      errMsg: 'getWifiList:fail'
+    }
+    fail(result)
+    complete(result)
+  })
+}
+
+function onGetWifiList (callback) {
+  if (!startWifiReady && wifiListListeners.indexOf(callback) > -1) {
+    return
+  }
+  wifiListListeners.push(callback)
+}
+
+function offGetWifiList (callback) {
+  if (!startWifiReady) {
+    return
+  }
+  const index = wifiListListeners.indexOf(callback)
+  if (index > -1) {
+    wifiListListeners.splice(index, 1)
+  }
+}
+
+function getConnectedWifi (options = {}) {
+  const { partialInfo = false, success = noop, fail = noop, complete = noop } = options
+
+  if (!startWifiReady) {
+    const result = {
+      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 = {
+        SSID: res,
+        BSSID: '', // iOS无法获取BSSID
+        signalStrength: 0,
+        frequency: 0
+      }
+      const result = {
+        wifi: wifi,
+        errMsg: 'getConnectedWifi:ok'
+      }
+      success(result)
+      complete(result)
+    }).catch(() => {
+      const result = {
+        errMsg: 'getConnectedWifi:fail'
+      }
+      fail(result)
+      complete(result)
+    })
+  } else {
+    Promise.all([
+      WifiManager.getCurrentWifiSSID().catch(() => null),
+      WifiManager.getBSSID().catch(() => ''),
+      WifiManager.getCurrentSignalStrength().catch(() => 0),
+      WifiManager.getFrequency().catch(() => 0)
+    ]).then(([ssid, bssid, signalStrength, frequency]) => {
+      if (!ssid) {
+        const result = {
+          errMsg: 'getConnectedWifi:fail'
+        }
+        fail(result)
+        complete(result)
+        return
+      }
+
+      const wifi = {
+        SSID: ssid,
+        BSSID: bssid,
+        signalStrength: signalStrength,
+        frequency: frequency
+      }
+
+      const result = {
+        wifi: wifi,
+        errMsg: 'getConnectedWifi:ok'
+      }
+      success(result)
+      complete(result)
+    }).catch(() => {
+      const result = {
+        errMsg: 'getConnectedWifi:fail'
+      }
+      fail(result)
+      complete(result)
+    })
+  }
+}
+
+export {
+  startWifi,
+  stopWifi,
+  getWifiList,
+  onGetWifiList,
+  offGetWifiList,
+  getConnectedWifi
+}

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

@@ -0,0 +1,22 @@
+import { ENV_OBJ, envError } from '../../../../common/js'
+
+const startWifi = ENV_OBJ.startWifi || envError('startWifi')
+
+const stopWifi = ENV_OBJ.stopWifi || envError('stopWifi')
+
+const getWifiList = ENV_OBJ.getWifiList || envError('getWifiList')
+
+const getConnectedWifi = ENV_OBJ.getConnectedWifi || envError('getConnectedWifi')
+
+const onGetWifiList = ENV_OBJ.onGetWifiList || envError('onGetWifiList')
+
+const offGetWifiList = ENV_OBJ.offGetWifiList || envError('offGetWifiList')
+
+export {
+  startWifi,
+  stopWifi,
+  getWifiList,
+  onGetWifiList,
+  offGetWifiList,
+  getConnectedWifi
+}

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

@@ -14,14 +14,18 @@ function getBasePath (navigation) {
 let timerId = null
 function isLock (navigationHelper, type, options) {
   if (navigationHelper.lastSuccessCallback && navigationHelper.lastFailCallback) {
-    const res = { errMsg: `${type}:fail the previous routing event didn't complete` }
+    const { path } = parseUrl(options.url)
+    const res = {
+      errMsg: `${type}:fail the previous routing event didn't complete`,
+      path
+    }
     failHandle(res, options.fail, options.complete)
     return true
   }
   clearTimeout(timerId)
   timerId = setTimeout(() => {
     if (navigationHelper.lastSuccessCallback && navigationHelper.lastFailCallback) {
-      navigationHelper.lastFailCallback('timeout')
+      navigationHelper.lastFailCallback(`${type}:fail timeout ${options.url || ''}`)
       navigationHelper.lastFailCallback = null
     }
   }, 1000)
@@ -39,7 +43,7 @@ function navigateTo (options = {}) {
     if (options.events) {
       eventChannel._addListeners(options.events)
     }
-    const { path, queryObj } = parseUrl(options.url)
+    const { path, queryObj } = parseUrl(options.url, true)
     const basePath = getBasePath(navigation)
     const finalPath = resolvePath(path, basePath).slice(1)
 
@@ -66,7 +70,7 @@ function redirectTo (options = {}) {
     return
   }
   if (navigation && navigationHelper) {
-    const { path, queryObj } = parseUrl(options.url)
+    const { path, queryObj } = parseUrl(options.url, true)
     const basePath = getBasePath(navigation)
     const finalPath = resolvePath(path, basePath).slice(1)
     navigation.replace(finalPath, queryObj)
@@ -100,8 +104,10 @@ function navigateBack (options = {}) {
     }
     if (delta >= routeLength && global.__mpx?.config.rnConfig.onAppBack?.(delta - routeLength + 1)) {
       nextTick(() => {
-        navigationHelper.lastSuccessCallback()
-        navigationHelper.lastSuccessCallback = null
+        if (navigationHelper.lastSuccessCallback) {
+          navigationHelper.lastSuccessCallback()
+          navigationHelper.lastSuccessCallback = null
+        }
       })
     } else {
       navigation.pop(delta)
@@ -116,7 +122,7 @@ function reLaunch (options = {}) {
     return
   }
   if (navigation && navigationHelper) {
-    const { path, queryObj } = parseUrl(options.url)
+    const { path, queryObj } = parseUrl(options.url, true)
     const basePath = getBasePath(navigation)
     const finalPath = resolvePath(path, basePath).slice(1)
     navigation.reset({

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

@@ -11,7 +11,7 @@ const getSystemInfoSync = function () {
     brand: DeviceInfo.getBrand(),
     model: DeviceInfo.getModel(),
     system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
-    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
+    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName().toLowerCase(),
     deviceOrientation: screenWidth > screenHeight ? 'portrait' : 'landscape',
     fontSizeSetting: PixelRatio.getFontScale()
   }
@@ -68,7 +68,7 @@ const getDeviceInfo = function () {
     brand: DeviceInfo.getBrand(),
     model: DeviceInfo.getModel(),
     system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
-    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
+    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName().toLowerCase(),
     memorySize: DeviceInfo.getTotalMemorySync() / (1024 * 1024)
   })
   return deviceInfo

package/src/platform/api/system/rnSystem.js

@@ -11,7 +11,7 @@ const getWindowInfo = function () {
   let safeArea = {}
   const { top = 0, left = 0, bottom = 0, right = 0 } = insets
   const layout = navigation.layout || {}
-  const screenHeight = __mpx_mode__ === 'ios' ? dimensionsScreen.height : dimensionsScreen.height - layout.bottomVirtualHeight // 解决安卓开启屏幕内三建导航安卓把安全区计算进去后产生的影响
+  const screenHeight = __mpx_mode__ === 'ios' ? dimensionsScreen.height : dimensionsScreen.height - (layout.bottomVirtualHeight || 0) // 解决安卓开启屏幕内导航安卓把安全区计算进去后产生的影响
   const screenWidth = __mpx_mode__ === 'ios' ? dimensionsScreen.width : dimensionsScreen.width - right
   const layoutHeight = layout.height || 0
   const layoutWidth = layout.width || 0

package/src/platform/index.js

@@ -37,6 +37,9 @@ export * from './api/create-selector-query'
 // getNetworkType, onNetworkStatusChange, offNetworkStatusChange
 export * from './api/device/network'
 
+// startWifi, stopWifi, getWifiList, onGetWifiList, offGetWifiList, getConnectedWifi
+export * from './api/device/wifi'
+
 // downloadFile, uploadFile
 export * from './api/file'
 
@@ -119,3 +122,6 @@ export * from './api/keyboard'
 
 // getSetting, openSetting, enableAlertBeforeUnload, disableAlertBeforeUnload, getMenuButtonBoundingClientRect
 export * from './api/setting'
+
+// createCameraContext
+export * from './api/camera'