fix: 解决纯 nvue 环境 uni.scanCode、uni.chooseLocation 回调不执行的 Bug

src/platforms/app-plus/service/api/device/scan-code.js

@@ -12,7 +12,8 @@ import {
 } from '../../constants'
 
 import {
-  registerPlusMessage
+  registerPlusMessage,
+  consumePlusMessage
 } from '../../framework/plus-message'
 
 export const SCAN_ID = '__UNIAPP_SCAN'
@@ -98,11 +99,11 @@ export function scanCode ({
             if (isDark) {
               plus.navigator.setStatusBarStyle('isDark')
             }
-            webview.close('auto')
             result = {
               type,
               code
             }
+            webview.close('auto')
           }, () => {
             plus.nativeUI.toast('识别失败')
           }, filters)
@@ -143,7 +144,7 @@ export function scanCode ({
     })
   })
   webview.addEventListener('close', () => {
-    if (result && 'code' in result) {
+    if (result) {
       invoke(callbackId, {
         result: result.code,
         scanType: SCAN_MAPS[result.type] || '',
@@ -156,6 +157,7 @@ export function scanCode ({
         errMsg: 'scanCode:fail cancel'
       })
     }
+    consumePlusMessage(MESSAGE_TYPE)
   })
   if (isDark) { // 状态栏前景色
     plus.navigator.setStatusBarStyle('light')
@@ -170,15 +172,10 @@ export function scanCode ({
       }
     })
   }
-  // fixed by hxy 注册扫码事件
+
   registerPlusMessage(MESSAGE_TYPE, function (res) {
-    if (res && !res.errMsg) {
+    if (res && 'code' in res) {
       result = res
-    } else {
-      const errMsg = res && res.errMsg ? ' ' + res.errMsg : ''
-      result = {
-        errMsg: 'scanCode:fail' + errMsg
-      }
     }
   }, false)
 }

src/platforms/app-plus/service/api/location/choose-location.js

@@ -11,11 +11,14 @@ import {
 } from '../../constants'
 
 import {
-  registerPlusMessage
+  registerPlusMessage,
+  consumePlusMessage
 } from '../../framework/plus-message'
 
 const CHOOSE_LOCATION_PATH = '_www/__uniappchooselocation.html'
 
+const MESSAGE_TYPE = 'chooseLocation'
+
 export function chooseLocation (params, callbackId) {
   const statusBarStyle = plus.navigator.getStatusBarStyle()
   const webview = plus.webview.create(
@@ -57,26 +60,38 @@ export function chooseLocation (params, callbackId) {
       }
     })
   }
-
-  webview.show('slide-in-bottom', ANI_DURATION, () => {
+  let index = 0
+  let onShow = function () {
+    index++
+    if (index === 2) {
       webview.evalJS(`__chooseLocation__(${JSON.stringify(params)})`)
-  })
+    }
+  }
+  webview.addEventListener('loaded', onShow)
+  webview.show('slide-in-bottom', ANI_DURATION, onShow)
 
-  // fixed by hxy
-  registerPlusMessage('chooseLocation', function (res) {
-    if (res && !res.errMsg) {
+  let result
+
+  webview.addEventListener('close', () => {
+    if (result) {
       invoke(callbackId, {
-        name: res.poiname,
-        address: res.poiaddress,
-        latitude: res.latlng.lat,
-        longitude: res.latlng.lng,
+        name: result.poiname,
+        address: result.poiaddress,
+        latitude: result.latlng.lat,
+        longitude: result.latlng.lng,
         errMsg: 'chooseLocation:ok'
       })
     } else {
-      const errMsg = res && res.errMsg ? ' ' + res.errMsg : ''
+      consumePlusMessage(MESSAGE_TYPE)
       invoke(callbackId, {
-        errMsg: 'chooseLocation:fail' + errMsg
+        errMsg: 'chooseLocation:fail cancel'
+      })
+    }
   })
+
+  registerPlusMessage(MESSAGE_TYPE, function (res) {
+    if (res && 'latlng' in res) {
+      result = res
     }
   }, false)
 }

src/platforms/app-plus/service/framework/app.js

@@ -9,7 +9,8 @@ import {
 } from './page'
 
 import {
-  registerPlusMessage
+  registerPlusMessage,
+  consumePlusMessage
 } from './plus-message'
 
 import {
@@ -69,6 +70,16 @@ function initGlobalListeners () {
       height: event.height
     })
   })
+
+  plus.globalEvent.addEventListener('plusMessage', function (e) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.log('UNIAPP[plusMessage]:[' + Date.now() + ']' + JSON.stringify(e.data))
+    }
+    if (e.data && e.data.type) {
+      const type = e.data.type
+      consumePlusMessage(type, e.data.args || {})
+    }
+  })
 }
 
 function initAppLaunch (appVm) {