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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.16-beta.10",
+  "version": "2.10.16-beta.11",
   "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

@@ -199,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 || {},
@@ -213,6 +213,9 @@ 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
       }
     }

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

@@ -21,7 +21,6 @@ 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 = {
@@ -31,6 +30,7 @@ function startWifi (options = {}) {
     complete(result)
     return
   }
+  const WifiManager = require('react-native-wifi-reborn').default
   let wifiPermission = requestWifiPermission
   if (mpx.config?.rnConfig?.wifiPermission) {
     wifiPermission = mpx.config.rnConfig.wifiPermission
@@ -71,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
   }
   startWifiReady = false
+  wifiListListeners.length = 0
   const result = {
     errMsg: 'stopWifi:success'
   }
@@ -86,11 +87,10 @@ 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 = {
-      errMsg: 'startWifi:fail ios system not support'
+      errMsg: 'getWifiList:fail ios system not support'
     }
     fail(result)
     complete(result)
@@ -98,13 +98,14 @@ 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
   }
+  const WifiManager = require('react-native-wifi-reborn').default
   WifiManager.reScanAndLoadWifiList().then((res) => {
     const wifiList = res.map(item => {
       return {
@@ -153,19 +154,18 @@ 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) {
     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 = {