@mpxjs/api-proxy 2.9.53 → 2.9.58

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,4 @@
-import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { successHandle, failHandle } from '../../../common/js'
 import { type } from '@mpxjs/utils'
 
 const socketTasks = new Set()
@@ -44,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)
     }
   }
 
@@ -70,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.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)
   }
 }
 

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

@@ -1,5 +1,4 @@
-
-import { webHandleSuccess, webHandleFail, isBrowser, throwSSRWarning } from '../../../common/js'
+import { successHandle, failHandle, isBrowser, throwSSRWarning } from '../../../common/js'
 import { hasOwn } from '@mpxjs/utils'
 
 function setStorage (options = {}) {
@@ -13,10 +12,10 @@ function setStorage (options = {}) {
     setStorageSync(key, data)
 
     const res = { errMsg: 'setStorage:ok' }
-    webHandleSuccess(res, success, complete)
+    successHandle(res, success, complete)
   } catch (err) {
     const res = { errMsg: `setStorage:fail ${err}` }
-    webHandleFail(res, fail, complete)
+    failHandle(res, fail, complete)
   }
 }
 
@@ -45,10 +44,10 @@ function getStorage (options = {}) {
 
   if (result) {
     const res = { errMsg: 'getStorage:ok', data: data }
-    webHandleSuccess(res, success, complete)
+    successHandle(res, success, complete)
   } else {
     const res = { errMsg: 'getStorage:fail', data: null }
-    webHandleFail(res, fail, complete)
+    failHandle(res, fail, complete)
   }
 }
 
@@ -88,10 +87,10 @@ function getStorageInfo (options = {}) {
     const info = getStorageInfoSync()
 
     const res = Object.assign({}, { errMsg: 'getStorageInfo:ok' }, info)
-    webHandleSuccess(res, success, complete)
+    successHandle(res, success, complete)
   } catch (err) {
     const res = { errMsg: `getStorageInfo:fail ${err}` }
-    webHandleFail(res, fail, complete)
+    failHandle(res, fail, complete)
   }
 }
 
@@ -118,10 +117,10 @@ function removeStorage (options = { key: '' }) {
     removeStorageSync(key)
 
     const res = { errMsg: 'removeStorage:ok' }
-    webHandleSuccess(res, success, complete)
+    successHandle(res, success, complete)
   } catch (err) {
     const res = { errMsg: `removeStorage:fail ${err}` }
-    webHandleFail(res, fail, complete)
+    failHandle(res, fail, complete)
   }
 }
 
@@ -144,10 +143,10 @@ function clearStorage (options = {}) {
     clearStorageSync()
 
     const res = { errMsg: 'clearStorage:ok' }
-    webHandleSuccess(res, success, complete)
+    successHandle(res, success, complete)
   } catch (err) {
     const res = { errMsg: `clearStorage:fail ${err}` }
-    webHandleFail(res, fail, complete)
+    failHandle(res, fail, complete)
   }
 }
 

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

@@ -1,6 +1,6 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
+import { envError, successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
 import { hasOwn } from '@mpxjs/utils'
-import { envError, webHandleSuccess, webHandleFail, defineUnsupportedProps } from '../../../common/js'
 function setStorage (options) {
   const { key, data, success, fail, complete } = options
   let obj = {}
@@ -14,13 +14,13 @@ function setStorage (options) {
       const result = {
         errMsg: `setStorage:fail ${err}`
       }
-      webHandleFail(result, fail, complete)
+      failHandle(result, fail, complete)
       return
     }
     const result = {
       errMsg: 'setStorage:ok'
     }
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
   })
 }
 
@@ -32,7 +32,7 @@ function getStorage (options) {
     const result = {
       errMsg: 'getStorage:fail parameter error: parameter.key should be String instead of Undefined;'
     }
-    webHandleFail(result, fail, complete)
+    failHandle(result, fail, complete)
     return
   }
   AsyncStorage.getItem(key, (err, res) => {
@@ -40,7 +40,7 @@ function getStorage (options) {
       const result = {
         errMsg: `getStorage:fail ${err || 'data not found'}`
       }
-      webHandleFail(result, fail, complete)
+      failHandle(result, fail, complete)
       return
     }
     let item
@@ -56,7 +56,7 @@ function getStorage (options) {
       errMsg: 'getStorage:ok',
       data
     }
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
   })
 }
 
@@ -69,7 +69,7 @@ function getStorageInfo (options) {
       const result = {
         errMsg: `getStorage:fail ${err}`
       }
-      webHandleFail(result, fail, complete)
+      failHandle(result, fail, complete)
       return
     }
     const result = {
@@ -77,7 +77,7 @@ function getStorageInfo (options) {
       errMsg: 'getStorageInfo:ok'
     }
     defineUnsupportedProps(result, ['currentSize', 'limitSize'])
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
   })
 }
 
@@ -90,13 +90,13 @@ function removeStorage (options) {
       const result = {
         errMsg: `removeStorage:fail ${err}`
       }
-      webHandleFail(result, fail, complete)
+      failHandle(result, fail, complete)
       return
     }
     const result = {
       errMsg: 'removeStorage:ok'
     }
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
   })
 }
 
@@ -111,13 +111,13 @@ function clearStorage (options) {
       const result = {
         errMsg: `clearStorage:fail ${err}`
       }
-      webHandleFail(result, fail, complete)
+      failHandle(result, fail, complete)
       return
     }
     const result = {
       errMsg: 'clearStorage:ok'
     }
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
   })
 }
 

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

@@ -1,4 +1,4 @@
-import { envError, isBrowser, throwSSRWarning, webHandleSuccess } from '../../../common/js'
+import { envError, isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
 
 function getSystemInfoSync () {
   if (!isBrowser) {
@@ -76,7 +76,7 @@ function getSystemInfo (options = {}) {
   }
   const info = getSystemInfoSync()
   const res = Object.assign({ errMsg: 'getSystemInfo:ok' }, info)
-  webHandleSuccess(res, options.success, options.complete)
+  successHandle(res, options.success, options.complete)
 }
 
 const getDeviceInfo = envError('getDeviceInfo')

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

@@ -1,7 +1,7 @@
 import DeviceInfo from 'react-native-device-info'
 import { Platform, PixelRatio, Dimensions, StatusBar } from 'react-native'
 import { initialWindowMetrics } from 'react-native-safe-area-context'
-import { webHandleSuccess, webHandleFail, defineUnsupportedProps } from '../../../common/js'
+import { successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
 
 const getWindowInfo = function () {
   const dimensionsWindow = Dimensions.get('window')
@@ -84,12 +84,12 @@ const getSystemInfo = function (options) {
     Object.assign(systemInfo, {
       errMsg: 'setStorage:ok'
     })
-    webHandleSuccess(systemInfo, success, complete)
+    successHandle(systemInfo, success, complete)
   } catch (err) {
     const result = {
       errMsg: `getSystemInfo:fail ${err}`
     }
-    webHandleFail(result, fail, complete)
+    failHandle(result, fail, complete)
   }
 }
 

package/src/platform/api/tab-bar/index.web.js

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { successHandle, failHandle } from '../../../common/js'
 import { hasOwn } from '@mpxjs/utils'
 import Vue from 'vue'
 
@@ -21,9 +21,9 @@ function setTabBarStyle (options = {}) {
   }
 
   if (resolved) {
-    webHandleSuccess(resolved, options.success, options.complete)
+    successHandle(resolved, options.success, options.complete)
   }
-  webHandleFail(rejected, options.fail, options.complete)
+  failHandle(rejected, options.fail, options.complete)
 }
 
 function setTabBarItem (options = {}) {
@@ -50,9 +50,9 @@ function setTabBarItem (options = {}) {
   }
 
   if (resolved) {
-    webHandleSuccess(resolved, options.success, options.complete)
+    successHandle(resolved, options.success, options.complete)
   }
-  webHandleFail(rejected, options.fail, options.complete)
+  failHandle(rejected, options.fail, options.complete)
 }
 
 function showTabBar (options = {}) {
@@ -66,9 +66,9 @@ function showTabBar (options = {}) {
   }
 
   if (resolved) {
-    webHandleSuccess(resolved, options.success, options.complete)
+    successHandle(resolved, options.success, options.complete)
   }
-  webHandleFail(rejected, options.fail, options.complete)
+  failHandle(rejected, options.fail, options.complete)
 }
 
 function hideTabBar (options = {}) {
@@ -82,9 +82,9 @@ function hideTabBar (options = {}) {
   }
 
   if (resolved) {
-    webHandleSuccess(resolved, options.success, options.complete)
+    successHandle(resolved, options.success, options.complete)
   }
-  webHandleFail(rejected, options.fail, options.complete)
+  failHandle(rejected, options.fail, options.complete)
 }
 
 export {

package/src/platform/api/toast/Toast.js

@@ -1,4 +1,4 @@
-import { webHandleSuccess, createDom, getRootElement } from '../../../common/js'
+import { successHandle, createDom, getRootElement } from '../../../common/js'
 import '../../../common/stylus/Toast.styl'
 import '../../../common/stylus/Loading.styl'
 
@@ -74,7 +74,7 @@ export default class Toast {
     opts.duration >= 0 && this.hide({ duration: opts.duration }, type)
 
     const errMsg = type === 'loading' ? 'showLoading:ok' : 'showToast:ok'
-    webHandleSuccess({ errMsg }, opts.success, opts.complete)
+    successHandle({ errMsg }, opts.success, opts.complete)
   }
 
   hide (options = {}, type) {
@@ -82,7 +82,7 @@ export default class Toast {
 
     const duration = options.duration || 0
     const errMsg = type === 'loading' ? 'hideLoading:ok' : 'hideToast:ok'
-    webHandleSuccess({ errMsg }, options.success, options.complete)
+    successHandle({ errMsg }, options.success, options.complete)
 
     if (this.hideTimer) {
       clearTimeout(this.hideTimer)

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

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

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

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