@dcloudio/uni-app-plus 2.0.1-33520211229001 → 2.0.1-33920220121002

package/dist/index.js

@@ -726,9 +726,15 @@ const customize = cached((str) => {
 
 function initTriggerEvent (mpInstance) {
   const oldTriggerEvent = mpInstance.triggerEvent;
-  mpInstance.triggerEvent = function (event, ...args) {
+  const newTriggerEvent = function (event, ...args) {
     return oldTriggerEvent.apply(mpInstance, [customize(event), ...args])
   };
+  try {
+    // 京东小程序 triggerEvent 为只读
+    mpInstance.triggerEvent = newTriggerEvent;
+  } catch (error) {
+    mpInstance._triggerEvent = newTriggerEvent;
+  }
 }
 
 function initHook (name, options, isComponent) {
@@ -2128,17 +2134,17 @@ function createPlugin (vm) {
   const appOptions = parseApp$1(vm);
   if (isFn(appOptions.onShow) && wx.onAppShow) {
     wx.onAppShow((...args) => {
-      appOptions.onShow.apply(vm, args);
+      vm.__call_hook('onShow', args);
     });
   }
   if (isFn(appOptions.onHide) && wx.onAppHide) {
     wx.onAppHide((...args) => {
-      appOptions.onHide.apply(vm, args);
+      vm.__call_hook('onHide', args);
     });
   }
   if (isFn(appOptions.onLaunch)) {
     const args = wx.getLaunchOptionsSync && wx.getLaunchOptionsSync();
-    appOptions.onLaunch.call(vm, args);
+    vm.__call_hook('onLaunch', args);
   }
   return vm
 }

package/dist/index.v3.js

@@ -250,7 +250,8 @@ var serviceContext = (function () {
     'restoreGlobal',
     'getSubNVueById',
     'getCurrentSubNVue',
-    'setPageMeta',
+    'setPageMeta',
+    'onHostEventReceive',
     'onNativeEventReceive',
     'sendNativeEvent',
     'preloadPage',
@@ -4365,7 +4366,7 @@ var serviceContext = (function () {
     return array.length > 1 ? '.' + array[array.length - 1] : ''
   }
 
-  const AUDIO_DEFAULT_CATEGORY = 'ambient';
+  const AUDIO_DEFAULT_SESSION_CATEGORY = 'playback';
 
   const audios = {};
 
@@ -4413,7 +4414,7 @@ var serviceContext = (function () {
     audio.src = '';
     audio.volume = 1;
     audio.startTime = 0;
-    audio.setSessionCategory(AUDIO_DEFAULT_CATEGORY);
+    audio.setSessionCategory(AUDIO_DEFAULT_SESSION_CATEGORY);
     return {
       errMsg: 'createAudioInstance:ok',
       audioId
@@ -4441,7 +4442,7 @@ var serviceContext = (function () {
     loop = false,
     obeyMuteSwitch,
     volume,
-    category = AUDIO_DEFAULT_CATEGORY
+    sessionCategory = AUDIO_DEFAULT_SESSION_CATEGORY
   }) {
     const audio = audios[audioId];
     if (audio) {
@@ -4459,8 +4460,8 @@ var serviceContext = (function () {
         audio.volume = style.volume = volume;
       }
       audio.setStyles(style);
-      if (category) {
-        audio.setSessionCategory(category);
+      if (sessionCategory) {
+        audio.setSessionCategory(sessionCategory);
       }
       initStateChage(audioId);
     }
@@ -6758,6 +6759,7 @@ var serviceContext = (function () {
     type = 'wgs84',
     geocode = false,
     altitude = false,
+    isHighAccuracy = false,
     highAccuracyExpireTime
   } = {}, callbackId) {
     const errorCallback = warpPlusErrorCallback(callbackId, 'getLocation');
@@ -6774,7 +6776,7 @@ var serviceContext = (function () {
         errorCallback(e);
       }, {
         geocode: geocode,
-        enableHighAccuracy: altitude,
+        enableHighAccuracy: isHighAccuracy || altitude,
         timeout: highAccuracyExpireTime,
         coordsType: type
       }
@@ -7541,46 +7543,59 @@ var serviceContext = (function () {
       firstIpv4: firstIpv4,
       tls
     };
+    let withArrayBuffer;
     if (method !== 'GET') {
-      options.body = typeof data === 'string' ? data : JSON.stringify(data);
+      if (toString.call(data) === '[object ArrayBuffer]') {
+        withArrayBuffer = true;
+      } else {
+        options.body = typeof data === 'string' ? data : JSON.stringify(data);
+      }
     }
-    try {
-      stream.fetch(options, ({
-        ok,
-        status,
-        data,
-        headers,
-        errorMsg
-      }) => {
-        if (aborted) {
-          return
-        }
-        if (abortTimeout) {
-          clearTimeout(abortTimeout);
-        }
-        const statusCode = status;
-        if (statusCode > 0) {
-          publishStateChange$1({
-            requestTaskId,
-            state: 'success',
-            data: ok && responseType === 'arraybuffer' ? base64ToArrayBuffer$2(data) : data,
-            statusCode,
-            header: headers,
-            cookies: cookiesParse(headers)
-          });
-        } else {
-          let errMsg = 'abort statusCode:' + statusCode;
-          if (errorMsg) {
-            errMsg = errMsg + ' ' + errorMsg;
-          }
-          publishStateChange$1({
-            requestTaskId,
-            state: 'fail',
-            statusCode,
-            errMsg
-          });
+    const callback = ({
+      ok,
+      status,
+      data,
+      headers,
+      errorMsg
+    }) => {
+      if (aborted) {
+        return
+      }
+      if (abortTimeout) {
+        clearTimeout(abortTimeout);
+      }
+      const statusCode = status;
+      if (statusCode > 0) {
+        publishStateChange$1({
+          requestTaskId,
+          state: 'success',
+          data: ok && responseType === 'arraybuffer' ? base64ToArrayBuffer$2(data) : data,
+          statusCode,
+          header: headers,
+          cookies: cookiesParse(headers)
+        });
+      } else {
+        let errMsg = 'abort statusCode:' + statusCode;
+        if (errorMsg) {
+          errMsg = errMsg + ' ' + errorMsg;
         }
-      });
+        publishStateChange$1({
+          requestTaskId,
+          state: 'fail',
+          statusCode,
+          errMsg
+        });
+      }
+    };
+    try {
+      if (withArrayBuffer) {
+        stream.fetchWithArrayBuffer({
+          '@type': 'binary',
+          base64: arrayBufferToBase64$2(data)
+        }, options, callback);
+      } else {
+        stream.fetch(options, callback);
+      }
       requestTasks[requestTaskId] = {
         abort () {
           aborted = true;
@@ -8130,7 +8145,7 @@ var serviceContext = (function () {
     }
 
     login (options) {
-      this._warp((data, callbackId) => login(data, callbackId, false), this._getOptions(options));
+      this._warp((data, callbackId) => login(data, callbackId, false), options);
     }
 
     getCheckBoxState (options) {
@@ -8138,7 +8153,7 @@ var serviceContext = (function () {
     }
 
     preLogin (options) {
-      this._warp((data, callbackId) => preLogin$1(data, callbackId, false), this._getOptions(options));
+      this._warp((data, callbackId) => preLogin$1(data, callbackId, false), options);
     }
 
     onButtonsClick (callback) {
@@ -8587,6 +8602,10 @@ var serviceContext = (function () {
     });
   });
 
+  function onHostEventReceive (callbackId) {
+    callbacks$3.push(callbackId);
+  }
+
   function onNativeEventReceive (callbackId) {
     callbacks$3.push(callbackId);
   }
@@ -11330,9 +11349,7 @@ var serviceContext = (function () {
         this._dispatchEvent('adClicked', {});
       });
 
-      if (this._preload) {
-        this._loadAd();
-      }
+      this._loadAd();
     }
 
     get isExpired () {
@@ -11956,6 +11973,7 @@ var serviceContext = (function () {
     restoreGlobal: restoreGlobal,
     getSubNVueById: getSubNVueById,
     getCurrentSubNVue: getCurrentSubNVue,
+    onHostEventReceive: onHostEventReceive,
     onNativeEventReceive: onNativeEventReceive,
     sendNativeEvent: sendNativeEvent,
     loadSubPackage: loadSubPackage$2,
@@ -15787,7 +15805,7 @@ var serviceContext = (function () {
 
   var zstream = ZStream;
 
-  var toString = Object.prototype.toString;
+  var toString$1 = Object.prototype.toString;
 
   /* Public constants ==========================================================*/
   /* ===========================================================================*/
@@ -15951,7 +15969,7 @@ var serviceContext = (function () {
       if (typeof opt.dictionary === 'string') {
         // If we need to compress text, change encoding to utf8.
         dict = strings.string2buf(opt.dictionary);
-      } else if (toString.call(opt.dictionary) === '[object ArrayBuffer]') {
+      } else if (toString$1.call(opt.dictionary) === '[object ArrayBuffer]') {
         dict = new Uint8Array(opt.dictionary);
       } else {
         dict = opt.dictionary;
@@ -16009,7 +16027,7 @@ var serviceContext = (function () {
     if (typeof data === 'string') {
       // If we need to compress text, change encoding to utf8.
       strm.input = strings.string2buf(data);
-    } else if (toString.call(data) === '[object ArrayBuffer]') {
+    } else if (toString$1.call(data) === '[object ArrayBuffer]') {
       strm.input = new Uint8Array(data);
     } else {
       strm.input = data;
@@ -18561,7 +18579,7 @@ var serviceContext = (function () {
 
   var gzheader = GZheader;
 
-  var toString$1 = Object.prototype.toString;
+  var toString$2 = Object.prototype.toString;
 
   /**
    * class Inflate
@@ -18702,7 +18720,7 @@ var serviceContext = (function () {
       // Convert data if needed
       if (typeof opt.dictionary === 'string') {
         opt.dictionary = strings.string2buf(opt.dictionary);
-      } else if (toString$1.call(opt.dictionary) === '[object ArrayBuffer]') {
+      } else if (toString$2.call(opt.dictionary) === '[object ArrayBuffer]') {
         opt.dictionary = new Uint8Array(opt.dictionary);
       }
       if (opt.raw) { //In raw mode we need to set the dictionary early
@@ -18760,7 +18778,7 @@ var serviceContext = (function () {
     if (typeof data === 'string') {
       // Only binary strings can be decompressed on practice
       strm.input = strings.binstring2buf(data);
-    } else if (toString$1.call(data) === '[object ArrayBuffer]') {
+    } else if (toString$2.call(data) === '[object ArrayBuffer]') {
       strm.input = new Uint8Array(data);
     } else {
       strm.input = data;
@@ -20134,6 +20152,9 @@ var serviceContext = (function () {
     },
     {
       name: 'volume'
+    },
+    {
+      name: 'sessionCategory'
     }
   ];