@mpxjs/api-proxy 2.9.67 → 2.9.70-alpha.0

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

@@ -0,0 +1,144 @@
+import { successHandle, failHandle, warn } from '../../../common/js'
+import { hasOwn } from '@mpxjs/utils'
+const { Storage } = __GLOBAL__
+
+function setStorage (options = {}) {
+  const { key, data, success, fail, complete } = options
+
+  try {
+    setStorageSync(key, data)
+
+    const res = { errMsg: 'setStorage:ok' }
+    successHandle(res, success, complete)
+    return Promise.resolve(res)
+  } catch (err) {
+    const res = { errMsg: `setStorage:fail ${err}` }
+    failHandle(res, fail, complete)
+    return Promise.reject(res)
+  }
+}
+
+function setStorageSync (key = '', data) {
+  let obj = {}
+
+  if (typeof data === 'symbol') {
+    obj = { data: '' }
+  } else {
+    obj = { data }
+  }
+  Storage.set(key, JSON.stringify(obj))
+}
+
+function getStorage (options = {}) {
+  const { key, success, fail, complete } = options
+  const { result, data } = getItem(key)
+
+  if (result) {
+    const res = { errMsg: 'getStorage:ok', data: data }
+    successHandle(res, success, complete)
+    return Promise.resolve(res)
+  } else {
+    const res = { errMsg: 'getStorage:fail', data: null }
+    failHandle(res, fail, complete)
+    return Promise.reject(res)
+  }
+}
+
+function getStorageSync (key) {
+  const res = getItem(key)
+  if (res.result) return res.data
+
+  return ''
+}
+
+function getItem (key) {
+  let item
+  try {
+    item = JSON.parse(Storage.get(key))
+  } catch (e) {}
+
+  if (item && typeof item === 'object' && hasOwn(item, 'data')) {
+    return { result: true, data: item.data }
+  } else {
+    return { result: false }
+  }
+}
+
+function getStorageInfo (options = {}) {
+  const { success, fail, complete } = options
+
+  try {
+    const info = getStorageInfoSync()
+
+    const res = Object.assign({}, { errMsg: 'getStorageInfo:ok' }, info)
+    successHandle(res, success, complete)
+    return Promise.resolve(res)
+  } catch (err) {
+    const res = { errMsg: `getStorageInfo:fail ${err}` }
+    failHandle(res, fail, complete)
+    return Promise.reject(res)
+  }
+}
+
+function getStorageInfoSync () {
+  return {
+    keys: Object.keys(Storage),
+    limitSize: null,
+    currentSize: null
+  }
+}
+
+function removeStorage (options = { key: '' }) {
+  const { key, success, fail, complete } = options
+
+  try {
+    removeStorageSync(key)
+
+    const res = { errMsg: 'removeStorage:ok' }
+    successHandle(res, success, complete)
+    return Promise.resolve(res)
+  } catch (err) {
+    const res = { errMsg: `removeStorage:fail ${err}` }
+    failHandle(res, fail, complete)
+    return Promise.reject(res)
+  }
+}
+
+function removeStorageSync (key) {
+  Storage.remove(key)
+}
+
+function clearStorage (options = {}) {
+  warn('不支持clearStorageSync')
+  // const { success, fail, complete } = options
+
+  // try {
+  //   clearStorageSync()
+
+  //   const res = { errMsg: 'clearStorage:ok' }
+  //   successHandle(res, success, complete)
+  //   return Promise.resolve(res)
+  // } catch (err) {
+  //   const res = { errMsg: `clearStorage:fail ${err}` }
+  //   failHandle(res, fail, complete)
+  //   return Promise.reject(res)
+  // }
+}
+
+function clearStorageSync () {
+  // Storage.clear()
+  warn('不支持clearStorageSync')
+}
+
+export {
+  setStorage,
+  setStorageSync,
+  getStorage,
+  getStorageSync,
+  getStorageInfo,
+  getStorageInfoSync,
+  removeStorage,
+  removeStorageSync,
+  clearStorage,
+  clearStorageSync
+}

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

@@ -69,7 +69,7 @@ function getItem (key) {
   } catch (e) {
   }
 
-  if (item && typeof item === 'object' && hasOwn(item, 'data')) {
+  if (hasOwn(item, 'data')) {
     return { result: true, data: item.data }
   } else {
     return { result: false }

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

@@ -49,7 +49,7 @@ function getStorage (options = {}) {
       item = JSON.parse(res)
     } catch (e) {
     }
-    if (item && typeof item === 'object' && hasOwn(item, 'data')) {
+    if (hasOwn(item, 'data')) {
       data = item.data
     }
     const result = {

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

@@ -40,9 +40,15 @@ const getDeviceInfo = function () {
 
 const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
 
+const getLaunchOptionsSync = ENV_OBJ.getLaunchOptionsSync || envError('getLaunchOptionsSync')
+
+const getEnterOptionsSync = ENV_OBJ.getEnterOptionsSync || envError('getEnterOptionsSync')
+
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

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

@@ -8,9 +8,15 @@ const getDeviceInfo = ENV_OBJ.getDeviceInfo || envError('getDeviceInfo')
 
 const getWindowInfo = ENV_OBJ.getWindowInfo || envError('getWindowInfo')
 
+const getLaunchOptionsSync = ENV_OBJ.getLaunchOptionsSync || envError('getLaunchOptionsSync')
+
+const getEnterOptionsSync = ENV_OBJ.getEnterOptionsSync || envError('getEnterOptionsSync')
+
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

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

@@ -0,0 +1,52 @@
+import { successHandle } from '../../../common/js'
+const { Hummer } = __GLOBAL__
+
+function getSystemInfoSync () {
+  const {
+    platform,
+    osVersion,
+    deviceWidth,
+    deviceHeight,
+    availableWidth,
+    availableHeight,
+    safeAreaBottom
+  } = Hummer.env || {}
+  return {
+    brand: platform,
+    model: platform,
+    pixelRatio: null,
+    screenWidth: deviceWidth,
+    screenHeight: deviceHeight,
+    windowWidth: availableWidth,
+    windowHeight: availableHeight,
+    statusBarHeight: null,
+    language: null,
+    version: null,
+    system: platform + osVersion,
+    platform: platform,
+    fontSizeSetting: null,
+    SDKVersion: null,
+    benchmarkLevel: null,
+    albumAuthorized: null,
+    cameraAuthorized: null,
+    locationAuthorized: null,
+    microphoneAuthorized: null,
+    notificationAlertAuthorized: null,
+    notificationAuthorized: null,
+    notificationBadgeAuthorized: null,
+    notificationSoundAuthorized: null,
+    bluetoothEnabled: null,
+    locationEnabled: null,
+    wifiEnabled: null,
+    safeArea: safeAreaBottom
+  }
+}
+
+function getSystemInfo (options = {}) {
+  const info = getSystemInfoSync()
+  const res = Object.assign({ errMsg: 'getSystemInfo:ok' }, info)
+  successHandle(res, options.success, options.complete)
+  return Promise.resolve(res)
+}
+
+export { getSystemInfo, getSystemInfoSync }

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

@@ -1,10 +1,6 @@
-import { envError, isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
+import { isBrowser, throwSSRWarning, successHandle } from '../../../common/js'
 
-function getSystemInfoSync () {
-  if (!isBrowser) {
-    throwSSRWarning('getSystemInfoSync API is running in non browser environments')
-    return
-  }
+const getDeviceInfo = function () {
   const ua = navigator.userAgent.split('(')[1]?.split(')')[0] || ''
   const phones = new Map([
     ['iPhone', /iPhone|iPad|iPod|iOS/i],
@@ -37,20 +33,57 @@ function getSystemInfoSync () {
   } else {
     system = `Android ${ua.replace(/^.*Android ([\d.]+);.*$/, '$1')}`
   }
-
   return {
-    brand: brand,
+    abi: null,
+    deviceAbi: null,
+    benchmarkLevel: null,
+    brand,
     model: brand,
+    system,
+    platform: navigator.platform,
+    cpuType: null,
+    memorySize: null
+  }
+}
+
+const getWindowInfo = function () {
+  return {
     pixelRatio: window.devicePixelRatio,
     screenWidth: window.screen.width,
     screenHeight: window.screen.height,
     windowWidth: document.documentElement.clientWidth,
     windowHeight: document.documentElement.clientHeight,
     statusBarHeight: null,
+    safeArea: null,
+    screenTop: null
+  }
+}
+
+function getSystemInfoSync () {
+  if (!isBrowser) {
+    throwSSRWarning('getSystemInfoSync API is running in non browser environments')
+    return
+  }
+
+  const {
+    pixelRatio,
+    screenWidth,
+    screenHeight,
+    windowWidth,
+    windowHeight,
+    statusBarHeight,
+    safeArea
+  } = getWindowInfo()
+  const {
+    benchmarkLevel,
+    brand,
+    model,
+    system,
+    platform
+  } = getDeviceInfo()
+  const result = Object.assign({
     language: navigator.language,
     version: null,
-    system,
-    platform: navigator.platform,
     fontSizeSetting: null,
     SDKVersion: null,
     benchmarkLevel: null,
@@ -64,9 +97,23 @@ function getSystemInfoSync () {
     notificationSoundAuthorized: null,
     bluetoothEnabled: null,
     locationEnabled: null,
-    wifiEnabled: null,
-    safeArea: null
-  }
+    wifiEnabled: null
+  }, {
+    pixelRatio,
+    screenWidth,
+    screenHeight,
+    windowWidth,
+    windowHeight,
+    statusBarHeight,
+    safeArea
+  }, {
+    benchmarkLevel,
+    brand,
+    model,
+    system,
+    platform
+  })
+  return result
 }
 
 function getSystemInfo (options = {}) {
@@ -79,13 +126,27 @@ function getSystemInfo (options = {}) {
   successHandle(res, options.success, options.complete)
 }
 
-const getDeviceInfo = envError('getDeviceInfo')
+const getEnterOptionsSync = function () {
+  if (!isBrowser) {
+    throwSSRWarning('getEnterOptionsSync API is running in non browser environments')
+    return
+  }
+  return global.__mpxEnterOptions || {}
+}
 
-const getWindowInfo = envError('getWindowInfo')
+const getLaunchOptionsSync = function () {
+  if (!isBrowser) {
+    throwSSRWarning('getLaunchOptionsSync API is running in non browser environments')
+    return
+  }
+  return global.__mpxEnterOptions || {}
+}
 
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

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

@@ -5,7 +5,7 @@ import { getWindowInfo } from './rnWindowInfo'
 
 const getSystemInfoSync = function () {
   const windowInfo = getWindowInfo()
-  const { screenWidth, screenHeight, safeArea } = windowInfo
+  const { screenWidth, screenHeight } = windowInfo
 
   const result = {
     brand: DeviceInfo.getBrand(),
@@ -13,10 +13,9 @@ const getSystemInfoSync = function () {
     system: `${DeviceInfo.getSystemName()} ${DeviceInfo.getSystemVersion()}`,
     platform: DeviceInfo.isEmulatorSync() ? 'emulator' : DeviceInfo.getSystemName(),
     deviceOrientation: screenWidth > screenHeight ? 'portrait' : 'landscape',
-    statusBarHeight: safeArea.top,
-    fontSizeSetting: PixelRatio.getFontScale(),
-    ...windowInfo
+    fontSizeSetting: PixelRatio.getFontScale()
   }
+  Object.assign(result, windowInfo)
   defineUnsupportedProps(result, [
     'language',
     'version',
@@ -75,9 +74,26 @@ const getDeviceInfo = function () {
   return deviceInfo
 }
 
+const getLaunchOptionsSync = function () {
+  const options = global.__mpxEnterOptions || {}
+  const { path, scene, query } = options
+  return {
+    path,
+    scene,
+    query
+  }
+}
+
+const getEnterOptionsSync = function () {
+  const result = getLaunchOptionsSync()
+  return result
+}
+
 export {
   getSystemInfo,
   getSystemInfoSync,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getLaunchOptionsSync,
+  getEnterOptionsSync
 }

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

@@ -0,0 +1,101 @@
+import { successHandle } from '../../../common/js'
+import '../../../common/stylus/Toast.styl'
+
+import { getClassStyle } from '@hummer/tenon-vue'
+
+function createDom (Element, attrs = {}, children = []) {
+  const dom = new Element()
+  Object.keys(attrs).forEach(k => Reflect.set(dom, k, attrs[k]))
+  children.length && children.forEach(child => dom.appendChild(child))
+  return dom
+}
+
+export default class Toast {
+  constructor () {
+    this.defaultOpts = {
+      title: '',
+      icon: 'success',
+      image: '',
+      duration: 1500,
+      mask: false,
+      success: () => {},
+      fail: () => {},
+      complete: () => {}
+    }
+    this.dialog = null
+    this.hideTimer = null
+    this.type = null
+
+    // create & combine toast
+    this.toast = createDom(View, { style: getClassStyle(null, '__mpx_toast__') }, [
+      // todo 暂不支持 mask隐藏
+      // this.mask = createDom(View, { style: getClassStyle(null, '__mpx_mask__') }),
+      this.content = createDom(View, { style: getClassStyle(null, '__mpx_toast_box__') }, [
+        this.icon = createDom(View, { style: getClassStyle(null, '__mpx_toast_icon__') }),
+        this.title = createDom(Text, { style: getClassStyle(null, '__mpx_toast_title__') })
+      ])
+    ])
+  }
+
+  show (options, type) {
+    if (this.hideTimer) {
+      clearTimeout(this.hideTimer)
+      this.hideTimer = null
+    }
+
+    const opts = Object.assign({}, this.defaultOpts, options)
+
+    this.type = type
+
+    // if (opts.mask) {
+    //   this.mask.class += 'show'
+    // } else {
+    //   this.mask.classList.remove('show')
+    // }
+
+    // const defaultIconClass = '__mpx_toast_icon__'
+
+    const iconClass = opts.image
+      ? '' // image
+      : opts.icon === 'none'
+        ? '__hide_icon' // none
+        : opts.icon === 'error'
+          ? '__error_icon'
+          : '__success_icon' // default
+
+    // 在Hummer环境，Object.assign 有一些问题，需要重新进行一次赋值
+    this.icon.style = Object.assign(this.icon.style, getClassStyle(null, `${iconClass}`))
+
+    opts.image && (this.icon.style = Object.assign(this.icon.style, { backgroundImage: opts.image }))
+
+    this.title.text = opts.title || ''
+
+    this.dialog = new Dialog()
+    this.dialog.cancelable = false
+    opts.icon === 'loading'
+      ? this.dialog.loading(opts.title || 'loading...') // 空字符串也被过滤
+      : this.dialog.custom(this.toast)
+
+    opts.duration >= 0 && this.hide({ duration: opts.duration }, type)
+
+    const errMsg = type === 'loading' ? 'showLoading:ok' : 'showToast:ok'
+    successHandle({ errMsg }, opts.success, opts.complete)
+    return Promise.resolve({ errMsg })
+  }
+
+  hide (options = {}, type) {
+    if (this.type !== type) return
+
+    const duration = options.duration || 0
+    const errMsg = type === 'loading' ? 'hideLoading:ok' : 'hideToast:ok'
+    successHandle({ errMsg }, options.success, options.complete)
+
+    if (this.hideTimer) {
+      clearTimeout(this.hideTimer)
+      this.hideTimer = null
+    }
+
+    this.hideTimer = setTimeout(() => { this.dialog.dismiss() }, duration)
+    return Promise.resolve({ errMsg })
+  }
+}

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

@@ -0,0 +1,36 @@
+import Toast from './Toast'
+
+let toast = null
+
+function showToast (options = { title: '' }) {
+  if (!toast) { toast = new Toast() }
+  return toast.show(options, 'toast')
+}
+
+function hideToast (options = {}) {
+  if (!toast) { return }
+  return toast.hide(Object.assign({ duration: 0 }, options), 'toast')
+}
+
+function showLoading (options = { title: '' }) {
+  if (!toast) { toast = new Toast() }
+  return toast.show(Object.assign({
+    icon: 'loading',
+    duration: -1
+  }, options), 'loading')
+}
+
+function hideLoading (options = {}) {
+  if (!toast) { return }
+  return toast.hide(Object.assign({
+    icon: 'loading',
+    duration: 0
+  }, options), 'loading')
+}
+
+export {
+  showToast,
+  hideToast,
+  showLoading,
+  hideLoading
+}

package/src/platform/index.js

@@ -105,9 +105,6 @@ export * from './api/video'
 // onWindowResize, offWindowResize
 export * from './api/window'
 
-// getEnterOptionsSync
-export * from './api/lifecycle'
-
 // getLocation, openLocation, chooseLocation
 export * from './api/location'