@mpxjs/api-proxy 2.10.18 → 2.10.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.18",
+  "version": "2.10.19",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -76,5 +76,5 @@
       "optional": true
     }
   },
-  "gitHead": "8ce11a81959cb4b807d683b14c2d0b72c3991da3"
+  "gitHead": "ca50ba6b1361f3c7790746476dd8b8e6be802ea3"
 }

package/src/platform/api/base/rnCanIUseConfig.js

@@ -93,9 +93,16 @@ export const SUPPORTED_APIS = [
   'clearStorage',
   'clearStorageSync',
 
+  // page-scroll-to
+  'pageScrollTo',
+
   // system
   'getSystemInfo',
   'getSystemInfoSync',
+  'getDeviceInfo',
+  'getWindowInfo',
+  'getLaunchOptionsSync',
+  'getEnterOptionsSync',
 
   // setting
   'getMenuButtonBoundingClientRect',
@@ -227,5 +234,13 @@ export const SUPPORTED_OBJECTS = {
     'abort',
     'onHeadersReceived',
     'offHeadersReceived'
+  ],
+
+  // camera
+  CameraContext: [
+    'setZoom',
+    'takePhoto',
+    'startRecord',
+    'stopRecord'
   ]
 }

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

@@ -0,0 +1,9 @@
+import CameraContext from './rnCamera'
+
+function createCameraContext () {
+  return new CameraContext()
+}
+
+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 CameraContext {
+  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/image/index.ios.js

@@ -22,13 +22,15 @@ const getImageInfo = function (options = {}) {
     failHandle(result, fail, complete)
     return
   }
+
   Image.getSize(src, (width, height) => {
     const result = {
       errMsg: 'getImageInfo:ok',
       width,
-      height
+      height,
+      path: src
     }
-    defineUnsupportedProps(result, ['path', 'orientation', 'type'])
+    defineUnsupportedProps(result, ['orientation', 'type'])
     successHandle(result, success, complete)
   }, (err) => {
     const result = {

package/src/platform/api/page-scroll-to/index.ios.js

@@ -0,0 +1 @@
+export * from './rnPageScrollTo'

package/src/platform/api/page-scroll-to/rnPageScrollTo.js

@@ -0,0 +1,55 @@
+import { successHandle, failHandle, getFocusedNavigation } from '../../../common/js'
+
+/**
+ * 实现 React Native 下的 pageScrollTo
+ * 支持 scrollTop 和 selector 两种定位方式
+ */
+export function pageScrollTo (options = {}) {
+  const {
+    scrollTop,
+    duration = 300,
+    selector,
+    offsetTop = 0,
+    success,
+    fail,
+    complete
+  } = options
+
+  const navigation = getFocusedNavigation()
+
+  if (!navigation?.pageScrollTo) {
+    return failHandle({
+      errMsg: 'pageScrollTo:fail page instance not found'
+    }, fail, complete)
+  }
+
+  // 验证参数
+  if (scrollTop === undefined && !selector) {
+    return failHandle({
+      errMsg: 'pageScrollTo:fail scrollTop or selector is required'
+    }, fail, complete)
+  }
+
+  try {
+    navigation.pageScrollTo({
+      scrollTop,
+      duration,
+      selector,
+      offsetTop,
+      onSuccess: () => {
+        successHandle({
+          errMsg: 'pageScrollTo:ok'
+        }, success, complete)
+      },
+      onFail: (errMsg) => {
+        failHandle({
+          errMsg: errMsg || 'pageScrollTo:fail'
+        }, fail, complete)
+      }
+    })
+  } catch (e) {
+    failHandle({
+      errMsg: `pageScrollTo:fail ${e.message}`
+    }, fail, complete)
+  }
+}

package/src/platform/api/socket/SocketTask.js

@@ -42,7 +42,7 @@ class SocketTask {
 
   send (options = {}) {
     const { data = '', success, fail, complete } = options
-    if (typeof data !== 'string' || type(data) !== 'ArrayBuffer') {
+    if (typeof data !== 'string' && type(data) !== 'ArrayBuffer') {
       const res = { errMsg: 'sendSocketMessage:fail Unsupported data type' }
       failHandle(res, fail, complete)
     } else if (this._socket.readyState === 1) {

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'