@mpxjs/api-proxy 2.9.52 → 2.9.58

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

@@ -0,0 +1,149 @@
+import { View, Dimensions, Text, StyleSheet, TouchableOpacity, ScrollView } 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 {
+    title,
+    content,
+    showCancel = true,
+    cancelText = '取消',
+    cancelColor = '#000000',
+    confirmText = '确定',
+    confirmColor = '#576B95',
+    editable = false,
+    placeholderText,
+    success,
+    fail,
+    complete
+  } = options
+  const modalWidth = width - 60
+  const styles = StyleSheet.create({
+    modalTask: {
+      width,
+      height,
+      justifyContent: 'center',
+      alignItems: 'center',
+      backgroundColor: 'rgba(0,0,0,0.6)',
+      position: 'absolute'
+    },
+    modalContent: {
+      paddingTop: 20,
+      width: modalWidth,
+      backgroundColor: '#ffffff',
+      borderRadius: 15,
+      justifyContent: 'center',
+      alignItems: 'center'
+    },
+    modalTitleText: {
+      fontSize: 18,
+      fontWeight: 'bold',
+      paddingLeft: 20,
+      paddingRight: 20
+    },
+    contentBox: {
+      maxHeight: height * 0.45,
+      marginTop: 10
+    },
+    modalContentText: {
+      fontSize: 16,
+      lineHeight: 26,
+      color: '#808080',
+      paddingLeft: 20,
+      paddingRight: 20
+    },
+    modalBtnBox: {
+      borderTopWidth: StyleSheet.hairlineWidth,
+      borderTopColor: 'rgba(0,0,0,0.2)',
+      borderStyle: 'solid',
+      marginTop: 25,
+      width: '100%',
+      display: 'flex',
+      flexDirection: 'row'
+    },
+    modalBtn: {
+      flex: 1,
+      textAlign: 'center',
+      paddingTop: 10,
+      paddingBottom: 10,
+    },
+    modalButton: {
+      width: '100%',
+      fontWeight: 'bold',
+      textAlign: 'center'
+    },
+    cancelStyle: {
+      borderRightWidth: StyleSheet.hairlineWidth,
+      borderRightColor: 'rgba(0,0,0,0.2)',
+      borderStyle: 'solid',
+    }
+  })
+  let modalKey
+  let ModalView
+  let modalTitle = []
+  let modalContent = []
+  let modalButton = [{
+    text: confirmText,
+    confirmColor,
+    type: 'confirm',
+    color: 'rgb(87, 107, 149)'
+  }]
+  const closeModal = function (buttonInfo) {
+    Portal.remove(modalKey)
+    modalKey = null
+    const result = {
+      errMsg: 'showModal:ok'
+    }
+    if (buttonInfo.type === 'confirm') {
+      Object.assign(result, {
+        confirm: true,
+        cancel: false,
+        content: null
+      })
+    } else {
+      Object.assign(result, {
+        confirm: false,
+        cancel: true
+      })
+    }
+    successHandle(result, success, complete)
+  }
+  if (title) {
+    modalTitle.push(title)
+  }
+  if (!editable && content) {
+    modalContent.push(content)
+  }
+  if (showCancel) {
+    modalButton.unshift({
+      text: cancelText,
+      cancelColor,
+      type: 'cancel',
+      style: styles.cancelStyle,
+      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>
+      </View>
+    </View>
+  }
+  try {
+    modalKey = Portal.add(ModalView)
+  } catch (e) {
+    const result = {
+      errMsg: `showModal:fail invalid ${e}`
+    }
+    failHandle(result, fail, complete)
+  }
+}
+
+export {
+  showModal
+}

package/src/platform/api/next-tick/index.android.js

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

package/src/platform/api/next-tick/index.ios.js

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

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

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail, isBrowser, throwSSRWarning } from '../../../common/js'
+import { successHandle, failHandle, isBrowser, throwSSRWarning } from '../../../common/js'
 import { nextTick } from '../next-tick'
 
 export function pageScrollTo (options) {
@@ -11,13 +11,13 @@ export function pageScrollTo (options) {
     const { success, fail, complete } = options
 
     if (!ms) {
-      return webHandleFail({
+      return failHandle({
         errMsg: 'pageScrollTo:fail'
       }, fail, complete)
     }
 
     ms.pageScrollTo(options)
-    webHandleSuccess({
+    successHandle({
       errMsg: 'pageScrollTo:ok'
     }, success, complete)
   })

package/src/platform/api/pull-down/index.web.js

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail, throwSSRWarning, isBrowser } from '../../../common/js'
+import { successHandle, failHandle, throwSSRWarning, isBrowser } from '../../../common/js'
 
 function stopPullDownRefresh (options = {}) {
   if (!isBrowser) {
@@ -22,10 +22,10 @@ function stopPullDownRefresh (options = {}) {
     }
     if (err) {
       const res = { errMsg: `stopPullDownRefresh:fail ${err}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     } else {
       const res = { errMsg: 'stopPullDownRefresh:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
   }
 }
@@ -52,10 +52,10 @@ function startPullDownRefresh (options = {}) {
     }
     if (err) {
       const res = { errMsg: `startPullDownRefresh:fail ${err}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     } else {
       const res = { errMsg: 'startPullDownRefresh:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
   }
 }

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

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { webHandleSuccess, webHandleFail, defineUnsupportedProps } from '../../../common/js'
+import { successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
 import RequestTask from './RequestTask'
 
 function request (options = { url: '' }) {
@@ -70,7 +70,7 @@ function request (options = { url: '' }) {
       header: res.headers
     }
     defineUnsupportedProps(result, ['cookies', 'profile', 'exception'])
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
     return result
   }).catch(err => {
     const response = err?.response || {}
@@ -80,10 +80,7 @@ function request (options = { url: '' }) {
       header: response.headers,
       data: response.data
     }
-    webHandleFail(res, fail, complete)
-    if (!fail) {
-      return Promise.reject(res)
-    }
+    failHandle(res, fail, complete)
   })
 
   return requestTask

package/src/platform/api/request-payment/index.ali.js

@@ -1,4 +1,5 @@
-import { ENV_OBJ, changeOpts, error, noop } from '../../../common/js'
+import { ENV_OBJ, changeOpts, error } from '../../../common/js'
+import { noop } from '@mpxjs/utils'
 
 const TIPS_NAME = '支付宝环境 mpx'
 

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

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { successHandle, failHandle } from '../../../common/js'
 import { parseQuery } from '@mpxjs/utils'
 
 function parseUrl (url) {
@@ -58,11 +58,11 @@ function navigateTo (options = {}) {
     navigation.push(finalPath, queryObj)
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'navigateTo:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
     navigationHelper.lastFailCallback = (msg) => {
       const res = { errMsg: `navigateTo:fail ${msg}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     }
   }
 }
@@ -77,11 +77,11 @@ function redirectTo (options = {}) {
     navigation.replace(finalPath, queryObj)
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'redirectTo:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
     navigationHelper.lastFailCallback = (msg) => {
       const res = { errMsg: `redirectTo:fail ${msg}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     }
   }
 }
@@ -93,11 +93,11 @@ function navigateBack (options = {}) {
     navigation.pop(options.delta || 1)
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'navigateBack:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
     navigationHelper.lastFailCallback = (msg) => {
       const res = { errMsg: `navigateBack:fail ${msg}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     }
   }
 }
@@ -120,11 +120,11 @@ function reLaunch (options = {}) {
     })
     navigationHelper.lastSuccessCallback = () => {
       const res = { errMsg: 'redirectTo:ok' }
-      webHandleSuccess(res, options.success, options.complete)
+      successHandle(res, options.success, options.complete)
     }
     navigationHelper.lastFailCallback = (msg) => {
       const res = { errMsg: `redirectTo:fail ${msg}` }
-      webHandleFail(res, options.fail, options.complete)
+      failHandle(res, options.fail, options.complete)
     }
   }
 }

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

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail, isTabBarPage, throwSSRWarning, isBrowser } from '../../../common/js'
+import { successHandle, failHandle, isTabBarPage, throwSSRWarning, isBrowser } from '../../../common/js'
 import { EventChannel } from '../event-channel'
 
 let routeCount = 0
@@ -12,8 +12,7 @@ function redirectTo (options = {}) {
   if (router) {
     if (isTabBarPage(options.url, router)) {
       const res = { errMsg: 'redirectTo:fail can not redirectTo a tabBar page' }
-      webHandleFail(res, options.fail, options.complete)
-      return Promise.reject(res)
+      failHandle(res, options.fail, options.complete)
     }
     router.__mpxAction = { type: 'redirect' }
     if (routeCount === 0 && router.currentRoute.query.routeCount) routeCount = router.currentRoute.query.routeCount
@@ -26,11 +25,11 @@ function redirectTo (options = {}) {
       },
       () => {
         const res = { errMsg: 'redirectTo:ok' }
-        webHandleSuccess(res, options.success, options.complete)
+        successHandle(res, options.success, options.complete)
       },
       err => {
         const res = { errMsg: `redirectTo:fail ${err}` }
-        webHandleFail(res, options.fail, options.complete)
+        failHandle(res, options.fail, options.complete)
       }
     )
   }
@@ -45,8 +44,7 @@ function navigateTo (options = {}) {
   if (router) {
     if (isTabBarPage(options.url, router)) {
       const res = { errMsg: 'navigateTo:fail can not navigateTo a tabBar page' }
-      webHandleFail(res, options.fail, options.complete)
-      return Promise.reject(res)
+      failHandle(res, options.fail, options.complete)
     }
     const eventChannel = new EventChannel()
     router.__mpxAction = {
@@ -66,11 +64,11 @@ function navigateTo (options = {}) {
       },
       () => {
         const res = { errMsg: 'navigateTo:ok', eventChannel }
-        webHandleSuccess(res, options.success, options.complete)
+        successHandle(res, options.success, options.complete)
       },
       err => {
         const res = { errMsg: `navigateTo:fail ${err}` }
-        webHandleFail(res, options.fail, options.complete)
+        failHandle(res, options.fail, options.complete)
       }
     )
   }
@@ -94,7 +92,7 @@ function navigateBack (options = {}) {
     }
     router.go(-delta)
     const res = { errMsg: 'navigateBack:ok' }
-    webHandleSuccess(res, options.success, options.complete)
+    successHandle(res, options.success, options.complete)
   }
 }
 
@@ -127,16 +125,16 @@ function reLaunch (options = {}) {
         },
         () => {
           const res = { errMsg: 'reLaunch:ok' }
-          webHandleSuccess(res, options.success, options.complete)
+          successHandle(res, options.success, options.complete)
         },
         err => {
           const res = { errMsg: `reLaunch:fail ${err}` }
-          webHandleFail(res, options.fail, options.complete)
+          failHandle(res, options.fail, options.complete)
         }
       )
     }
     const res = { errMsg: 'reLaunch:ok' }
-    webHandleSuccess(res, options.success, options.complete)
+    successHandle(res, options.success, options.complete)
   }
 }
 
@@ -152,8 +150,7 @@ function switchTab (options = {}) {
     if (toRoute.path !== currentRoute.path) {
       if (!isTabBarPage(options.url, router)) {
         const res = { errMsg: 'switchTab:fail can not switch to no-tabBar page!' }
-        webHandleFail(res, options.fail, options.complete)
-        return Promise.reject(res)
+        failHandle(res, options.fail, options.complete)
       }
       router.__mpxAction = {
         type: 'switch',
@@ -171,17 +168,17 @@ function switchTab (options = {}) {
           },
           () => {
             const res = { errMsg: 'switchTab:ok' }
-            webHandleSuccess(res, options.success, options.complete)
+            successHandle(res, options.success, options.complete)
           },
           err => {
             const res = { errMsg: `switchTab:fail ${err}` }
-            webHandleFail(res, options.fail, options.complete)
+            failHandle(res, options.fail, options.complete)
           }
         )
       }
     }
     const res = { errMsg: 'switchTab:ok' }
-    webHandleSuccess(res, options.success, options.complete)
+    successHandle(res, options.success, options.complete)
   }
 }
 

package/src/platform/api/screen-brightness/index.android.js

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

package/src/platform/api/screen-brightness/index.ios.js

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

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

@@ -0,0 +1,53 @@
+// 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 setScreenBrightness (options) {
+  const { fail, complete } = options
+  const result = {
+    errMsg: 'setScreenBrightness:fail'
+  }
+  failHandle(result, fail, complete)
+}
+
+export {
+  getScreenBrightness,
+  setScreenBrightness
+}

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

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

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

@@ -0,0 +1,41 @@
+import { successHandle, failHandle } 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()
+  if (!(navigation && navigation.setOptions)) {
+    failHandle({ errMsg: 'setNavigationBarTitle:fail' }, fail, complete)
+  } else {
+    navigation.setOptions({ headerTitle: title })
+    successHandle({ errMsg: 'setNavigationBarTitle:ok' }, success, complete)
+  }
+}
+
+function setNavigationBarColor (options = {}) {
+  const { frontColor = '', backgroundColor = '', success, fail, complete } = options
+  const navigation = getFocusedNavigation()
+  if (!(navigation && navigation.setOptions)) {
+    failHandle({ errMsg: 'setNavigationBarColor:fail' }, fail, complete)
+  } else {
+    navigation.setOptions({
+      headerStyle: {
+        backgroundColor: backgroundColor
+      },
+      headerTintColor: frontColor
+    })
+    successHandle({ errMsg: 'setNavigationBarColor:ok' }, success, complete)
+  }
+}
+
+export {
+  setNavigationBarTitle,
+  setNavigationBarColor
+}

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

@@ -1,4 +1,4 @@
-import { isBrowser, throwSSRWarning, webHandleSuccess } from '../../../common/js'
+import { isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
 
 function setNavigationBarTitle (options = {}) {
   if (!isBrowser) {
@@ -10,7 +10,7 @@ function setNavigationBarTitle (options = {}) {
     document.title = title
   }
 
-  webHandleSuccess({ errMsg: 'setNavigationBarTitle:ok' }, success, complete)
+  successHandle({ errMsg: 'setNavigationBarTitle:ok' }, success, complete)
 }
 
 function setNavigationBarColor (options = {}) {
@@ -23,7 +23,7 @@ function setNavigationBarColor (options = {}) {
   meta.setAttribute('name', 'theme-color')
   meta.setAttribute('content', backgroundColor)
   document.head.appendChild(meta)
-  webHandleSuccess({ errMsg: 'setNavigationBarColor:ok' }, success, complete)
+  successHandle({ errMsg: 'setNavigationBarColor:ok' }, success, complete)
 }
 
 export {

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

@@ -1,4 +1,5 @@
-import { webHandleSuccess, webHandleFail, type } from '../../../common/js'
+import { successHandle, failHandle } from '../../../common/js'
+import { type } from '@mpxjs/utils'
 
 const socketTasks = new Set()
 
@@ -43,20 +44,14 @@ class SocketTask {
     const { data = '', success, fail, complete } = options
     if (typeof data !== 'string' || type(data) !== 'ArrayBuffer') {
       const res = { errMsg: 'sendSocketMessage:fail Unsupported data type' }
-      webHandleFail(res, fail, complete)
-      return
-    }
-    if (this._socket.readyState === 1) {
+      failHandle(res, fail, complete)
+    } else if (this._socket.readyState === 1) {
       this._socket.send(data)
       const res = { errMsg: 'sendSocketMessage:ok' }
-      webHandleSuccess(res, success, complete)
-      return Promise.resolve(res)
+      successHandle(res, success, complete)
     } else {
       const res = { errMsg: 'sendSocketMessage:fail' }
-      webHandleFail(res, fail, complete)
-      if (!fail) {
-        return Promise.reject(res)
-      }
+      failHandle(res, fail, complete)
     }
   }
 
@@ -69,14 +64,10 @@ class SocketTask {
     try {
       this._socket.close()
       const res = { errMsg: 'closeSocket:ok' }
-      webHandleSuccess(res, success, complete)
-      return Promise.resolve(res)
+      successHandle(res, success, complete)
     } catch (err) {
       const res = { errMsg: `closeSocket:fail ${err}` }
-      webHandleFail(res, fail, complete)
-      if (!fail) {
-        return Promise.reject(res)
-      }
+      failHandle(res, fail, complete)
     }
   }
 

package/src/platform/api/socket/index.android.js

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

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

@@ -1,4 +1,4 @@
-import { warn, webHandleSuccess, webHandleFail, isBrowser, throwSSRWarning } from '../../../common/js'
+import { warn, successHandle, failHandle, isBrowser, throwSSRWarning } from '../../../common/js'
 import SocketTask from './SocketTask'
 
 function connectSocket (options = { url: '' }) {
@@ -10,10 +10,10 @@ function connectSocket (options = { url: '' }) {
 
   try {
     const socketTask = new SocketTask(url, protocols)
-    webHandleSuccess({ errMsg: 'connectSocket:ok' }, success, complete)
+    successHandle({ errMsg: 'connectSocket:ok' }, success, complete)
     return socketTask
   } catch (e) {
-    webHandleFail({ errMsg: `connectSocket:fail ${e}` }, fail, complete)
+    failHandle({ errMsg: `connectSocket:fail ${e}` }, fail, complete)
   }
 }