From 2b78a85b0e65f22b7543b9bdb38f8be09ae105a9 Mon Sep 17 00:00:00 2001 From: qiang Date: Sat, 9 Nov 2019 13:07:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E9=A1=B5=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/api/device/scan-code-webview.js | 28 ++++---- .../service/api/device/scan-code-weex.js | 17 ++--- .../api/location/choose-location-webview.js | 65 ++++++++++--------- .../api/location/choose-location-weex.js | 17 ++--- 4 files changed, 65 insertions(+), 62 deletions(-) diff --git a/src/platforms/app-plus/service/api/device/scan-code-webview.js b/src/platforms/app-plus/service/api/device/scan-code-webview.js index 8b5682d22..a5455e722 100644 --- a/src/platforms/app-plus/service/api/device/scan-code-webview.js +++ b/src/platforms/app-plus/service/api/device/scan-code-webview.js @@ -12,7 +12,7 @@ import { } from '../../constants' import { - registerPlusMessage, + registerPlusMessage, consumePlusMessage } from '../../framework/plus-message' @@ -89,19 +89,19 @@ export function scanCode ({ const buttons = [] if (!onlyFromCamera) { buttons.push({ - 'float': 'right', - 'text': '相册', - 'fontSize': '17px', - 'width': '60px', - 'onclick': function () { + float: 'right', + text: '相册', + fontSize: '17px', + width: '60px', + onclick: function () { plus.gallery.pick(file => { barcode.scan(file, (type, code) => { if (isDark) { plus.navigator.setStatusBarStyle('isDark') - } - result = { - type, - code + } + result = { + type, + code } webview.close('auto') }, () => { @@ -152,10 +152,10 @@ export function scanCode ({ path: '', errMsg: 'scanCode:ok' }) - } else { - invoke(callbackId, { - errMsg: 'scanCode:fail cancel' - }) + } else { + invoke(callbackId, { + errMsg: 'scanCode:fail cancel' + }) } consumePlusMessage(MESSAGE_TYPE) }) diff --git a/src/platforms/app-plus/service/api/device/scan-code-weex.js b/src/platforms/app-plus/service/api/device/scan-code-weex.js index dca381c41..e734efebf 100644 --- a/src/platforms/app-plus/service/api/device/scan-code-weex.js +++ b/src/platforms/app-plus/service/api/device/scan-code-weex.js @@ -6,14 +6,14 @@ import { showPage } from '../page.js' -function getStatusBarStyle () { - let style = plus.navigator.getStatusBarStyle() - if (style === 'UIStatusBarStyleBlackTranslucent' || style === 'UIStatusBarStyleBlackOpaque' || style === 'null') { - style = 'light' - } else if (style === 'UIStatusBarStyleDefault') { - style = 'dark' - } - return style +function getStatusBarStyle () { + let style = plus.navigator.getStatusBarStyle() + if (style === 'UIStatusBarStyleBlackTranslucent' || style === 'UIStatusBarStyleBlackOpaque' || style === 'null') { + style = 'light' + } else if (style === 'UIStatusBarStyleDefault') { + style = 'dark' + } + return style } export function scanCode (options, callbackId) { @@ -37,6 +37,7 @@ export function scanCode (options, callbackId) { buttons: !options.onlyFromCamera ? [{ text: options.albumText || '相册', fontSize: '17px', + width: '60px', onclick: () => { page.sendMessage({ type: 'gallery' diff --git a/src/platforms/app-plus/service/api/location/choose-location-webview.js b/src/platforms/app-plus/service/api/location/choose-location-webview.js index b1920803d..57f340570 100644 --- a/src/platforms/app-plus/service/api/location/choose-location-webview.js +++ b/src/platforms/app-plus/service/api/location/choose-location-webview.js @@ -11,12 +11,12 @@ import { } from '../../constants' import { - registerPlusMessage, + registerPlusMessage, consumePlusMessage } from '../../framework/plus-message' -const CHOOSE_LOCATION_PATH = '_www/__uniappchooselocation.html' - +const CHOOSE_LOCATION_PATH = '_www/__uniappchooselocation.html' + const MESSAGE_TYPE = 'chooseLocation' export function chooseLocation (params, callbackId) { @@ -34,6 +34,7 @@ export function chooseLocation (params, callbackId) { float: 'right', text: '完成', fontSize: '17px', + width: '60px', onclick: function () { webview.evalJS('__chooseLocationConfirm__()') } @@ -59,39 +60,39 @@ export function chooseLocation (params, callbackId) { plus.navigator.setStatusBarStyle('light') } }) - } - let index = 0 - let onShow = function () { - index++ - if (index === 2) { - webview.evalJS(`__chooseLocation__(${JSON.stringify(params)})`) - } + } + 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) - - let result - - webview.addEventListener('close', () => { - if (result) { - invoke(callbackId, { - name: result.poiname, - address: result.poiaddress, - latitude: result.latlng.lat, - longitude: result.latlng.lng, - errMsg: 'chooseLocation:ok' - }) - } else { - consumePlusMessage(MESSAGE_TYPE) - invoke(callbackId, { - errMsg: 'chooseLocation:fail cancel' - }) - } - }) + webview.show('slide-in-bottom', ANI_DURATION, onShow) + + let result + + webview.addEventListener('close', () => { + if (result) { + invoke(callbackId, { + name: result.poiname, + address: result.poiaddress, + latitude: result.latlng.lat, + longitude: result.latlng.lng, + errMsg: 'chooseLocation:ok' + }) + } else { + consumePlusMessage(MESSAGE_TYPE) + invoke(callbackId, { + errMsg: 'chooseLocation:fail cancel' + }) + } + }) registerPlusMessage(MESSAGE_TYPE, function (res) { - if (res && 'latlng' in res) { - result = res + if (res && 'latlng' in res) { + result = res } }, false) } diff --git a/src/platforms/app-plus/service/api/location/choose-location-weex.js b/src/platforms/app-plus/service/api/location/choose-location-weex.js index dff7fa507..2c2f30da1 100644 --- a/src/platforms/app-plus/service/api/location/choose-location-weex.js +++ b/src/platforms/app-plus/service/api/location/choose-location-weex.js @@ -6,14 +6,14 @@ import { showPage } from '../page.js' -function getStatusBarStyle () { - let style = plus.navigator.getStatusBarStyle() - if (style === 'UIStatusBarStyleBlackTranslucent' || style === 'UIStatusBarStyleBlackOpaque' || style === 'null') { - style = 'light' - } else if (style === 'UIStatusBarStyleDefault') { - style = 'dark' - } - return style +function getStatusBarStyle () { + let style = plus.navigator.getStatusBarStyle() + if (style === 'UIStatusBarStyleBlackTranslucent' || style === 'UIStatusBarStyleBlackOpaque' || style === 'null') { + style = 'light' + } else if (style === 'UIStatusBarStyleDefault') { + style = 'dark' + } + return style } export function chooseLocation (options, callbackId) { @@ -44,6 +44,7 @@ export function chooseLocation (options, callbackId) { }, { text: options.doneText || '完成', fontSize: '17px', + width: '60px', onclick: () => { page.sendMessage({ type: 'done' -- GitLab