@mpxjs/api-proxy 2.9.60 → 2.9.62

package/LICENSE

@@ -0,0 +1,433 @@
+                              Apache License
+
+                        Version 2.0, January 2004
+
+                     http://www.apache.org/licenses/
+
+
+
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+
+
+
+1. Definitions.
+
+
+
+
+   "License" shall mean the terms and conditions for use, reproduction,
+
+   and distribution as defined by Sections 1 through 9 of this document.
+
+
+
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+
+   the copyright owner that is granting the License.
+
+
+
+
+   "Legal Entity" shall mean the union of the acting entity and all
+
+   other entities that control, are controlled by, or are under common
+
+   control with that entity. For the purposes of this definition,
+
+   "control" means (i) the power, direct or indirect, to cause the
+
+   direction or management of such entity, whether by contract or
+
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+
+
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+
+   exercising permissions granted by this License.
+
+
+
+
+   "Source" form shall mean the preferred form for making modifications,
+
+   including but not limited to software source code, documentation
+
+   source, and configuration files.
+
+
+
+
+   "Object" form shall mean any form resulting from mechanical
+
+   transformation or translation of a Source form, including but
+
+   not limited to compiled object code, generated documentation,
+
+   and conversions to other media types.
+
+
+
+
+   "Work" shall mean the work of authorship, whether in Source or
+
+   Object form, made available under the License, as indicated by a
+
+   copyright notice that is included in or attached to the work
+
+   (an example is provided in the Appendix below).
+
+
+
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+
+   form, that is based on (or derived from) the Work and for which the
+
+   editorial revisions, annotations, elaborations, or other modifications
+
+   represent, as a whole, an original work of authorship. For the purposes
+
+   of this License, Derivative Works shall not include works that remain
+
+   separable from, or merely link (or bind by name) to the interfaces of,
+
+   the Work and Derivative Works thereof.
+
+
+
+
+   "Contribution" shall mean any work of authorship, including
+
+   the original version of the Work and any modifications or additions
+
+   to that Work or Derivative Works thereof, that is intentionally
+
+   submitted to Licensor for inclusion in the Work by the copyright owner
+
+   or by an individual or Legal Entity authorized to submit on behalf of
+
+   the copyright owner. For the purposes of this definition, "submitted"
+
+   means any form of electronic, verbal, or written communication sent
+
+   to the Licensor or its representatives, including but not limited to
+
+   communication on electronic mailing lists, source code control systems,
+
+   and issue tracking systems that are managed by, or on behalf of, the
+
+   Licensor for the purpose of discussing and improving the Work, but
+
+   excluding communication that is conspicuously marked or otherwise
+
+   designated in writing by the copyright owner as "Not a Contribution."
+
+
+
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+
+   on behalf of whom a Contribution has been received by Licensor and
+
+   subsequently incorporated within the Work.
+
+
+
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+
+   this License, each Contributor hereby grants to You a perpetual,
+
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+
+   copyright license to reproduce, prepare Derivative Works of,
+
+   publicly display, publicly perform, sublicense, and distribute the
+
+   Work and such Derivative Works in Source or Object form.
+
+
+
+
+3. Grant of Patent License. Subject to the terms and conditions of
+
+   this License, each Contributor hereby grants to You a perpetual,
+
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+
+   (except as stated in this section) patent license to make, have made,
+
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+
+   where such license applies only to those patent claims licensable
+
+   by such Contributor that are necessarily infringed by their
+
+   Contribution(s) alone or by combination of their Contribution(s)
+
+   with the Work to which such Contribution(s) was submitted. If You
+
+   institute patent litigation against any entity (including a
+
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+
+   or a Contribution incorporated within the Work constitutes direct
+
+   or contributory patent infringement, then any patent licenses
+
+   granted to You under this License for that Work shall terminate
+
+   as of the date such litigation is filed.
+
+
+
+
+4. Redistribution. You may reproduce and distribute copies of the
+
+   Work or Derivative Works thereof in any medium, with or without
+
+   modifications, and in Source or Object form, provided that You
+
+   meet the following conditions:
+
+
+
+
+   (a) You must give any other recipients of the Work or
+
+       Derivative Works a copy of this License; and
+
+
+
+
+   (b) You must cause any modified files to carry prominent notices
+
+       stating that You changed the files; and
+
+
+
+
+   (c) You must retain, in the Source form of any Derivative Works
+
+       that You distribute, all copyright, patent, trademark, and
+
+       attribution notices from the Source form of the Work,
+
+       excluding those notices that do not pertain to any part of
+
+       the Derivative Works; and
+
+
+
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+
+       distribution, then any Derivative Works that You distribute must
+
+       include a readable copy of the attribution notices contained
+
+       within such NOTICE file, excluding those notices that do not
+
+       pertain to any part of the Derivative Works, in at least one
+
+       of the following places: within a NOTICE text file distributed
+
+       as part of the Derivative Works; within the Source form or
+
+       documentation, if provided along with the Derivative Works; or,
+
+       within a display generated by the Derivative Works, if and
+
+       wherever such third-party notices normally appear. The contents
+
+       of the NOTICE file are for informational purposes only and
+
+       do not modify the License. You may add Your own attribution
+
+       notices within Derivative Works that You distribute, alongside
+
+       or as an addendum to the NOTICE text from the Work, provided
+
+       that such additional attribution notices cannot be construed
+
+       as modifying the License.
+
+
+
+
+   You may add Your own copyright statement to Your modifications and
+
+   may provide additional or different license terms and conditions
+
+   for use, reproduction, or distribution of Your modifications, or
+
+   for any such Derivative Works as a whole, provided Your use,
+
+   reproduction, and distribution of the Work otherwise complies with
+
+   the conditions stated in this License.
+
+
+
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+
+   any Contribution intentionally submitted for inclusion in the Work
+
+   by You to the Licensor shall be under the terms and conditions of
+
+   this License, without any additional terms or conditions.
+
+   Notwithstanding the above, nothing herein shall supersede or modify
+
+   the terms of any separate license agreement you may have executed
+
+   with Licensor regarding such Contributions.
+
+
+
+
+6. Trademarks. This License does not grant permission to use the trade
+
+   names, trademarks, service marks, or product names of the Licensor,
+
+   except as required for reasonable and customary use in describing the
+
+   origin of the Work and reproducing the content of the NOTICE file.
+
+
+
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+
+   agreed to in writing, Licensor provides the Work (and each
+
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+
+   implied, including, without limitation, any warranties or conditions
+
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+
+   appropriateness of using or redistributing the Work and assume any
+
+   risks associated with Your exercise of permissions under this License.
+
+
+
+
+8. Limitation of Liability. In no event and under no legal theory,
+
+   whether in tort (including negligence), contract, or otherwise,
+
+   unless required by applicable law (such as deliberate and grossly
+
+   negligent acts) or agreed to in writing, shall any Contributor be
+
+   liable to You for damages, including any direct, indirect, special,
+
+   incidental, or consequential damages of any character arising as a
+
+   result of this License or out of the use or inability to use the
+
+   Work (including but not limited to damages for loss of goodwill,
+
+   work stoppage, computer failure or malfunction, or any and all
+
+   other commercial damages or losses), even if such Contributor
+
+   has been advised of the possibility of such damages.
+
+
+
+
+9. Accepting Warranty or Additional Liability. While redistributing
+
+   the Work or Derivative Works thereof, You may choose to offer,
+
+   and charge a fee for, acceptance of support, warranty, indemnity,
+
+   or other liability obligations and/or rights consistent with this
+
+   License. However, in accepting such obligations, You may act only
+
+   on Your own behalf and on Your sole responsibility, not on behalf
+
+   of any other Contributor, and only if You agree to indemnify,
+
+   defend, and hold each Contributor harmless for any liability
+
+   incurred by, or claims asserted against, such Contributor by reason
+
+   of your accepting any such warranty or additional liability.
+
+
+
+
+END OF TERMS AND CONDITIONS
+
+
+
+
+APPENDIX: How to apply the Apache License to your work.
+
+
+
+
+   To apply the Apache License to your work, attach the following
+
+   boilerplate notice, with the fields enclosed by brackets "{}"
+
+   replaced with your own identifying information. (Don't include
+
+   the brackets!)  The text should be enclosed in the appropriate
+
+   comment syntax for the file format. We also recommend that a
+
+   file or class name and description of purpose be included on the
+
+   same "printed page" as the copyright notice for easier
+
+   identification within third-party archives.
+
+
+
+
+Copyright (C) 2017 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.
+
+
+
+
+Licensed under the Apache License, Version 2.0 (the "License");
+
+you may not use this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+
+
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+
+
+
+Unless required by applicable law or agreed to in writing, software
+
+distributed under the License is distributed on an "AS IS" BASIS,
+
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and
+
+limitations under the License.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.60",
+  "version": "2.9.62",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -43,19 +43,18 @@
   "peerDependencies": {
     "@ant-design/react-native": "^5.1.3",
     "@react-native-async-storage/async-storage": "^1.23.1",
-    "@react-native-clipboard/clipboard": "^1.14.0",
     "@react-native-community/netinfo": "^11.2.1",
     "expo-brightness": "~11.8.0",
+    "expo-clipboard": "~6.0.3",
     "react-native-device-info": "^10.13.2",
     "react-native-get-location": "^4.0.1",
-    "react-native-safe-area-context": "^4.10.1",
-    "react-native-webview": "^13.10.5"
+    "react-native-safe-area-context": "^4.10.1"
   },
   "peerDependenciesMeta": {
     "@react-native-async-storage/async-storage": {
       "optional": true
     },
-    "@react-native-clipboard/clipboard": {
+    "expo-clipboard": {
       "optional": true
     },
     "@react-native-community/netinfo": {
@@ -75,9 +74,7 @@
     },
     "expo-brightness": {
       "optional": true
-    },
-    "react-native-webview": {
-      "optional": true
     }
-  }
+  },
+  "gitHead": "c31a343e7ef2c1c1585002752d8c50f016a858ae"
 }

package/src/common/js/utils.js

@@ -87,6 +87,14 @@ function failHandle (result, fail, complete) {
   typeof complete === 'function' && complete(result)
 }
 
+function getFocusedNavigation () {
+  for (const key in global.__mpxPagesMap) {
+    const navigation = global.__mpxPagesMap[key]?.[1]
+    if (navigation && navigation.isFocused()) {
+      return navigation
+    }
+  }
+}
 const ENV_OBJ = getEnvObj()
 
 export {
@@ -100,5 +108,6 @@ export {
   ENV_OBJ,
   defineUnsupportedProps,
   successHandle,
-  failHandle
+  failHandle,
+  getFocusedNavigation
 }

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

@@ -1,7 +1,7 @@
 import { View, TouchableHighlight, Text, StyleSheet, Button, Animated } from 'react-native'
 import { successHandle, failHandle } from '../../../common/js'
 import { Portal } from '@ant-design/react-native'
-function showActionSheet (options) {
+function showActionSheet (options = {}) {
   const { alertText, itemList = [], itemColor = '#000000', success, fail, complete } = options
   let actionSheetKey
   const slideAnim = new Animated.Value(500)

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

@@ -1,7 +1,10 @@
 import { fromByteArray, toByteArray } from './base64'
 
 function base64ToArrayBuffer (base64) {
-  return toByteArray(base64)?.buffer
+  if (__mpx_mode__ === 'web') {
+    return toByteArray(base64)?.buffer
+  }
+  return toByteArray(base64)
 }
 
 function arrayBufferToBase64 (arrayBuffer) {

package/src/platform/api/clipboard-data/rnClipboard.js

@@ -1,7 +1,8 @@
-import Clipboard from '@react-native-clipboard/clipboard'
 import { successHandle, failHandle } from '../../../common/js'
 import { type } from '@mpxjs/utils'
-const setClipboardData = function (options) {
+import { getStringAsync, setStringAsync } from 'expo-clipboard'
+
+const setClipboardData = function (options = {}) {
   const { data, success, fail, complete } = options
   if (!data || type(data) !== 'String') {
     const errStr = !data ? 'parameter.data should be String instead of Undefined;' : `parameter.data should be String instead of ${type(data)};`
@@ -12,24 +13,30 @@ const setClipboardData = function (options) {
     failHandle(result, fail, complete)
     return
   }
-  Clipboard.setString(data)
-  const result = {
-    errMsg: 'setClipboardData:ok'
-  }
-  successHandle(result, success, complete)
+  setStringAsync(data).then(() => {
+    const result = {
+      errMsg: 'setClipboardData:ok'
+    }
+    successHandle(result, success, complete)
+  }).catch((e) => {
+    const result = {
+      errMsg: `setClipboardData:fail ${e}`
+    }
+    failHandle(result, fail, complete)
+  })
 }
 
-const getClipboardData = function (options) {
+const getClipboardData = function (options = {}) {
   const { success, fail, complete } = options
-  Clipboard.getString().then((data) => {
+  getStringAsync().then((data) => {
     const result = {
       data,
       errMsg: 'getClipboardData:ok'
     }
     successHandle(result, success, complete)
-  }).catch(() => {
+  }).catch((e) => {
     const result = {
-      errMsg: 'setClipboardData:fail'
+      errMsg: `getClipboardData:fail ${e}`
     }
     failHandle(result, fail, complete)
   })

package/src/platform/api/create-selector-query/rnSelectQuery.js

@@ -28,6 +28,12 @@ export default class SelectorQuery {
     if (!this._component) {
       warn('Please use SelectorQuery.in method to set context')
     }
+    selector = selector.trim()
+    // 后续如果要支持这种复杂的选择器，需要按场景拆分这些判断逻辑
+    if (/>|,|>>>|\+|~|\s+/.test(selector)) {
+      warn('SelectQuery.select don\'t support combinator selector, it only supports selector like #a or .a or .a.b now.')
+      return new NodeRef([], this, !all)
+    }
     const refs = this._component && this._component.__selectRef(selector, 'node', all)
     return new NodeRef(refs, this, !all)
   }

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

@@ -13,7 +13,7 @@ const getConnectionType = function (connectionInfo) {
   return type
 }
 
-const getNetworkType = function (options) {
+const getNetworkType = function (options = {}) {
   const { success, fail, complete } = options
   NetInfo.fetch().then((connectionInfo) => {
     const result = {

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

@@ -0,0 +1,23 @@
+import { changeOpts, ENV_OBJ, envError } from '../../../common/js'
+
+const getExtConfig = function (options = {}) {
+  const cacheSuc = options.success
+  options.success = function (res) {
+    const sucRes = changeOpts(res, {
+      data: 'extConfig'
+    })
+    cacheSuc.call(this, sucRes)
+  }
+  if (ENV_OBJ.getExtConfig) {
+    ENV_OBJ.getExtConfig(options)
+  } else {
+    envError('getExtConfig')
+  }
+}
+
+const getExtConfigSync = ENV_OBJ.getExtConfigSync || envError('getExtConfigSync')
+
+export {
+  getExtConfig,
+  getExtConfigSync
+}

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

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

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

@@ -1,7 +1,7 @@
 import GetLocation from 'react-native-get-location'
 import { envError, successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
 
-const getLocation = function (options) {
+const getLocation = function (options = {}) {
   const { isHighAccuracy = false, success, fail, complete } = options
   GetLocation.getCurrentPosition({
     enableHighAccuracy: isHighAccuracy

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

@@ -1,6 +1,6 @@
 import { envError, successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
 
-const getLocation = function (options) {
+const getLocation = function (options = {}) {
   const { isHighAccuracy = false, success, fail, complete } = options
   if (navigator.geolocation.getCurrentPosition) {
     navigator.geolocation.getCurrentPosition((res = {}) => {

package/src/platform/api/make-phone-call/rnMakePhone.js

@@ -1,7 +1,7 @@
 import { successHandle, failHandle } from '../../../common/js'
 import { Linking } from 'react-native'
 
-const makePhoneCall = function (options) {
+const makePhoneCall = function (options = {}) {
   const {
     phoneNumber = '',
     success = null,

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

@@ -1,8 +1,8 @@
-import { View, Dimensions, Text, StyleSheet, TouchableOpacity, ScrollView } from 'react-native'
+import { View, Dimensions, Text, StyleSheet, TouchableOpacity, ScrollView, TextInput } from 'react-native'
 import { successHandle, failHandle } from '../../../common/js'
 import { Portal } from '@ant-design/react-native'
 const { width, height } = Dimensions.get('window')
-const showModal = function (options) {
+const showModal = function (options = {}) {
   const {
     title,
     content,
@@ -10,9 +10,9 @@ const showModal = function (options) {
     cancelText = '取消',
     cancelColor = '#000000',
     confirmText = '确定',
-    confirmColor = '#576B95',
     editable = false,
-    placeholderText,
+    placeholderText = '',
+    confirmColor = '#576B95',
     success,
     fail,
     complete
@@ -82,12 +82,17 @@ const showModal = function (options) {
   let ModalView
   let modalTitle = []
   let modalContent = []
+  let editableContent = []
   let modalButton = [{
     text: confirmText,
     confirmColor,
     type: 'confirm',
     color: 'rgb(87, 107, 149)'
   }]
+  let contentText = content
+  const onChangeText = function (text) {
+    contentText = text
+  }
   const closeModal = function (buttonInfo) {
     Portal.remove(modalKey)
     modalKey = null
@@ -98,7 +103,7 @@ const showModal = function (options) {
       Object.assign(result, {
         confirm: true,
         cancel: false,
-        content: null
+        content: editable ? contentText : null
       })
     } else {
       Object.assign(result, {
@@ -114,6 +119,9 @@ const showModal = function (options) {
   if (!editable && content) {
     modalContent.push(content)
   }
+  if (editable) {
+    editableContent.push(placeholderText)
+  }
   if (showCancel) {
     modalButton.unshift({
       text: cancelText,
@@ -123,17 +131,27 @@ const showModal = function (options) {
       color: '#000000'
     })
   }
-  if (!editable) {
-    ModalView = <View style={styles.modalTask}>
-      <View style={styles.modalContent}>
-        {modalTitle.map((item, index) => <View key={index}><Text style={styles.modalTitleText}>{item}</Text></View>)}
-        {modalContent.map((item, index) => <ScrollView key={index} style={styles.contentBox}><Text style={styles.modalContentText}>{item}</Text></ScrollView>)}
-        <View style={styles.modalBtnBox}>
-          {modalButton.map((item, index) => <TouchableOpacity key={index} style={[ styles.modalBtn, item.style ]} onPress={() => closeModal(item)}><Text style={[styles.modalButton, { color: item.color }]}>{item.text}</Text></TouchableOpacity>)}
-        </View>
+  ModalView = <View style={styles.modalTask}>
+    <View style={styles.modalContent}>
+      {modalTitle.map((item, index) => <View key={index}><Text style={styles.modalTitleText}>{item}</Text></View>)}
+      {modalContent.map((item, index) => <ScrollView key={index} style={styles.contentBox}><Text style={styles.modalContentText}>{item}</Text></ScrollView>)}
+      {editableContent.map((item, index) => <View key={index} style={{
+        width: '100%',
+        paddingLeft: 25,
+        paddingRight: 25,
+        marginTop: 5
+      }}><TextInput placeholder={item} style={{
+        height: 40,
+        backgroundColor: '#eeeeee',
+        width: '100%',
+        paddingLeft: 10,
+        paddingRight: 10
+      }} onChangeText={text => onChangeText(text)} defaultValue={content}></TextInput></View>)}
+      <View style={styles.modalBtnBox}>
+        {modalButton.map((item, index) => <TouchableOpacity key={index} style={[ styles.modalBtn, item.style ]} onPress={() => closeModal(item)}><Text style={[styles.modalButton, { color: item.color }]}>{item.text}</Text></TouchableOpacity>)}
       </View>
     </View>
-  }
+  </View>
   try {
     modalKey = Portal.add(ModalView)
   } catch (e) {

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

@@ -1,7 +1,7 @@
 import { successHandle, failHandle, isBrowser, throwSSRWarning } from '../../../common/js'
 import { nextTick } from '../next-tick'
 
-export function pageScrollTo (options) {
+export function pageScrollTo (options = {}) {
   if (!isBrowser) {
     throwSSRWarning('pageScrollTo API is running in non browser environments')
     return

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

@@ -12,7 +12,7 @@ function request (options = { url: '' }) {
     method = 'GET',
     dataType = 'json',
     responseType = 'text',
-    timeout = 60 * 1000,
+    timeout = global.__networkTimeout || 60 * 1000,
     header = {},
     success = null,
     fail = null,
@@ -87,13 +87,13 @@ function request (options = { url: '' }) {
       } catch (e) {
       }
     }
-    const result = {
+
+    const result = Object.assign({}, res, {
       errMsg: 'request:ok',
       data,
       statusCode: res.status,
-      header: res.headers,
-      ...res
-    }
+      header: res.headers
+    })
     defineUnsupportedProps(result, ['cookies', 'profile', 'exception'])
     successHandle(result, success, complete)
     return result

package/src/platform/api/screen-brightness/rnScreenBrightness.js

@@ -1,50 +1,35 @@
-// import * as Brightness from 'expo-brightness'
+import * as Brightness from 'expo-brightness'
 import { successHandle, failHandle } from '../../../common/js'
-//
-// function getScreenBrightness (options) {
-//   const { success, fail, complete } = options
-//   Brightness.getBrightnessAsync().then(value => {
-//     const result = {
-//       errMsg: 'getScreenBrightness:ok',
-//       value
-//     }
-//     successHandle(result, success, complete)
-//   }).catch(() => {
-//     const result = {
-//       errMsg: 'getScreenBrightness:fail'
-//     }
-//     failHandle(result, fail, complete)
-//   })
-// }
-//
-// function setScreenBrightness (options) {
-//   const { value, success, fail, complete } = options
-//   Brightness.setBrightnessAsync(value).then(() => {
-//     const result = {
-//       errMsg: 'setScreenBrightness:ok'
-//     }
-//     successHandle(result, success, complete)
-//   }).catch(() => {
-//     const result = {
-//       errMsg: 'setScreenBrightness:fail'
-//     }
-//     failHandle(result, fail, complete)
-//   })
-// }
 
-function getScreenBrightness (options) {
-  const { success, complete } = options
-  const result = {
-    errMsg: 'getScreenBrightness:ok'
-  }
-  successHandle(result, success, complete)
+function getScreenBrightness (options = {}) {
+  const { success, fail, complete } = options
+  Brightness.getBrightnessAsync().then(value => {
+    const result = {
+      errMsg: 'getScreenBrightness:ok',
+      value
+    }
+    successHandle(result, success, complete)
+  }).catch(() => {
+    const result = {
+      errMsg: 'getScreenBrightness:fail'
+    }
+    failHandle(result, fail, complete)
+  })
 }
-function setScreenBrightness (options) {
-  const { fail, complete } = options
-  const result = {
-    errMsg: 'setScreenBrightness:fail'
-  }
-  failHandle(result, fail, complete)
+
+function setScreenBrightness (options = {}) {
+  const { value, success, fail, complete } = options
+  Brightness.setBrightnessAsync(value).then(() => {
+    const result = {
+      errMsg: 'setScreenBrightness:ok'
+    }
+    successHandle(result, success, complete)
+  }).catch(() => {
+    const result = {
+      errMsg: 'setScreenBrightness:fail'
+    }
+    failHandle(result, fail, complete)
+  })
 }
 
 export {

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

@@ -1,13 +1,5 @@
-import { successHandle, failHandle } from '../../../common/js'
+import { successHandle, failHandle, getFocusedNavigation } from '../../../common/js'
 
-function getFocusedNavigation () {
-  for (const key in global.__mpxPagesMap) {
-    const navigation = global.__mpxPagesMap[key]?.[1]
-    if (navigation && navigation.isFocused()) {
-      return navigation
-    }
-  }
-}
 function setNavigationBarTitle (options = {}) {
   const { title = '', success, fail, complete } = options
   const navigation = getFocusedNavigation()

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

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

package/src/platform/api/storage/rnStorage.js

@@ -1,7 +1,7 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import { envError, successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
 import { hasOwn } from '@mpxjs/utils'
-function setStorage (options) {
+function setStorage (options = {}) {
   const { key, data, success, fail, complete } = options
   let obj = {}
   if (typeof data === 'symbol') {
@@ -26,7 +26,7 @@ function setStorage (options) {
 
 const setStorageSync = envError('setStorageSync')
 
-function getStorage (options) {
+function getStorage (options = {}) {
   const { key, success, fail, complete } = options
   if (!key) {
     const result = {
@@ -62,7 +62,7 @@ function getStorage (options) {
 
 const getStorageSync = envError('getStorageSync')
 
-function getStorageInfo (options) {
+function getStorageInfo (options = {}) {
   const { success, fail, complete } = options
   AsyncStorage.getAllKeys((err, keys) => {
     if (err) {
@@ -83,7 +83,7 @@ function getStorageInfo (options) {
 
 const getStorageInfoSync = envError('getStorageInfoSync')
 
-function removeStorage (options) {
+function removeStorage (options = {}) {
   const { key, success, fail, complete } = options
   AsyncStorage.removeItem(key, (err) => {
     if (err) {
@@ -104,7 +104,7 @@ function removeStorageSync (key) {
   AsyncStorage.removeItem(key)
 }
 
-function clearStorage (options) {
+function clearStorage (options = {}) {
   const { success, fail, complete } = options
   AsyncStorage.clear((err) => {
     if (err) {

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

@@ -1,56 +1,62 @@
 import DeviceInfo from 'react-native-device-info'
 import { Platform, PixelRatio, Dimensions, StatusBar } from 'react-native'
 import { initialWindowMetrics } from 'react-native-safe-area-context'
-import { successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
+import { successHandle, failHandle, defineUnsupportedProps, getFocusedNavigation } from '../../../common/js'
 
 const getWindowInfo = function () {
-  const dimensionsWindow = Dimensions.get('window')
   const dimensionsScreen = Dimensions.get('screen')
-  const result = {
-    pixelRatio: PixelRatio.get(),
-    windowWidth: dimensionsWindow.width,
-    windowHeight: dimensionsWindow.height,
-    screenWidth: dimensionsScreen.width,
-    screenHeight: dimensionsScreen.height
+  const navigation = getFocusedNavigation() || {}
+  const insets = {
+    ...(initialWindowMetrics?.insets || {}),
+    ...(navigation.insets || {})
   }
-  defineUnsupportedProps(result, ['screenTop'])
-  return result
-}
-
-const getSystemInfoSync = function () {
-  const windowInfo = getWindowInfo()
-  const { screenWidth, screenHeight } = windowInfo
   let safeArea = {}
-  let { top = 0, bottom = 0 } = initialWindowMetrics?.insets || {}
+  let { top = 0, bottom = 0, left = 0, right = 0 } = insets
   if (Platform.OS === 'android') {
     top = StatusBar.currentHeight || 0
   }
-  const iosRes = {}
-
+  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 {
-    const width = Math.min(screenWidth, screenHeight)
-    const height = Math.max(screenWidth, screenHeight)
     safeArea = {
-      left: 0,
-      right: width,
+      left,
+      right: screenWidth - right,
       top,
-      bottom: height - bottom,
-      height: height - bottom - top,
-      width
+      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
+}
+
+const getSystemInfoSync = function () {
+  const windowInfo = getWindowInfo()
+  const { screenWidth, screenHeight, safeArea } = 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',
-    statusBarHeight: top,
+    statusBarHeight: safeArea.top,
     fontSizeSetting: PixelRatio.getFontScale(),
-    safeArea,
-    ...windowInfo,
-    ...iosRes
+    ...windowInfo
   }
   defineUnsupportedProps(result, [
     'language',
@@ -77,7 +83,7 @@ const getSystemInfoSync = function () {
   return result
 }
 
-const getSystemInfo = function (options) {
+const getSystemInfo = function (options = {}) {
   const { success, fail, complete } = options
   try {
     const systemInfo = getSystemInfoSync()

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

@@ -1,8 +1,6 @@
 import { View, Text, Image, StyleSheet, ActivityIndicator } from 'react-native'
 import { successHandle, failHandle } from '../../../common/js'
 import { Portal } from '@ant-design/react-native'
-import successPng from './success.png'
-import errorPng from './error.png'
 
 let toastKey
 let isLoadingShow
@@ -49,12 +47,14 @@ const styles = StyleSheet.create({
     overflow: 'hidden'
   }
 })
-function showToast (options) {
+function showToast (options = {}) {
   const { title, icon = 'success', image, duration = 1500, mask = false, success, fail, complete, isLoading } = options
   let ToastView
+  const successPng = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFwAAABcAgMAAACegTrLAAAADFBMVEUAAAD////R0dHj4+PcME2AAAAAAXRSTlMAQObYZgAAANNJREFUSMft1FEKwkAMBNBGyBFyH4/gR8f+ehSPLtiyQ+wM2C8Rmp+WQN90N8tOZ/1/4SbbYfpp+sBVMqafgGQKs+FvkjF8GR6aj4M8NB+GT8OX5i+GT8OX4aH5MHwZHpoPw+c3fA0xGl/zYBrP92o8vwVwF3NO8tySjXmINQLAs/WX9S8bP9UGJUZSi8MAuUqsj75payPxuWn1BmrjewCCfAvA4Fmjvx8HQL4HiJEHeRmg5k2+B8gTFeRFwL7NzREB/sCKwsG7KN2VSb7XMp31i3oBatNdEForTOoAAAAASUVORK5CYII='
+  const errorPng = 'data:image/png;base64,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'
   const iconImg = {
     success: successPng,
-    fail: errorPng
+    error: errorPng
   }
   const pointerEvents = mask ? 'auto' : 'none'
   isLoadingShow = isLoading
@@ -65,7 +65,7 @@ function showToast (options) {
   if (image || icon === 'success' || icon === 'error') {
     ToastView = <View style={styles.toastWrap} pointerEvents={pointerEvents}>
       <View style={styles.toastContent}>
-        <Image source={image || iconImg[icon]} style={styles.toastImg}></Image>
+        <Image style={ styles.toastImg } source={{uri: image || iconImg[icon]}}></Image>
         <Text style={styles.toastText}>{title}</Text>
       </View>
     </View>
@@ -113,7 +113,7 @@ function showToast (options) {
   }
 }
 
-function hideToast(options) {
+function hideToast(options = {}) {
   const { noConflict = false, success, fail, complete } = options
 
   if (isLoadingShow && noConflict) {
@@ -136,7 +136,7 @@ function hideToast(options) {
   }
 }
 
-function showLoading (options) {
+function showLoading (options = {}) {
   const { title, mask, success, fail, complete } = options
   showToast({
     title,
@@ -158,7 +158,7 @@ function showLoading (options) {
   })
 }
 
-function hideLoading (options) {
+function hideLoading (options = {}) {
   const { noConflict = false, success, fail, complete } = options
   if (!isLoadingShow && noConflict) {
     return

package/src/platform/index.js

@@ -110,3 +110,6 @@ export * from './api/lifecycle'
 
 // getLocation, openLocation, chooseLocation
 export * from './api/location'
+
+// getExtConfig, getExtConfigSync
+export * from './api/ext'