@mpxjs/api-proxy 2.9.70-alpha.1 → 2.9.70-alpha.3

package/@types/index.d.ts

@@ -110,6 +110,19 @@ export const createVideoContext: WechatMiniprogram.Wx['createVideoContext']
 export const onWindowResize: WechatMiniprogram.Wx['onWindowResize']
 export const offWindowResize: WechatMiniprogram.Wx['offWindowResize']
 export const createAnimation: WechatMiniprogram.Wx['createAnimation']
+export const hideHomeButton: WechatMiniprogram.Wx['hideHomeButton']
+export const getSetting: WechatMiniprogram.Wx['getSetting']
+export const openSetting: WechatMiniprogram.Wx['openSetting']
+export const enableAlertBeforeUnload: WechatMiniprogram.Wx['enableAlertBeforeUnload']
+export const disableAlertBeforeUnload: WechatMiniprogram.Wx['disableAlertBeforeUnload']
+export const getMenuButtonBoundingClientRect: WechatMiniprogram.Wx['getMenuButtonBoundingClientRect']
+export const getImageInfo: WechatMiniprogram.Wx['getImageInfo']
+export const vibrateShort: WechatMiniprogram.Wx['vibrateShort']
+export const vibrateLong: WechatMiniprogram.Wx['vibrateLong']
+export const getExtConfig: WechatMiniprogram.Wx['getExtConfig']
+export const getExtConfigSync: WechatMiniprogram.Wx['getExtConfigSync']
+export const openLocation: WechatMiniprogram.Wx['openLocation']
+export const chooseLocation: WechatMiniprogram.Wx['chooseLocation']
 
 declare const install: (...args: any) => any
 

package/package.json

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

package/src/common/js/index.js

@@ -1,3 +1,3 @@
 export * from './web'
 export * from './utils'
-export * from './toPromise'
+export * from './ToPromise'

package/src/common/js/promisify.js

@@ -70,14 +70,22 @@ function promisify (listObj, whiteList, customBlackList) {
     result[key] = function (...args) {
       const obj = args[0] || {}
       // 不需要转换 or 用户已定义回调，则不处理
-      if (!promisifyFilter(key) || obj.success || obj.fail) {
+      if (!promisifyFilter(key)) {
         return listObj[key].apply(ENV_OBJ, args)
       } else { // 其他情况进行转换
         if (!args[0]) args.unshift(obj)
         let returned
         const promise = new Promise((resolve, reject) => {
-          obj.success = resolve
-          obj.fail = reject
+          const originSuccess = obj.success
+          const originFail = obj.fail
+          obj.success = function (res) {
+            originSuccess && originSuccess.call(this, res)
+            resolve(res)
+          }
+          obj.fail = function (e) {
+            originFail && originFail.call(this, e)
+            reject(e)
+          }
           returned = listObj[key].apply(ENV_OBJ, args)
         })
         promise.__returned = returned

package/src/platform/api/action-sheet/rnActionSheet.jsx

@@ -1,38 +1,17 @@
-import { View, TouchableHighlight, Text, StyleSheet, Button, Animated } from 'react-native'
+import { View, TouchableHighlight, Text, StyleSheet, TouchableOpacity } from 'react-native'
 import { successHandle, failHandle } from '../../../common/js'
 import { Portal } from '@ant-design/react-native'
+import { getWindowInfo } from '../system/rnSystem'
+import Animated, {
+  useSharedValue,
+  useAnimatedStyle,
+  withTiming
+} from 'react-native-reanimated'
 function showActionSheet (options = {}) {
   const { alertText, itemList = [], itemColor = '#000000', success, fail, complete } = options
-  let actionSheetKey
-  const slideAnim = new Animated.Value(500)
-  const slideIn = () => {
-    // Will change fadeAnim value to 1 in 5 seconds
-    Animated.timing(slideAnim, {
-      toValue: 0,
-      duration: 200,
-      useNativeDriver: true,
-    }).start()
-  }
-  const slideOut = () => {
-    // Will change fadeAnim value to 1 in 5 seconds
-    Animated.timing(slideAnim, {
-      toValue: 500,
-      duration: 200,
-      useNativeDriver: true,
-    }).start(() => {
-    })
-  }
-  if (itemList.length === 0 || itemList.length > 6) {
-    const result = {
-      errMsg: 'showActionSheet:fail parameter error: itemList should not be large than 6'
-    }
-    if (itemList.length === 0) {
-      result.errno = 1001
-      result.errMsg = 'showActionSheet:fail parameter error: parameter.itemList should have at least 1 item;'
-    }
-    failHandle(result, fail, complete)
-    return
-  }
+  const windowInfo = getWindowInfo()
+  const bottom = windowInfo.screenHeight - windowInfo.safeArea.bottom
+  let actionSheetKey = null
   const styles = StyleSheet.create({
     actionActionMask: {
       left: 0,
@@ -44,16 +23,14 @@ function showActionSheet (options = {}) {
       zIndex: 1000
     },
     actionSheetContent: {
-      left: 0,
-      right: 0,
-      position: 'absolute',
-      bottom: 0,
       backgroundColor: '#ffffff',
       borderTopLeftRadius: 10,
       borderTopRightRadius: 10,
-      transform: [{
-        translateY: -500
-      }]
+      position: 'absolute',
+      bottom: 0,
+      left: 0,
+      right: 0,
+      paddingBottom: bottom
     },
     itemStyle: {
       paddingTop: 15,
@@ -73,53 +50,62 @@ function showActionSheet (options = {}) {
       paddingBottom: 10
     }
   })
-  const remove = function () {
-    if (actionSheetKey) {
-      slideOut()
-      setTimeout(() => {
-        Portal.remove(actionSheetKey)
-        actionSheetKey = null
-      }, 200)
+  function ActionSheet () {
+    const offset = useSharedValue(1000);
+
+    const animatedStyles = useAnimatedStyle(() => ({
+      transform: [{ translateY: offset.value }],
+    }))
+
+    const slideOut = () => {
+      // Will change fadeAnim value to 1 in 5 seconds
+      offset.value = withTiming(1000)
     }
-  }
-  const selectAction = function (index) {
-    const result = {
-      errMsg: 'showActionSheet:ok',
-      tapIndex: index
+
+    offset.value = withTiming(0)
+
+    const selectAction = function (index) {
+      const result = {
+        errMsg: 'showActionSheet:ok',
+        tapIndex: index
+      }
+      successHandle(result, success, complete)
+      remove()
     }
-    successHandle(result, success, complete)
-    remove()
-  }
-  const cancelAction = function () {
-    const result = {
-      errMsg: 'showActionSheet:fail cancel'
+
+    const remove = function () {
+      if (actionSheetKey) {
+        slideOut()
+        setTimeout(() => {
+          Portal.remove(actionSheetKey)
+          actionSheetKey = null
+        }, 200)
+      }
     }
-    failHandle(result, fail, complete)
-    remove()
-  }
-  let alertTextList = []
-  if (alertText) {
-    alertTextList = [alertText]
+
+    const cancelAction = function () {
+      const result = {
+        errMsg: 'showActionSheet:fail cancel'
+      }
+      failHandle(result, fail, complete)
+      remove()
+    }
+    return (
+      <TouchableHighlight underlayColor="rgba(0,0,0,0.6)" activeOpacity={1} onPress={cancelAction} style={styles.actionActionMask}>
+        <Animated.View style={[styles.actionSheetContent, animatedStyles]} >
+          { alertText ? <View style={ styles.itemStyle }><Text style={[styles.itemTextStyle, { color: '#666666' }]}>{alertText}</Text></View> : null }
+          { itemList.map((item, index) => <TouchableHighlight key={index} underlayColor="#ececec" onPress={() => selectAction(index)} style={ [styles.itemStyle, itemList.length -1 === index ? {
+            borderBottomWidth: 6,
+            borderBottomStyle: 'solid',
+            borderBottomColor: '#f7f7f7'
+          } : {}] }><Text style={[styles.itemTextStyle, { color: itemColor }]}>{item}</Text></TouchableHighlight>) }
+          <View style={styles.buttonStyle}><TouchableOpacity onPress={cancelAction}><Text style={{ color: "#000000", width: "100%", textAlign: "center" }}>取消</Text></TouchableOpacity></View>
+        </Animated.View>
+      </TouchableHighlight>
+    )
   }
-  const ActionSheetView = <TouchableHighlight underlayColor="rgba(0,0,0,0.6)" onPress={cancelAction} style={styles.actionActionMask}>
-    <Animated.View
-      style={[
-        styles.actionSheetContent,
-        {
-          transform: [{translateY: slideAnim}]
-        }
-      ]}>
-      { alertTextList.map((item, index) => <View key={index} style={ styles.itemStyle }><Text style={[styles.itemTextStyle, { color: '#666666' }]}>{item}</Text></View>) }
-      { itemList.map((item, index) => <TouchableHighlight key={index} underlayColor="#ececec" onPress={() => selectAction(index)} style={ [styles.itemStyle, itemList.length -1 === index ? {
-        borderBottomWidth: 6,
-        borderBottomStyle: 'solid',
-        borderBottomColor: '#f7f7f7'
-      } : {}] }><Text style={[styles.itemTextStyle, { color: itemColor }]}>{item}</Text></TouchableHighlight>) }
-      <View style={styles.buttonStyle}><Button color={'#000000'} title={'取消'} onPress={cancelAction}></Button></View>
-    </Animated.View>
-  </TouchableHighlight>
-  actionSheetKey = Portal.add(ActionSheetView)
-  slideIn()
+  
+  actionSheetKey = Portal.add(<ActionSheet/>)
 }
 
 export {

package/src/platform/api/app/index.web.js

@@ -3,8 +3,27 @@ import { isBrowser, isReact } from '@mpxjs/utils'
 global.__mpxAppCbs = global.__mpxAppCbs || {
   show: [],
   hide: [],
-  error: []
+  error: [],
+  rejection: []
+}
+
+function off (cbs, cb) {
+  if (cb) {
+    const idx = cbs.indexOf(cb)
+    if (idx > -1) cbs.splice(idx, 1)
+  } else {
+    cbs.length = 0
+  }
+}
+
+function onUnhandledRejection (callback) {
+  if (isBrowser || isReact) {
+    global.__mpxAppCbs.rejection.push(callback)
+  }
+}
 
+function offUnhandledRejection (callback) {
+  off(global.__mpxAppCbs.rejection, callback)
 }
 
 function onError (callback) {
@@ -14,9 +33,7 @@ function onError (callback) {
 }
 
 function offError (callback) {
-  const cbs = global.__mpxAppCbs.error
-  const index = cbs.indexOf(callback)
-  if (index > -1) cbs.splice(index, 1)
+  off(global.__mpxAppCbs.error, callback)
 }
 
 function onAppShow (callback) {
@@ -26,9 +43,7 @@ function onAppShow (callback) {
 }
 
 function offAppShow (callback) {
-  const cbs = global.__mpxAppCbs.show
-  const index = cbs.indexOf(callback)
-  if (index > -1) cbs.splice(index, 1)
+  off(global.__mpxAppCbs.show, callback)
 }
 
 function onAppHide (callback) {
@@ -38,9 +53,7 @@ function onAppHide (callback) {
 }
 
 function offAppHide (callback) {
-  const cbs = global.__mpxAppCbs.hide
-  const index = cbs.indexOf(callback)
-  if (index > -1) cbs.splice(index, 1)
+  off(global.__mpxAppCbs.hide, callback)
 }
 
 export {
@@ -49,5 +62,7 @@ export {
   offAppShow,
   offAppHide,
   onError,
-  offError
+  offError,
+  onUnhandledRejection,
+  offUnhandledRejection
 }

package/src/platform/api/create-intersection-observer/rnIntersectionObserver.js

@@ -1,8 +1,7 @@
-import { isArray, isObject, isString, noop } from '@mpxjs/utils'
+import { isArray, isObject, isString, noop, warn } from '@mpxjs/utils'
 import throttle from 'lodash/throttle'
 import { Dimensions } from 'react-native'
 import { getFocusedNavigation } from '../../../common/js'
-
 const WindowRefStr = 'window'
 const IgnoreTarget = 'ignore'
 const DefaultMargin = { top: 0, bottom: 0, left: 0, right: 0 }
@@ -12,13 +11,19 @@ class RNIntersectionObserver {
   constructor (component, options, intersectionCtx) {
     this.id = idCount++
     this.component = component
-    this.options = options
-    this.thresholds = options.thresholds.sort((a, b) => a - b) || [0]
-    this.initialRatio = options.initialRatio || 0
-    this.observeAll = options.observeAll || false
+    this.mpxFileResource = component.__mpxProxy?.options?.mpxFileResource || ''
+    this.options = Object.assign({
+      thresholds: [0],
+      initialRatio: 0,
+      observeAll: false,
+      throttleTime: 100
+    }, options || {})
+    this.thresholds = this.options.thresholds.sort((a, b) => a - b)
+    this.initialRatio = this.options.initialRatio
+    this.observeAll = this.options.observeAll
 
     // 组件上挂载对应的observers，用于在组件销毁的时候进行批量disconnect
-    this.component._intersectionObservers = this.component.__intersectionObservers || []
+    this.component._intersectionObservers = this.component._intersectionObservers || []
     this.component._intersectionObservers.push(this)
 
     this.observerRefs = null
@@ -26,7 +31,7 @@ class RNIntersectionObserver {
     this.margins = DefaultMargin
     this.callback = noop
 
-    this.throttleMeasure = this.getThrottleMeasure(options.throttleTime || 100)
+    this.throttleMeasure = this.getThrottleMeasure(this.options.throttleTime)
 
     // 记录上一次相交的比例
     this.previousIntersectionRatio = []
@@ -52,7 +57,7 @@ class RNIntersectionObserver {
       this.relativeRef = relativeRef
       this.margins = Object.assign({}, DefaultMargin, margins)
     } else {
-      console.warn(`node ${selector}is not found. The relative node for intersection observer will be ignored`)
+      warn(`node ${selector}is not found. The relative node for intersection observer will be ignored`, this.mpxFileResource)
     }
     return this
   }
@@ -65,7 +70,7 @@ class RNIntersectionObserver {
 
   observe (selector, callback) {
     if (this.observerRefs) {
-      console.error('"observe" call can be only called once in IntersectionObserver')
+      warn('"observe" call can be only called once in IntersectionObserver', this.mpxFileResource)
       return
     }
     let targetRef = null
@@ -75,7 +80,7 @@ class RNIntersectionObserver {
       targetRef = this.component.__selectRef(selector, 'node')
     }
     if (!targetRef || targetRef.length === 0) {
-      console.error('intersection observer target not found')
+      warn('intersection observer target not found', this.mpxFileResource)
       return
     }
     this.observerRefs = isArray(targetRef) ? targetRef : [targetRef]
@@ -85,7 +90,7 @@ class RNIntersectionObserver {
 
   _getWindowRect () {
     if (this.windowRect) return this.windowRect
-    const navigation = getFocusedNavigation()
+    const navigation = getFocusedNavigation() || {}
     const screen = Dimensions.get('screen')
     const navigationLayout = navigation.layout || {
       x: 0,
@@ -95,10 +100,10 @@ class RNIntersectionObserver {
     }
 
     const windowRect = {
-      top: navigationLayout.y + this.margins.top,
-      left: navigationLayout.x + this.margins.left,
-      right: navigationLayout.width - this.margins.right,
-      bottom: navigationLayout.y + navigationLayout.height - this.margins.bottom
+      top: navigationLayout.y - this.margins.top,
+      left: 0 - this.margins.left,
+      right: navigationLayout.width + this.margins.right,
+      bottom: navigationLayout.y + navigationLayout.height + this.margins.bottom
     }
 
     this.windowRect = windowRect
@@ -227,7 +232,7 @@ class RNIntersectionObserver {
         }
       })
     }).catch((e) => {
-      console.log('_measureTarget fail', e)
+      warn('_measureTarget fail', this.mpxFileResource, e)
     })
   }
 

package/src/platform/api/image/index.ali.js

@@ -30,7 +30,10 @@ function compressImage (options = {}) {
   return ENV_OBJ.compressImage(opts)
 }
 
+const getImageInfo = ENV_OBJ.getImageInfo
+
 export {
   previewImage,
-  compressImage
+  compressImage,
+  getImageInfo
 }

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

@@ -0,0 +1,45 @@
+import { envError, defineUnsupportedProps, successHandle, failHandle } from '../../../common/js'
+import { Image } from 'react-native'
+
+const previewImage = envError('previewImage')
+
+const compressImage = envError('compressImage')
+
+const getImageInfo = function (options = {}) {
+  const { src, success, fail, complete } = options
+  if (src === undefined) {
+    const result = {
+      errMsg: 'getImageInfo:fail parameter error: parameter.src should be String instead of Undefined;',
+      errno: 1001
+    }
+    failHandle(result, fail, complete)
+    return
+  }
+  if (src === '') {
+    const result = {
+      errMsg: 'getImageInfo:fail image not found'
+    }
+    failHandle(result, fail, complete)
+    return
+  }
+  Image.getSize(src, (width, height) => {
+    const result = {
+      errMsg: 'getImageInfo:ok',
+      width,
+      height
+    }
+    defineUnsupportedProps(result, ['path', 'orientation', 'type'])
+    successHandle(result, success, complete)
+  }, (err) => {
+    const result = {
+      errMsg: 'getImageInfo:fail download image fail. reason: ' + err
+    }
+    failHandle(result, fail, complete)
+  })
+}
+
+export {
+  previewImage,
+  compressImage,
+  getImageInfo
+}

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

@@ -4,7 +4,10 @@ const previewImage = ENV_OBJ.previewImage || envError('previewImage')
 
 const compressImage = ENV_OBJ.compressImage || envError('compressImage')
 
+const getImageInfo = ENV_OBJ.getImageInfo || envError('getImageInfo')
+
 export {
   previewImage,
-  compressImage
+  compressImage,
+  getImageInfo
 }

package/src/platform/api/image/index.web.js

@@ -1,5 +1,5 @@
 import Preview from './Preview'
-import { isBrowser, throwSSRWarning, envError } from '../../../common/js'
+import { isBrowser, throwSSRWarning, envError, defineUnsupportedProps, successHandle, failHandle } from '../../../common/js'
 
 let preview = null
 
@@ -15,9 +15,53 @@ const previewImage = (options) => {
   if (!preview) preview = new Preview()
   preview.show(options)
 }
+
 const compressImage = envError('compressImage')
 
+const getImageInfo = function (options = {}) {
+  const { src, success, fail, complete } = options
+
+  if (src === undefined) {
+    const result = {
+      errMsg: 'getImageInfo:fail parameter error: parameter.src should be String instead of Undefined;',
+      errno: 1001
+    }
+    failHandle(result, fail, complete)
+    return
+  }
+  if (src === '') {
+    const result = {
+      errMsg: 'getImageInfo:fail image not found'
+    }
+    failHandle(result, fail, complete)
+    return
+  }
+
+  const img = new Image()
+  img.src = src
+
+  img.onload = function () {
+    const width = img.width
+    const height = img.height
+    const result = {
+      errMsg: 'getImageInfo:ok',
+      width,
+      height
+    }
+    defineUnsupportedProps(result, ['path', 'orientation', 'type'])
+    successHandle(result, success, complete)
+  }
+
+  img.onerror = function () {
+    const result = {
+      errMsg: 'getImageInfo:fail download image fail. '
+    }
+    failHandle(result, fail, complete)
+  }
+}
+
 export {
   previewImage,
-  compressImage
+  compressImage,
+  getImageInfo
 }

package/src/platform/api/modal/rnModal.jsx

@@ -17,7 +17,7 @@ const showModal = function (options = {}) {
     fail,
     complete
   } = options
-  const modalWidth = width - 60
+  const modalWidth = width * 0.8
   const styles = StyleSheet.create({
     modalTask: {
       left: 0,
@@ -53,7 +53,8 @@ const showModal = function (options = {}) {
       lineHeight: 26,
       color: '#808080',
       paddingLeft: 20,
-      paddingRight: 20
+      paddingRight: 20,
+      textAlign: 'center'
     },
     modalBtnBox: {
       borderTopWidth: StyleSheet.hairlineWidth,
@@ -67,8 +68,8 @@ const showModal = function (options = {}) {
     modalBtn: {
       flex: 1,
       textAlign: 'center',
-      paddingTop: 10,
-      paddingBottom: 10,
+      paddingTop: width * 0.04,
+      paddingBottom: width * 0.04,
     },
     modalButton: {
       width: '100%',
@@ -88,9 +89,8 @@ const showModal = function (options = {}) {
   let editableContent = []
   let modalButton = [{
     text: confirmText,
-    confirmColor,
     type: 'confirm',
-    color: 'rgb(87, 107, 149)'
+    color: confirmColor
   }]
   let contentText = content
   const onChangeText = function (text) {
@@ -128,10 +128,9 @@ const showModal = function (options = {}) {
   if (showCancel) {
     modalButton.unshift({
       text: cancelText,
-      cancelColor,
       type: 'cancel',
       style: styles.cancelStyle,
-      color: '#000000'
+      color: cancelColor
     })
   }
   ModalView = <View style={styles.modalTask}>

package/src/platform/api/request/index.web.js

@@ -107,10 +107,9 @@ function request (options = { url: '' }) {
       errMsg: `request:fail ${err}`,
       statusCode: response.status,
       header: response.headers,
-      data: response.data,
-      stack: realError.stack,
-      ...realError
+      data: response.data
     }
+    Object.assign(res, realError)
     failHandle(res, fail, complete)
   })
 

package/src/platform/api/set-navigation-bar/index.ali.js

@@ -17,7 +17,12 @@ function setNavigationBarColor (options = {}) {
   return ENV_OBJ.setNavigationBar(options)
 }
 
+function hideHomeButton (options = {}) {
+  return ENV_OBJ.hideBackHome(options)
+}
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }

package/src/platform/api/set-navigation-bar/index.ios.js

@@ -1,4 +1,4 @@
-import { successHandle, failHandle, getFocusedNavigation } from '../../../common/js'
+import { successHandle, failHandle, getFocusedNavigation, envError } from '../../../common/js'
 import { nextTick } from '../next-tick'
 function setNavigationBarTitle (options = {}) {
   const { title = '', success, fail, complete } = options
@@ -7,7 +7,7 @@ function setNavigationBarTitle (options = {}) {
     failHandle({ errMsg: 'setNavigationBarTitle:fail' }, fail, complete)
   } else {
     nextTick(() => {
-      navigation.setOptions({ headerTitle: title })
+      navigation.setOptions({ title })
       successHandle({ errMsg: 'setNavigationBarTitle:ok' }, success, complete)
     })
   }
@@ -31,7 +31,10 @@ function setNavigationBarColor (options = {}) {
   }
 }
 
+const hideHomeButton = envError('hideHomeButton')
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }

package/src/platform/api/set-navigation-bar/index.js

@@ -4,7 +4,10 @@ const setNavigationBarTitle = ENV_OBJ.setNavigationBarTitle || envError('setNavi
 
 const setNavigationBarColor = ENV_OBJ.setNavigationBarColor || envError('setNavigationBarColor')
 
+const hideHomeButton = ENV_OBJ.hideHomeButton || envError('hideHomeButton')
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }

package/src/platform/api/set-navigation-bar/index.web.js

@@ -1,4 +1,4 @@
-import { isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
+import { isBrowser, envError, throwSSRWarning, successHandle } from '../../../common/js'
 
 function setNavigationBarTitle (options = {}) {
   if (!isBrowser) {
@@ -26,7 +26,10 @@ function setNavigationBarColor (options = {}) {
   successHandle({ errMsg: 'setNavigationBarColor:ok' }, success, complete)
 }
 
+const hideHomeButton = envError('hideHomeButton')
+
 export {
   setNavigationBarTitle,
-  setNavigationBarColor
+  setNavigationBarColor,
+  hideHomeButton
 }

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

@@ -0,0 +1,19 @@
+import { ENV_OBJ, envError } from '../../../common/js'
+
+const getSetting = ENV_OBJ.getSetting || envError('getSetting')
+
+const openSetting = ENV_OBJ.openSetting || envError('openSetting')
+
+const enableAlertBeforeUnload = ENV_OBJ.enableAlertBeforeUnload || envError('enableAlertBeforeUnload')
+
+const disableAlertBeforeUnload = ENV_OBJ.disableAlertBeforeUnload || envError('disableAlertBeforeUnload')
+
+const getMenuButtonBoundingClientRect = ENV_OBJ.getMenuButtonBoundingClientRect || envError('getMenuButtonBoundingClientRect')
+
+export {
+  getSetting,
+  openSetting,
+  enableAlertBeforeUnload,
+  disableAlertBeforeUnload,
+  getMenuButtonBoundingClientRect
+}

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

@@ -1 +1,84 @@
-export * from './rnSystem'
+import DeviceInfo from 'react-native-device-info'
+import { PixelRatio } from 'react-native'
+import { successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
+import { getWindowInfo, getLaunchOptionsSync, getEnterOptionsSync } from './rnSystem'
+
+const getSystemInfoSync = function () {
+  const windowInfo = getWindowInfo()
+  const { screenWidth, screenHeight } = windowInfo
+
+  const result = {
+    brand: DeviceInfo.getBrand(),
+    model: DeviceInfo.getModel(),
+    system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
+    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
+    deviceOrientation: screenWidth > screenHeight ? 'portrait' : 'landscape',
+    fontSizeSetting: PixelRatio.getFontScale()
+  }
+  Object.assign(result, windowInfo)
+  defineUnsupportedProps(result, [
+    'language',
+    'version',
+    'SDKVersion',
+    'benchmarkLevel',
+    'albumAuthorized',
+    'cameraAuthorized',
+    'locationAuthorized',
+    'microphoneAuthorized',
+    'notificationAuthorized',
+    'phoneCalendarAuthorized',
+    'host',
+    'enableDebug',
+    'notificationAlertAuthorized',
+    'notificationBadgeAuthorized',
+    'notificationSoundAuthorized',
+    'bluetoothEnabled',
+    'locationEnabled',
+    'wifiEnabled',
+    'locationReducedAccuracy',
+    'theme'
+  ])
+  return result
+}
+
+const getSystemInfo = function (options = {}) {
+  const { success, fail, complete } = options
+  try {
+    const systemInfo = getSystemInfoSync()
+    Object.assign(systemInfo, {
+      errMsg: 'setStorage:ok'
+    })
+    successHandle(systemInfo, success, complete)
+  } catch (err) {
+    const result = {
+      errMsg: `getSystemInfo:fail ${err}`
+    }
+    failHandle(result, fail, complete)
+  }
+}
+
+const getDeviceInfo = function () {
+  const deviceInfo = {}
+  if (__mpx_mode__ === 'android') {
+    const deviceAbi = DeviceInfo.supported64BitAbisSync() || []
+    deviceInfo.deviceAbi = deviceAbi[0] || null
+  }
+  defineUnsupportedProps(deviceInfo, ['benchmarkLevel', 'abi', 'cpuType'])
+  Object.assign(deviceInfo, {
+    brand: DeviceInfo.getBrand(),
+    model: DeviceInfo.getModel(),
+    system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
+    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
+    memorySize: DeviceInfo.getTotalMemorySync() / (1024 * 1024)
+  })
+  return deviceInfo
+}
+
+export {
+  getSystemInfo,
+  getSystemInfoSync,
+  getDeviceInfo,
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
+}

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

@@ -139,7 +139,7 @@ const getLaunchOptionsSync = function () {
     throwSSRWarning('getLaunchOptionsSync API is running in non browser environments')
     return
   }
-  return global.__mpxEnterOptions || {}
+  return global.__mpxLaunchOptions || {}
 }
 
 export {

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

@@ -1,98 +1,54 @@
-import DeviceInfo from 'react-native-device-info'
-import { PixelRatio } from 'react-native'
-import { successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
-import { getWindowInfo } from './rnWindowInfo'
+import { PixelRatio, Dimensions } from 'react-native'
+import { initialWindowMetrics } from 'react-native-safe-area-context'
+import { getFocusedNavigation } from '../../../common/js'
 
-const getSystemInfoSync = function () {
-  const windowInfo = getWindowInfo()
-  const { screenWidth, screenHeight } = windowInfo
-
-  const result = {
-    brand: DeviceInfo.getBrand(),
-    model: DeviceInfo.getModel(),
-    system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
-    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
-    deviceOrientation: screenWidth > screenHeight ? 'portrait' : 'landscape',
-    fontSizeSetting: PixelRatio.getFontScale()
-  }
-  Object.assign(result, windowInfo)
-  defineUnsupportedProps(result, [
-    'language',
-    'version',
-    'SDKVersion',
-    'benchmarkLevel',
-    'albumAuthorized',
-    'cameraAuthorized',
-    'locationAuthorized',
-    'microphoneAuthorized',
-    'notificationAuthorized',
-    'phoneCalendarAuthorized',
-    'host',
-    'enableDebug',
-    'notificationAlertAuthorized',
-    'notificationBadgeAuthorized',
-    'notificationSoundAuthorized',
-    'bluetoothEnabled',
-    'locationEnabled',
-    'wifiEnabled',
-    'locationReducedAccuracy',
-    'theme'
-  ])
-  return result
-}
-
-const getSystemInfo = function (options = {}) {
-  const { success, fail, complete } = options
+const getWindowInfo = function () {
+  const dimensionsScreen = Dimensions.get('screen')
+  const navigation = getFocusedNavigation() || {}
+  const initialWindowMetricsInset = initialWindowMetrics?.insets || {}
+  const navigationInsets = navigation.insets || {}
+  const insets = Object.assign(initialWindowMetricsInset, navigationInsets)
+  let safeArea = {}
+  const { top = 0, bottom = 0, left = 0, right = 0 } = insets
+  const screenHeight = __mpx_mode__ === 'ios' ? dimensionsScreen.height : dimensionsScreen.height - bottom // 解决安卓开启屏幕内三建导航安卓把安全区计算进去后产生的影响
+  const screenWidth = __mpx_mode__ === 'ios' ? dimensionsScreen.width : dimensionsScreen.width - right
+  const layout = navigation.layout || {}
+  const layoutHeight = layout.height || 0
+  const layoutWidth = layout.width || 0
+  const windowHeight = layoutHeight || screenHeight
   try {
-    const systemInfo = getSystemInfoSync()
-    Object.assign(systemInfo, {
-      errMsg: 'setStorage:ok'
-    })
-    successHandle(systemInfo, success, complete)
-  } catch (err) {
-    const result = {
-      errMsg: `getSystemInfo:fail ${err}`
+    safeArea = {
+      left,
+      right: screenWidth - right,
+      top,
+      bottom: screenHeight - bottom,
+      height: screenHeight - top - bottom,
+      width: screenWidth - left - right
     }
-    failHandle(result, fail, complete)
+  } catch (error) {
   }
-}
-
-const getDeviceInfo = function () {
-  const deviceInfo = {}
-  if (__mpx_mode__ === 'android') {
-    const deviceAbi = DeviceInfo.supported64BitAbisSync() || []
-    deviceInfo.deviceAbi = deviceAbi[0] || null
+  const result = {
+    pixelRatio: PixelRatio.get(),
+    windowWidth: layoutWidth || screenWidth,
+    windowHeight, // 取不到layout的时候有个兜底
+    screenWidth: screenWidth,
+    screenHeight: screenHeight,
+    screenTop: screenHeight - windowHeight,
+    statusBarHeight: safeArea.top,
+    safeArea
   }
-  defineUnsupportedProps(deviceInfo, ['benchmarkLevel', 'abi', 'cpuType'])
-  Object.assign(deviceInfo, {
-    brand: DeviceInfo.getBrand(),
-    model: DeviceInfo.getModel(),
-    system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
-    platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
-    memorySize: DeviceInfo.getTotalMemorySync() / (1024 * 1024)
-  })
-  return deviceInfo
+  return result
 }
 
 const getLaunchOptionsSync = function () {
-  const options = global.__mpxEnterOptions || {}
-  const { path, scene, query } = options
-  return {
-    path,
-    scene,
-    query
-  }
+  return global.__mpxLaunchOptions || {}
 }
 
 const getEnterOptionsSync = function () {
-  const result = getLaunchOptionsSync()
-  return result
+  return global.__mpxEnterOptions || {}
 }
 
 export {
-  getSystemInfo,
-  getSystemInfoSync,
-  getDeviceInfo,
   getWindowInfo,
   getLaunchOptionsSync,
   getEnterOptionsSync

package/src/platform/api/toast/rnToast.jsx

@@ -1,13 +1,15 @@
-import { View, Text, Image, StyleSheet, ActivityIndicator } from 'react-native'
+import { View, Text, Image, StyleSheet, ActivityIndicator, Dimensions } from 'react-native'
 import { successHandle, failHandle } from '../../../common/js'
 import { Portal } from '@ant-design/react-native'
 
 let toastKey
 let isLoadingShow
+const dimensionsScreen = Dimensions.get('screen')
+const screenHeight = dimensionsScreen.height
+const contentTop = parseInt(screenHeight * 0.35)
 let tId // show duration 计时id
 const styles = StyleSheet.create({
   toastContent: {
-    minWdth: 150,
     maxWidth: '60%',
     backgroundColor: 'rgba(20, 20, 20, 0.7)',
     paddingTop: 15,
@@ -18,7 +20,8 @@ const styles = StyleSheet.create({
     display: 'flex',
     flexDirection: 'column',
     justifyContent: 'center',
-    alignItems: 'center'
+    alignItems: 'center',
+    marginTop: contentTop // 小程序里面展示偏上一点
   },
   toastWrap: {
     left: 0,
@@ -28,25 +31,29 @@ const styles = StyleSheet.create({
     zIndex: 10000,
     position: "absolute",
     display: 'flex',
-    justifyContent: 'center',
     alignItems: 'center'
   },
+  toastHasIcon: {
+    height: 110,
+    width: 120
+  },
   toastImg: {
     width: 40,
     height: 40,
     marginLeft: 'auto',
-    marginRight: 'auto',
-    marginBottom: 10
+    marginRight: 'auto'
   },
   toastText: {
     textAlign: 'center',
     color: '#ffffff',
-    fontSize: 14,
+    fontSize: 12,
     lineHeight: 18,
     height: 18,
-    overflow: 'hidden'
+    overflow: 'hidden',
+    marginTop: 10
   }
 })
+
 function showToast (options = {}) {
   const { title, icon = 'success', image, duration = 1500, mask = false, success, fail, complete, isLoading } = options
   let ToastView
@@ -64,29 +71,29 @@ function showToast (options = {}) {
   tId = null
   if (image || icon === 'success' || icon === 'error') {
     ToastView = <View style={styles.toastWrap} pointerEvents={pointerEvents}>
-      <View style={styles.toastContent}>
+      <View style={[styles.toastContent, styles.toastHasIcon]}>
         <Image style={ styles.toastImg } source={{uri: image || iconImg[icon]}}></Image>
-        <Text style={styles.toastText}>{title}</Text>
+        { title ? <Text style={styles.toastText}>{title}</Text> : null }
       </View>
     </View>
   } else if (icon === 'loading') {
     ToastView = <View style={styles.toastWrap} pointerEvents={pointerEvents}>
-      <View style={styles.toastContent}>
+      <View style={[styles.toastContent, styles.toastHasIcon]}>
         <ActivityIndicator
           animating
-          style={{ marginBottom: 10 }}
           size='small'
           color='#eee'
         />
-        <Text style={styles.toastText}>{title}</Text>
+        { title ? <Text style={styles.toastText}>{title}</Text> : null }
       </View>
     </View>
   }  else  {
     ToastView = <View style={styles.toastWrap} pointerEvents={pointerEvents}>
       <View style={styles.toastContent}>
-        <Text numberOfLines={2} style={{ ...styles.toastText, ...(icon === 'none' ? {
-            height: 36
-          } : {}) }}>{title}</Text>
+        { title ? <Text numberOfLines={2} style={{ ...styles.toastText, ...(icon === 'none' ? {
+            height: 'auto',
+            marginTop: 0
+          } : {}) }}>{title}</Text> : null }
       </View>
     </View>
   }

package/src/platform/index.js

@@ -43,7 +43,7 @@ export * from './api/file'
 // getUserInfo
 export * from './api/get-user-info'
 
-// previewImage, compressImage
+// previewImage, compressImage, getImageInfo
 export * from './api/image'
 
 // login
@@ -116,3 +116,6 @@ export * from './api/vibrate'
 
 // onKeyboardHeightChange, offKeyboardHeightChange, hideKeyboard
 export * from './api/keyboard'
+
+// getSetting, openSetting, enableAlertBeforeUnload, disableAlertBeforeUnload, getMenuButtonBoundingClientRect
+export * from './api/setting'

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

@@ -1,42 +0,0 @@
-import { PixelRatio, Dimensions } from 'react-native'
-import { initialWindowMetrics } from 'react-native-safe-area-context'
-import { getFocusedNavigation } from '../../../common/js'
-
-const getWindowInfo = function () {
-  const dimensionsScreen = Dimensions.get('screen')
-  const navigation = getFocusedNavigation()
-  const insets = Object.assign(initialWindowMetrics?.insets, navigation?.insets)
-  let safeArea = {}
-  const { top = 0, bottom = 0, left = 0, right = 0 } = insets
-  const screenHeight = dimensionsScreen.height
-  const screenWidth = dimensionsScreen.width
-  const layout = navigation?.layout || {}
-  const layoutHeight = layout.height || 0
-  const layoutWidth = layout.width || 0
-  const windowHeight = layoutHeight || screenHeight
-  try {
-    safeArea = {
-      left,
-      right: screenWidth - right,
-      top,
-      bottom: screenHeight - bottom,
-      height: screenHeight - top - bottom,
-      width: screenWidth - left - right
-    }
-  } catch (error) {
-  }
-  const result = {
-    pixelRatio: PixelRatio.get(),
-    windowWidth: layoutWidth || screenWidth,
-    windowHeight, // 取不到layout的时候有个兜底
-    screenWidth: screenWidth,
-    screenHeight: screenHeight,
-    screenTop: screenHeight - windowHeight,
-    safeArea
-  }
-  return result
-}
-
-export {
-  getWindowInfo
-}