@mpxjs/api-proxy 2.9.52 → 2.9.58

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

@@ -1,4 +1,5 @@
-import { webHandleSuccess, webHandleFail, hasOwn, isBrowser, throwSSRWarning } from '../../../common/js'
+import { successHandle, failHandle, isBrowser, throwSSRWarning } from '../../../common/js'
+import { hasOwn } from '@mpxjs/utils'
 
 function setStorage (options = {}) {
   if (!isBrowser) {
@@ -11,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)
   }
 }
 
@@ -43,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)
   }
 }
 
@@ -86,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)
   }
 }
 
@@ -116,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)
   }
 }
 
@@ -142,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,5 +1,6 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
-import { envError, webHandleSuccess, webHandleFail, hasOwn, defineUnsupportedProps } from '../../../common/js'
+import { envError, successHandle, failHandle, defineUnsupportedProps } from '../../../common/js'
+import { hasOwn } from '@mpxjs/utils'
 function setStorage (options) {
   const { key, data, success, fail, complete } = options
   let obj = {}
@@ -13,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)
   })
 }
 
@@ -31,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) => {
@@ -39,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
@@ -55,7 +56,7 @@ function getStorage (options) {
       errMsg: 'getStorage:ok',
       data
     }
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
   })
 }
 
@@ -68,7 +69,7 @@ function getStorageInfo (options) {
       const result = {
         errMsg: `getStorage:fail ${err}`
       }
-      webHandleFail(result, fail, complete)
+      failHandle(result, fail, complete)
       return
     }
     const result = {
@@ -76,7 +77,7 @@ function getStorageInfo (options) {
       errMsg: 'getStorageInfo:ok'
     }
     defineUnsupportedProps(result, ['currentSize', 'limitSize'])
-    webHandleSuccess(result, success, complete)
+    successHandle(result, success, complete)
   })
 }
 
@@ -89,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)
   })
 }
 
@@ -110,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.ali.js

@@ -1,4 +1,4 @@
-import { ENV_OBJ, changeOpts, envError, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, envError, handleSuccess, defineUnsupportedProps } from '../../../common/js'
 
 function getSystemInfo (options = {}) {
   const opts = changeOpts(options)
@@ -32,7 +32,11 @@ function getSystemInfoSync () {
   return res
 }
 
-const getDeviceInfo = ENV_OBJ.getDeviceInfo || envError('getDeviceInfo')
+const getDeviceInfo = function () {
+  const res = ENV_OBJ.getDeviceBaseInfo
+  defineUnsupportedProps(res, ['deviceAbi', 'benchmarkLevel', 'cpuType'])
+  return res
+}
 
 const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
 

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,5 @@
-import { webHandleSuccess, webHandleFail, hasOwn } from '../../../common/js'
+import { successHandle, failHandle } from '../../../common/js'
+import { hasOwn } from '@mpxjs/utils'
 import Vue from 'vue'
 
 function setTabBarStyle (options = {}) {
@@ -20,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 = {}) {
@@ -49,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 = {}) {
@@ -65,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 = {}) {
@@ -81,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'
 
@@ -71,11 +71,10 @@ export default class Toast {
     this.title.textContent = opts.title || ''
 
     this.toast.classList.add('show')
-
     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) {
@@ -83,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'

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

@@ -0,0 +1,189 @@
+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
+let tId // show duration 计时id
+const styles = StyleSheet.create({
+  toastContent: {
+    minWdth: 150,
+    maxWidth: '60%',
+    backgroundColor: 'rgba(20, 20, 20, 0.7)',
+    paddingTop: 15,
+    paddingBottom: 15,
+    paddingLeft: 20,
+    paddingRight: 20,
+    borderRadius: 5,
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  toastWrap: {
+    left: 0,
+    right: 0,
+    top: 0,
+    bottom: 0,
+    zIndex: 10000,
+    position: "absolute",
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  toastImg: {
+    width: 40,
+    height: 40,
+    marginLeft: 'auto',
+    marginRight: 'auto',
+    marginBottom: 10
+  },
+  toastText: {
+    textAlign: 'center',
+    color: '#ffffff',
+    fontSize: 14,
+    lineHeight: 18,
+    height: 18,
+    overflow: 'hidden'
+  }
+})
+function showToast (options) {
+  const { title, icon = 'success', image, duration = 1500, mask = false, success, fail, complete, isLoading } = options
+  let ToastView
+  const iconImg = {
+    success: successPng,
+    fail: errorPng
+  }
+  const pointerEvents = mask ? 'auto' : 'none'
+  isLoadingShow = isLoading
+  if (tId) {
+    clearTimeout(tId)
+  }
+  tId = null
+  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>
+        <Text style={styles.toastText}>{title}</Text>
+      </View>
+    </View>
+  } else if (icon === 'loading') {
+    ToastView = <View style={styles.toastWrap} pointerEvents={pointerEvents}>
+      <View style={styles.toastContent}>
+        <ActivityIndicator
+          animating
+          style={{ marginBottom: 10 }}
+          size='small'
+          color='#eee'
+        />
+        <Text style={styles.toastText}>{title}</Text>
+      </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>
+      </View>
+    </View>
+  }
+  try {
+    if (toastKey) {
+      Portal.remove(toastKey)
+    }
+    toastKey = Portal.add(ToastView)
+    if (!isLoading) {
+      tId = setTimeout(() => {
+        Portal.remove(toastKey)
+        toastKey = null
+      }, duration)
+    }
+    const result = {
+      errMsg: 'showToast:ok'
+    }
+    successHandle(result, success, complete)
+  } catch (e) {
+    const result = {
+      errMsg: `showToast:fail invalid ${e}`
+    }
+    failHandle(result, fail, complete)
+  }
+}
+
+function hideToast(options) {
+  const { noConflict = false, success, fail, complete } = options
+
+  if (isLoadingShow && noConflict) {
+    return
+  }
+  try {
+    if (toastKey) {
+      Portal.remove(toastKey)
+      toastKey = null
+    }
+    const result = {
+      errMsg: 'hideToast:ok'
+    }
+    successHandle(result, success, complete)
+  } catch (e) {
+    const result = {
+      errMsg: `hideToast:fail invalid ${e}`
+    }
+    failHandle(result, fail, complete)
+  }
+}
+
+function showLoading (options) {
+  const { title, mask, success, fail, complete } = options
+  showToast({
+    title,
+    mask,
+    icon: 'loading',
+    isLoading: true,
+    success () {
+      const result = {
+        errMsg: 'showLoading:ok'
+      }
+      successHandle(result, success, complete)
+    },
+    fail (res) {
+      const result = {
+        errMsg: res.errMsg.replace('showToast', 'showLoading')
+      }
+      failHandle(result, success, complete)
+    }
+  })
+}
+
+function hideLoading (options) {
+  const { noConflict = false, success, fail, complete } = options
+  if (!isLoadingShow && noConflict) {
+    return
+  }
+  isLoadingShow = false
+  try {
+    if (toastKey) {
+      Portal.remove(toastKey)
+      toastKey = null
+    }
+    const result = {
+      errMsg: 'hideLoading:ok'
+    }
+    successHandle(result, success, complete)
+  } catch (e) {
+    const result = {
+      errMsg: `hideLoading:fail invalid ${e}`
+    }
+    failHandle(result, fail, complete)
+  }
+}
+
+export {
+  showToast,
+  hideToast,
+  showLoading,
+  hideLoading
+}

package/src/platform/index.js

@@ -107,3 +107,6 @@ export * from './api/window'
 
 // getEnterOptionsSync
 export * from './api/lifecycle'
+
+// getLocation, openLocation, chooseLocation
+export * from './api/location'