feat(sdk): add onHostEventReceive

lib/apis.js

@@ -239,7 +239,8 @@ const third = [
   'restoreGlobal',
   'getSubNVueById',
   'getCurrentSubNVue',
-  'setPageMeta',
+  'setPageMeta',
+  'onHostEventReceive',
   'onNativeEventReceive',
   'sendNativeEvent',
   'preloadPage',

packages/uni-app-plus/dist/index.v3.js

@@ -250,7 +250,8 @@ var serviceContext = (function () {
     'restoreGlobal',
     'getSubNVueById',
     'getCurrentSubNVue',
-    'setPageMeta',
+    'setPageMeta',
+    'onHostEventReceive',
     'onNativeEventReceive',
     'sendNativeEvent',
     'preloadPage',
@@ -828,7 +829,7 @@ var serviceContext = (function () {
   };
 
   const SYNC_API_RE =
-    /^\$|Window$|WindowStyle$|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64|getLocale|setLocale/;
+    /^\$|Window$|WindowStyle$|sendHostEvent|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64|getLocale|setLocale/;
 
   const CONTEXT_API_RE = /^create|Manager$/;
 
@@ -1539,6 +1540,7 @@ var serviceContext = (function () {
   	"uni.chooseVideo.sourceType.album": "Album",
   	"uni.chooseVideo.sourceType.camera": "Camera",
   	"uni.chooseFile.notUserActivation": "File chooser dialog can only be shown with a user activation",
+  	"uni.previewImage.cancel": "Cancel",
   	"uni.previewImage.button.save": "Save Image",
   	"uni.previewImage.save.success": "Saved successfully",
   	"uni.previewImage.save.fail": "Save failed",
@@ -2055,18 +2057,15 @@ var serviceContext = (function () {
     chooseLocation: chooseLocation
   });
 
-  const type = {
-    WGS84: 'WGS84',
-    GCJ02: 'GCJ02'
-  };
+  const coordTypes = ['wgs84', 'gcj02'];
+
   const getLocation = {
     type: {
       type: String,
       validator (value, params) {
-        value = (value || '').toUpperCase();
-        params.type = Object.values(type).indexOf(value) < 0 ? type.WGS84 : value;
-      },
-      default: type.WGS84
+        value = (value || '').toLowerCase();
+        params.type = coordTypes.indexOf(value) < 0 ? coordTypes[0] : value;
+      }
     },
     altitude: {
       type: Boolean,
@@ -6760,6 +6759,7 @@ var serviceContext = (function () {
     type = 'wgs84',
     geocode = false,
     altitude = false,
+    isHighAccuracy = false,
     highAccuracyExpireTime
   } = {}, callbackId) {
     const errorCallback = warpPlusErrorCallback(callbackId, 'getLocation');
@@ -6776,8 +6776,9 @@ var serviceContext = (function () {
         errorCallback(e);
       }, {
         geocode: geocode,
-        enableHighAccuracy: altitude,
-        timeout: highAccuracyExpireTime
+        enableHighAccuracy: isHighAccuracy || altitude,
+        timeout: highAccuracyExpireTime,
+        coordsType: type
       }
     );
   }
@@ -8588,6 +8589,10 @@ var serviceContext = (function () {
     });
   });
 
+  function onHostEventReceive (callbackId) {
+    callbacks$3.push(callbackId);
+  }
+
   function onNativeEventReceive (callbackId) {
     callbacks$3.push(callbackId);
   }
@@ -9230,7 +9235,7 @@ var serviceContext = (function () {
     });
   }
 
-  function onWebviewPopGesture(webview) {
+  function onWebviewPopGesture (webview) {
     let popStartStatusBarStyle;
     webview.addEventListener('popGesture', e => {
       if (e.type === 'start') {
@@ -9259,13 +9264,12 @@ var serviceContext = (function () {
     });
   }
 
-
   /**
    * 是否处于直达页面
    * @param page
    * @returns
    */
-  function isDirectPage(page) {
+  function isDirectPage (page) {
     return (
       __uniConfig.realEntryPagePath &&
       page.$page.route === __uniConfig.entryPagePath
@@ -9274,19 +9278,19 @@ var serviceContext = (function () {
   /**
    * 重新启动到首页
    */
-  function reLaunchEntryPage() {
+  function reLaunchEntryPage () {
     __uniConfig.entryPagePath = __uniConfig.realEntryPagePath;
     delete __uniConfig.realEntryPagePath;
     uni.reLaunch({
-      url: addLeadingSlash(__uniConfig.entryPagePath),
+      url: addLeadingSlash(__uniConfig.entryPagePath)
     });
   }
 
-  function hasLeadingSlash(str) {
+  function hasLeadingSlash (str) {
     return str.indexOf('/') === 0
   }
 
-  function addLeadingSlash(str) {
+  function addLeadingSlash (str) {
     return hasLeadingSlash(str) ? str : '/' + str
   }
 
@@ -9808,6 +9812,22 @@ var serviceContext = (function () {
   const enterOptions = createLaunchOptions();
   const launchOptions = createLaunchOptions();
 
+  function getEnterOptions () {
+    return enterOptions
+  }
+
+  function initEnterOptions ({
+    path,
+    query,
+    referrerInfo
+  }) {
+    extend(enterOptions, {
+      path,
+      query: query ? parseQuery(query) : {},
+      referrerInfo: referrerInfo || {}
+    });
+  }
+
   function initLaunchOptions ({
     path,
     query,
@@ -11004,11 +11024,6 @@ var serviceContext = (function () {
     pagePath,
     visible
   }) {
-    if (!isTabBarPage()) {
-      return {
-        errMsg: 'setTabBarItem:fail not TabBar page'
-      }
-    }
     tabBar$1.setTabBarItem(index, text, iconPath, selectedIconPath, visible);
     const route = pagePath && __uniRoutes.find(({ path }) => path === pagePath);
     if (route) {
@@ -11947,6 +11962,7 @@ var serviceContext = (function () {
     restoreGlobal: restoreGlobal,
     getSubNVueById: getSubNVueById,
     getCurrentSubNVue: getCurrentSubNVue,
+    onHostEventReceive: onHostEventReceive,
     onNativeEventReceive: onNativeEventReceive,
     sendNativeEvent: sendNativeEvent,
     loadSubPackage: loadSubPackage$2,
@@ -21708,18 +21724,12 @@ var serviceContext = (function () {
       callCurrentPageHook('onHide');
     }
 
-    function onAppEnterForeground () {
-      const pages = getCurrentPages();
-      if (pages.length === 0) {
-        return
-      }
-      const page = pages[pages.length - 1];
-      const args = {
-        path: page.route,
-        query: page.options
-      };
-
-      callAppHook(getApp(), 'onShow', args);
+    function onAppEnterForeground (enterOptions) {
+      callAppHook(getApp(), 'onShow', enterOptions);
+      const pages = getCurrentPages();
+      if (pages.length === 0) {
+        return
+      }
       callCurrentPageHook('onShow');
     }
 
@@ -22039,7 +22049,11 @@ var serviceContext = (function () {
     });
 
     plus.globalEvent.addEventListener('resume', () => {
-      emit('onAppEnterForeground');
+      const info = parseRedirectInfo();
+      if (info && info.userAction) {
+        initEnterOptions(info);
+      }
+      emit('onAppEnterForeground', getEnterOptions());
     });
 
     plus.globalEvent.addEventListener('netchange', () => {

src/platforms/app-plus/service/api/plugin/on-native-event-receive.js

@@ -10,6 +10,10 @@ UniServiceJSBridge.on('api.uniMPNativeEvent', function (res) {
   })
 })
 
+export function onHostEventReceive (callbackId) {
+  callbacks.push(callbackId)
+}
+
 export function onNativeEventReceive (callbackId) {
   callbacks.push(callbackId)
 }