@mpxjs/api-proxy 2.9.26 → 2.9.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.26",
+  "version": "2.9.28",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -39,5 +39,5 @@
   "dependencies": {
     "axios": "^1.6.7"
   },
-  "gitHead": "0abcc7e543b5c4c4af14b2154b78b15c1f571160"
+  "gitHead": "d573387d467bb2efb88cca627380627a1d45a4cd"
 }

package/src/common/js/utils.js

@@ -100,6 +100,9 @@ const isBrowser = typeof window !== 'undefined'
 function throwSSRWarning (info) {
   console.error(`[Mpx runtime error]: Dangerous API! ${info}, It may cause some problems, please use this method with caution`)
 }
+
+const ENV_OBJ = getEnvObj()
+
 export {
   changeOpts,
   handleSuccess,
@@ -111,5 +114,6 @@ export {
   makeMap,
   isBrowser,
   hasOwn,
-  throwSSRWarning
+  throwSSRWarning,
+  ENV_OBJ
 }

package/src/platform/api/action-sheet/index.ali.js

@@ -1,4 +1,5 @@
-import { changeOpts, noop } from '../../../common/js'
+import { ENV_OBJ, changeOpts, noop } from '../../../common/js'
+
 function showActionSheet (options = {}) {
   const opts = changeOpts(options, {
     itemList: 'items'
@@ -20,7 +21,7 @@ function showActionSheet (options = {}) {
     }
   }
 
-  my.showActionSheet(opts)
+  return ENV_OBJ.showActionSheet(opts)
 }
 
 export {

package/src/platform/api/action-sheet/index.js

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const showActionSheet = ENV_OBJ.showActionSheet || envError('showActionSheet')
 

package/src/platform/api/add-phone-contact/index.ali.js

@@ -1,11 +1,11 @@
-import { changeOpts } from '../../../common/js'
+import { ENV_OBJ, changeOpts } from '../../../common/js'
 
 function addPhoneContact (options = {}) {
   const opts = changeOpts(options, {
     weChatNumber: 'alipayAccount'
   })
 
-  my.addPhoneContact(opts)
+  return ENV_OBJ.addPhoneContact(opts)
 }
 
 export {

package/src/platform/api/add-phone-contact/index.js

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const addPhoneContact = ENV_OBJ.addPhoneContact || envError('addPhoneContact')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const createAnimation = ENV_OBJ.createAnimation || envError('createAnimation')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const onError = ENV_OBJ.onError || envError('onError')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const createInnerAudioContext = ENV_OBJ.createInnerAudioContext || envError('createInnerAudioContext')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const base64ToArrayBuffer = ENV_OBJ.base64ToArrayBuffer || envError('base64ToArrayBuffer')
 

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

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

package/src/platform/api/ble-connection/index.ali.js

@@ -1,13 +1,15 @@
+import { ENV_OBJ } from '../../../common/js'
+
 function closeBLEConnection (options = {}) {
-  my.disconnectBLEDevice(options)
+  return ENV_OBJ.disconnectBLEDevice(options)
 }
 
 function createBLEConnection (options = {}) {
-  my.connectBLEDevice(options)
+  return ENV_OBJ.connectBLEDevice(options)
 }
 
 function onBLEConnectionStateChange (callback) {
-  my.onBLEConnectionStateChanged(callback)
+  return ENV_OBJ.onBLEConnectionStateChanged(callback)
 }
 
 export {

package/src/platform/api/ble-connection/index.js

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const closeBLEConnection = ENV_OBJ.closeBLEConnection || envError('closeBLEConnection')
 

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

@@ -1,4 +1,4 @@
-import { changeOpts, envError, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, envError, handleSuccess } from '../../../common/js'
 
 function canvasToTempFilePath (options = {}) {
   handleSuccess(options, res => {
@@ -8,13 +8,11 @@ function canvasToTempFilePath (options = {}) {
     )
   })
 
-  my.canvasToTempFilePath(options)
+  return ENV_OBJ.canvasToTempFilePath(options)
 }
-const createCanvasContext = envError('createCanvasContext')
 const canvasGetImageData = envError('canvasGetImageData')
 
 export {
-  createCanvasContext,
   canvasToTempFilePath,
   canvasGetImageData
 }

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

@@ -1,15 +1,10 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
-
-const createCanvasContext = ENV_OBJ.createCanvasContext || envError('createCanvasContext')
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const canvasToTempFilePath = ENV_OBJ.canvasToTempFilePath || envError('canvasToTempFilePath')
 
 const canvasGetImageData = ENV_OBJ.canvasGetImageData || envError('canvasGetImageData')
 
 export {
-  createCanvasContext,
   canvasToTempFilePath,
   canvasGetImageData
 }

package/src/platform/api/check-session/index.js

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const checkSession = ENV_OBJ.checkSession || envError('checkSession')
 

package/src/platform/api/clipboard-data/index.ali.js

@@ -1,4 +1,4 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
 
 function setClipboardData (options = {}) {
   const opts = changeOpts(options, {
@@ -11,7 +11,7 @@ function setClipboardData (options = {}) {
       errMsg: 'setClipboardData:ok'
     })
   })
-  my.setClipboard(opts)
+  return ENV_OBJ.setClipboard(opts)
 }
 
 function getClipboardData (options = {}) {
@@ -21,7 +21,7 @@ function getClipboardData (options = {}) {
     return changeOpts(res, { text: 'data' })
   })
 
-  my.getClipboard(opts)
+  return ENV_OBJ.getClipboard(opts)
 }
 
 export {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const setClipboardData = ENV_OBJ.setClipboardData || envError('setClipboardData')
 

package/src/platform/api/create-intersection-observer/index.ali.js

@@ -1,5 +1,7 @@
+import { ENV_OBJ } from '../../../common/js'
+
 function createIntersectionObserver (component, options = {}) {
-  return my.createIntersectionObserver(options)
+  return ENV_OBJ.createIntersectionObserver(options)
 }
 
 export {

package/src/platform/api/create-intersection-observer/index.js

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const createIntersectionObserver = ENV_OBJ.createIntersectionObserver || envError('createIntersectionObserver')
 

package/src/platform/api/create-selector-query/index.ali.js

@@ -1,7 +1,7 @@
-import { noop } from '../../../common/js'
+import { ENV_OBJ, noop } from '../../../common/js'
 
 function createSelectorQuery (options = {}) {
-  const selectorQuery = my.createSelectorQuery(options)
+  const selectorQuery = ENV_OBJ.createSelectorQuery(options)
   const proxyMethods = ['boundingClientRect', 'scrollOffset']
   const cbs = []
   proxyMethods.forEach((name) => {
@@ -23,8 +23,12 @@ function createSelectorQuery (options = {}) {
     return originalExec.call(this, cb)
   }
 
-  selectorQuery.in = function () {
-    return this
+  selectorQuery.in = function (_this) {
+    if (typeof _this !== 'object' || typeof _this.createSelectorQuery !== 'function') {
+      throw new Error('in 方法中，传入的 this 参数不是组件实例')
+    }
+
+    return _this.createSelectorQuery(options)
   }
 
   return selectorQuery

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const createSelectorQuery = ENV_OBJ.createSelectorQuery || envError('createSelectorQuery')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../../common/js'
 
 const getNetworkType = ENV_OBJ.getNetworkType || envError('getNetworkType')
 

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

@@ -1,4 +1,4 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
 
 function downloadFile (options = {}) {
   const opts = changeOpts(options)
@@ -7,13 +7,13 @@ function downloadFile (options = {}) {
     return changeOpts(res, { apFilePath: 'tempFilePath' })
   })
 
-  return my.downloadFile(opts)
+  return ENV_OBJ.downloadFile(opts)
 }
 
 function uploadFile (options = {}) {
   const opts = changeOpts(options, { name: 'fileName' })
 
-  return my.uploadFile(opts)
+  return ENV_OBJ.uploadFile(opts)
 }
 
 function saveFile (options = {}) {
@@ -25,7 +25,7 @@ function saveFile (options = {}) {
     return changeOpts(res, { apFilePath: 'savedFilePath' })
   })
 
-  my.saveFile(opts)
+  return ENV_OBJ.saveFile(opts)
 }
 
 export {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const downloadFile = ENV_OBJ.downloadFile || envError('downloadFile')
 

package/src/platform/api/get-user-info/index.ali.js

@@ -1,4 +1,4 @@
-import { warn } from '../../../common/js'
+import { ENV_OBJ, warn } from '../../../common/js'
 
 const TIPS_NAME = '支付宝环境 mpx'
 
@@ -10,7 +10,7 @@ function getUserInfo (options = {}) {
     warn(`支付宝不支持在 ${TIPS_NAME}.getUserInfo 中使用 lang 参数`)
   }
 
-  my.getOpenUserInfo(options)
+  return ENV_OBJ.getOpenUserInfo(options)
 }
 
 export {

package/src/platform/api/get-user-info/index.js

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const getUserInfo = ENV_OBJ.getUserInfo || envError('getUserInfo')
 

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

@@ -1,4 +1,4 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
 
 function previewImage (options = {}) {
   const opts = changeOpts(options)
@@ -8,7 +8,7 @@ function previewImage (options = {}) {
     opts.current = idx !== -1 ? idx : 0
   }
 
-  my.previewImage(opts)
+  return ENV_OBJ.previewImage(opts)
 }
 
 function compressImage (options = {}) {
@@ -27,7 +27,7 @@ function compressImage (options = {}) {
     )
   })
 
-  my.compressImage(opts)
+  return ENV_OBJ.compressImage(opts)
 }
 
 export {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const previewImage = ENV_OBJ.previewImage || envError('previewImage')
 

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

@@ -1,5 +1,7 @@
+import { ENV_OBJ } from '../../../common/js'
+
 function getEnterOptionsSync () {
-  return my.getEnterOptionsSync()
+  return ENV_OBJ.getEnterOptionsSync()
 }
 
 export {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const getEnterOptionsSync = ENV_OBJ.getEnterOptionsSync || envError('getEnterOptionsSync')
 

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

@@ -1,4 +1,4 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
 
 function login (options = {}) {
   const opts = changeOpts(options)
@@ -7,7 +7,7 @@ function login (options = {}) {
     return changeOpts(res, { authCode: 'code' }, { errMsg: 'login:ok' })
   })
 
-  my.getAuthCode(opts)
+  return ENV_OBJ.getAuthCode(opts)
 }
 
 export {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const login = ENV_OBJ.login || envError('login')
 

package/src/platform/api/make-phone-call/index.ali.js

@@ -1,10 +1,10 @@
-import { changeOpts } from '../../../common/js'
+import { ENV_OBJ, changeOpts } from '../../../common/js'
 
 function makePhoneCall (options = {}) {
   const opts = changeOpts(options, {
     phoneNumber: 'number'
   })
-  my.makePhoneCall(opts)
+  return ENV_OBJ.makePhoneCall(opts)
 }
 
 export {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const makePhoneCall = ENV_OBJ.makePhoneCall || envError('makePhoneCall')
 

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

@@ -1,4 +1,4 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
 
 function showModal (options = {}) {
   let opts
@@ -13,7 +13,7 @@ function showModal (options = {}) {
       return changeOpts(res, undefined, { cancel: !res.confirm })
     })
 
-    my.confirm(opts)
+    return ENV_OBJ.confirm(opts)
   } else {
     opts = changeOpts(options, {
       confirmText: 'buttonText'
@@ -23,7 +23,7 @@ function showModal (options = {}) {
       return changeOpts(res, undefined, { cancel: false, confirm: true })
     })
 
-    my.alert(opts)
+    return ENV_OBJ.alert(opts)
   }
 }
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const showModal = ENV_OBJ.showModal || envError('showModal')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const nextTick = ENV_OBJ.nextTick || envError('nextTick')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const pageScrollTo = ENV_OBJ.pageScrollTo || envError('pageScrollTo')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const stopPullDownRefresh = ENV_OBJ.stopPullDownRefresh || envError('stopPullDownRefresh')
 

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

@@ -1,4 +1,4 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
 
 function request (options = {}) {
   const opts = changeOpts(options, {
@@ -14,10 +14,10 @@ function request (options = {}) {
 
   // request 在 1.11.0 以上版本才支持
   // httpRequest 即将被废弃，钉钉端仍需要使用
-  if (my.canIUse('request')) {
-    return my.request(opts)
+  if (ENV_OBJ.canIUse('request')) {
+    return ENV_OBJ.request(opts)
   } else {
-    return my.httpRequest(opts)
+    return ENV_OBJ.httpRequest(opts)
   }
 }
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const request = ENV_OBJ.request || envError('request')
 

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

@@ -1,4 +1,4 @@
-import { changeOpts, error, noop } from '../../../common/js'
+import { ENV_OBJ, changeOpts, error, noop } from '../../../common/js'
 
 const TIPS_NAME = '支付宝环境 mpx'
 
@@ -37,7 +37,7 @@ function requestPayment (options = {}) {
     }
   }
 
-  my.tradePay(opts)
+  return ENV_OBJ.tradePay(opts)
 }
 
 export {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const requestPayment = ENV_OBJ.requestPayment || envError('requestPayment')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const redirectTo = ENV_OBJ.redirectTo || envError('redirectTo')
 

package/src/platform/api/scan-code/index.ali.js

@@ -1,4 +1,4 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
 
 function scanCode (options = {}) {
   const opts = changeOpts(options, {
@@ -9,7 +9,7 @@ function scanCode (options = {}) {
     return changeOpts(res, { code: 'result' })
   })
 
-  my.scan(opts)
+  return ENV_OBJ.scan(opts)
 }
 
 export {

package/src/platform/api/scan-code/index.js

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const scanCode = ENV_OBJ.scanCode || envError('scanCode')
 

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

@@ -1,4 +1,4 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
 
 function setScreenBrightness (options = {}) {
   const opts = changeOpts(options, {
@@ -7,7 +7,7 @@ function setScreenBrightness (options = {}) {
   handleSuccess(opts, res => {
     return changeOpts(res, {}, { errMsg: 'setScreenBrightness:ok' })
   })
-  my.setScreenBrightness(opts)
+  return ENV_OBJ.setScreenBrightness(opts)
 }
 
 function getScreenBrightness (options = {}) {
@@ -17,7 +17,7 @@ function getScreenBrightness (options = {}) {
     return changeOpts(res, { brightness: 'value' }, { errMsg: 'getScreenBrightness:ok' })
   })
 
-  my.getScreenBrightness(opts)
+  return ENV_OBJ.getScreenBrightness(opts)
 }
 
 export {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const setScreenBrightness = ENV_OBJ.setScreenBrightness || envError('setScreenBrightness')
 

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

@@ -1,22 +1,20 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
 
 function setNavigationBarTitle (options = {}) {
   handleSuccess(options, res => {
     return changeOpts(res, {}, { errMsg: 'setScreenBrightness:ok' })
   })
-  if (my.canIUse('setNavigationBarTitle')) {
-    my.setNavigationBarTitle(options)
-    return
+  if (ENV_OBJ.canIUse('setNavigationBarTitle')) {
+    return ENV_OBJ.setNavigationBarTitle(options)
   }
-  my.setNavigationBar(options)
+  return ENV_OBJ.setNavigationBar(options)
 }
 
 function setNavigationBarColor (options = {}) {
-  if (my.canIUse('setNavigationBarColor')) {
-    my.setNavigationBarColor(options)
-    return
+  if (ENV_OBJ.canIUse('setNavigationBarColor')) {
+    return ENV_OBJ.setNavigationBarColor(options)
   }
-  my.setNavigationBar(options)
+  return ENV_OBJ.setNavigationBar(options)
 }
 
 export {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const setNavigationBarTitle = ENV_OBJ.setNavigationBarTitle || envError('setNavigationBarTitle')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const connectSocket = ENV_OBJ.connectSocket || envError('connectSocket')
 

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

@@ -1,48 +1,50 @@
+import { ENV_OBJ } from '../../../common/js'
+
 function setStorage (options) {
-  my.setStorage(options)
+  return ENV_OBJ.setStorage(options)
 }
 
 function setStorageSync (key, data) {
-  my.setStorageSync({
+  return ENV_OBJ.setStorageSync({
     key,
     data
   })
 }
 
 function getStorage (options) {
-  my.getStorage(options)
+  return ENV_OBJ.getStorage(options)
 }
 
 function getStorageSync (key) {
-  return my.getStorageSync({
+  return ENV_OBJ.getStorageSync({
     key
   }).data
 }
 
 function getStorageInfo (options) {
-  return my.getStorageInfo(options)
+  return ENV_OBJ.getStorageInfo(options)
 }
 
 function getStorageInfoSync () {
-  return my.getStorageInfoSync()
+  return ENV_OBJ.getStorageInfoSync()
 }
 
 function removeStorage (options) {
-  return my.removeStorage(options)
+  return ENV_OBJ.removeStorage(options)
 }
 
 function removeStorageSync (key) {
-  my.removeStorageSync({
+  return ENV_OBJ.removeStorageSync({
     key
   })
 }
 
 function clearStorage (options) {
-  my.clearStorage(options)
+  return ENV_OBJ.clearStorage(options)
 }
 
 function clearStorageSync (options) {
-  my.clearStorageSync(options)
+  return ENV_OBJ.clearStorageSync(options)
 }
 
 export {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const setStorage = ENV_OBJ.setStorage || envError('setStorage')
 

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

@@ -1,11 +1,11 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
+import { ENV_OBJ, changeOpts, handleSuccess } from '../../../common/js'
 
 function getSystemInfo (options = {}) {
   const opts = changeOpts(options)
 
   handleSuccess(opts, res => {
     res.system = `${res.platform} ${res.system}`
-    res.SDKVersion = my.SDKVersion
+    res.SDKVersion = ENV_OBJ.SDKVersion
 
     // 支付宝 windowHeight 可能为 0
     if (!res.windowHeight) {
@@ -15,14 +15,14 @@ function getSystemInfo (options = {}) {
     return res
   })
 
-  my.getSystemInfo(opts)
+  return ENV_OBJ.getSystemInfo(opts)
 }
 
 function getSystemInfoSync () {
-  const res = my.getSystemInfoSync() || {}
+  const res = ENV_OBJ.getSystemInfoSync() || {}
 
   res.system = `${res.platform} ${res.system}`
-  res.SDKVersion = my.SDKVersion
+  res.SDKVersion = ENV_OBJ.SDKVersion
 
   // 支付宝 windowHeight 可能为 0
   if (!res.windowHeight) {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const getSystemInfo = ENV_OBJ.getSystemInfo || envError('getSystemInfo')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const setTabBarItem = ENV_OBJ.setTabBarItem || envError('setTabBarItem')
 

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

@@ -1,4 +1,4 @@
-import { changeOpts, warn } from '../../../common/js'
+import { ENV_OBJ, changeOpts, warn } from '../../../common/js'
 
 const TIPS_NAME = '支付宝环境 mpx'
 
@@ -7,28 +7,28 @@ function showToast (options = {}) {
     title: 'content',
     icon: 'type'
   })
-  my.showToast(opts)
+  return ENV_OBJ.showToast(opts)
 }
 
 function hideToast (options = {}) {
   if (options.success || options.fail || options.complete) {
     warn(`${TIPS_NAME}.hideToast 不支持 success/fail/complete 参数`)
   }
-  my.hideToast(options)
+  return ENV_OBJ.hideToast(options)
 }
 
 function showLoading (options = {}) {
   const opts = changeOpts(options, {
     title: 'content'
   })
-  my.showLoading(opts)
+  return ENV_OBJ.showLoading(opts)
 }
 
 function hideLoading (options = {}) {
   if (options.success || options.fail || options.complete) {
     warn(`${TIPS_NAME}.hideLoading 不支持 success/fail/complete 参数`)
   }
-  my.hideLoading(options)
+  return ENV_OBJ.hideLoading(options)
 }
 
 export {

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const showToast = ENV_OBJ.showToast || envError('showToast')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const createVideoContext = ENV_OBJ.createVideoContext || envError('createVideoContext')
 

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

@@ -1,6 +1,4 @@
-import { getEnvObj, envError } from '../../../common/js'
-
-const ENV_OBJ = getEnvObj()
+import { ENV_OBJ, envError } from '../../../common/js'
 
 const onWindowResize = ENV_OBJ.onWindowResize || envError('onWindowResize')
 

package/src/platform/index.js

@@ -19,7 +19,7 @@ export * from './api/base'
 // closeBLEConnection, createBLEConnection, onBLEConnectionStateChange
 export * from './api/ble-connection'
 
-// createCanvasContext, canvasToTempFilePath, canvasGetImageData
+// canvasToTempFilePath, canvasGetImageData
 export * from './api/canvas'
 
 // checkSession