Merge branch 'dev' into alpha

src/platforms/app-plus/service/api/device/get-app-authorize-setting.js

@@ -5,5 +5,12 @@ export function getAppAuthorizeSetting () {
     if (typeof appAuthorizeSetting === 'string') { appAuthorizeSetting = JSON.parse(appAuthorizeSetting) }
   } catch (error) { }
 
+  for (const key in appAuthorizeSetting) {
+    if (Object.hasOwnProperty.call(appAuthorizeSetting, key)) {
+      const value = appAuthorizeSetting[key]
+      if (value === 'undefined') appAuthorizeSetting[key] = undefined
+    }
+  }
+
   return appAuthorizeSetting
 }

src/platforms/app-plus/service/api/plugin/push.js

-import {
-  hasOwn
-} from 'uni-shared'
 import {
   invoke,
   publish
@@ -72,11 +69,6 @@ export function offPush (params) {
 
 export function createPushMessage (params, callbackId) {
   const setting = getAppAuthorizeSetting()
-  if (!hasOwn(setting, 'notificationAuthorized')) {
-    return invoke(callbackId, {
-      errMsg: 'createPushMessage:fail missing push module'
-    })
-  }
   if (setting.notificationAuthorized !== 'authorized') {
     return invoke(callbackId, {
       errMsg: 'createPushMessage:fail ' + setting.notificationAuthorized

src/platforms/mp-weixin/helpers/get-app-authorize-setting.js

+export default {
+  returnValue: function (result) {
+    const { locationReducedAccuracy } = result
+
+    result.locationAccuracy = 'unsupported'
+    if (locationReducedAccuracy === true) {
+      result.locationAccuracy = 'reduced'
+    } else if (locationReducedAccuracy === false) {
+      result.locationAccuracy = 'full'
+    }
+  }
+}

src/platforms/mp-weixin/runtime/api/protocols.js

@@ -6,6 +6,7 @@ import showActionSheet from '../../helpers/show-action-sheet'
 import getAppBaseInfo from '../../helpers/get-app-base-info'
 import getDeviceInfo from '../../helpers/get-device-info'
 import getWindowInfo from '../../helpers/get-window-info'
+import getAppAuthorizeSetting from '../../helpers/get-app-authorize-setting'
 
 export const protocols = {
   redirectTo,
@@ -16,7 +17,8 @@ export const protocols = {
   showActionSheet,
   getAppBaseInfo,
   getDeviceInfo,
-  getWindowInfo
+  getWindowInfo,
+  getAppAuthorizeSetting
 }
 export const todos = [
   'vibrate',