From f7fc7418047a07700d38bbebddf2b4dc42d67a65 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Mon, 28 Jan 2019 14:41:58 +0800 Subject: [PATCH] build mp-alipay,mp-baidu,mp-toutiao,mp-weixin --- packages/uni-mp-alipay/dist/index.js | 27 ++++++++++++++++----------- packages/uni-mp-alipay/package.json | 2 +- packages/uni-mp-baidu/dist/index.js | 27 ++++++++++++++++----------- packages/uni-mp-baidu/package.json | 2 +- packages/uni-mp-toutiao/dist/index.js | 27 ++++++++++++++++----------- packages/uni-mp-toutiao/package.json | 2 +- packages/uni-mp-weixin/dist/index.js | 23 +++++++++++++---------- packages/uni-mp-weixin/package.json | 2 +- src/core/runtime/upx2px.js | 23 +++++++++++++---------- 9 files changed, 78 insertions(+), 57 deletions(-) diff --git a/packages/uni-mp-alipay/dist/index.js b/packages/uni-mp-alipay/dist/index.js index 996ca20e..bc2fe38b 100644 --- a/packages/uni-mp-alipay/dist/index.js +++ b/packages/uni-mp-alipay/dist/index.js @@ -105,16 +105,19 @@ function upx2px (number, newDeviceWidth) { if (number === 0) { return 0 } - number = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); - number = Math.floor(number + EPS); - if (number === 0) { - if (deviceDPR === 1 || !isIOS) { - return 1 - } else { - return 0.5 - } - } - return number + let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + if (result < 0) { + result = -result; + } + result = Math.floor(result + EPS); + if (result === 0) { + if (deviceDPR === 1 || !isIOS) { + return 1 + } else { + return 0.5 + } + } + return number < 0 ? -result : result } // 不支持的 API 列表 @@ -159,7 +162,9 @@ const TODOS = [ 'getUpdateManager', 'setEnableDebug', 'getExtConfig', - 'getExtConfigSync' + 'getExtConfigSync', + 'onWindowResize', + 'offWindowResize' ]; function _handleNetworkInfo (result) { diff --git a/packages/uni-mp-alipay/package.json b/packages/uni-mp-alipay/package.json index e0631ab2..1aa3d71d 100644 --- a/packages/uni-mp-alipay/package.json +++ b/packages/uni-mp-alipay/package.json @@ -1,6 +1,6 @@ { "name": "@dcloudio/uni-mp-alipay", - "version": "0.0.7", + "version": "0.0.8", "description": "uni-app mp-alipay", "main": "dist/index.js", "scripts": { diff --git a/packages/uni-mp-baidu/dist/index.js b/packages/uni-mp-baidu/dist/index.js index 0b391144..f9ef198e 100644 --- a/packages/uni-mp-baidu/dist/index.js +++ b/packages/uni-mp-baidu/dist/index.js @@ -105,16 +105,19 @@ function upx2px (number, newDeviceWidth) { if (number === 0) { return 0 } - number = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); - number = Math.floor(number + EPS); - if (number === 0) { - if (deviceDPR === 1 || !isIOS) { - return 1 - } else { - return 0.5 - } - } - return number + let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + if (result < 0) { + result = -result; + } + result = Math.floor(result + EPS); + if (result === 0) { + if (deviceDPR === 1 || !isIOS) { + return 1 + } else { + return 0.5 + } + } + return number < 0 ? -result : result } // 不支持的 API 列表 @@ -146,7 +149,9 @@ const TODOS = [ 'getBeacons', 'startBeaconDiscovery', 'stopBeaconDiscovery', - 'hideShareMenu' + 'hideShareMenu', + 'onWindowResize', + 'offWindowResize' ]; function createTodoMethod (contextName, methodName) { diff --git a/packages/uni-mp-baidu/package.json b/packages/uni-mp-baidu/package.json index 38039c09..cd9eb48b 100644 --- a/packages/uni-mp-baidu/package.json +++ b/packages/uni-mp-baidu/package.json @@ -1,6 +1,6 @@ { "name": "@dcloudio/uni-mp-baidu", - "version": "0.0.6", + "version": "0.0.7", "description": "uni-app mp-baidu", "main": "dist/index.js", "scripts": { diff --git a/packages/uni-mp-toutiao/dist/index.js b/packages/uni-mp-toutiao/dist/index.js index f8bb1d92..e6da7098 100644 --- a/packages/uni-mp-toutiao/dist/index.js +++ b/packages/uni-mp-toutiao/dist/index.js @@ -105,16 +105,19 @@ function upx2px (number, newDeviceWidth) { if (number === 0) { return 0 } - number = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); - number = Math.floor(number + EPS); - if (number === 0) { - if (deviceDPR === 1 || !isIOS) { - return 1 - } else { - return 0.5 - } - } - return number + let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + if (result < 0) { + result = -result; + } + result = Math.floor(result + EPS); + if (result === 0) { + if (deviceDPR === 1 || !isIOS) { + return 1 + } else { + return 0.5 + } + } + return number < 0 ? -result : result } // 不支持的 API 列表 @@ -195,7 +198,9 @@ const TODOS = [ 'sendTemplateMessage', 'setEnableDebug', 'getExtConfig', - 'getExtConfigSync' + 'getExtConfigSync', + 'onWindowResize', + 'offWindowResize' ]; // 需要做转换的 API 列表 diff --git a/packages/uni-mp-toutiao/package.json b/packages/uni-mp-toutiao/package.json index 559c32ff..599df7c6 100644 --- a/packages/uni-mp-toutiao/package.json +++ b/packages/uni-mp-toutiao/package.json @@ -1,6 +1,6 @@ { "name": "@dcloudio/uni-mp-toutiao", - "version": "0.0.2", + "version": "0.0.3", "description": "uni-app mp-toutiao", "main": "dist/index.js", "scripts": { diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js index fd8a5cc0..91818c62 100644 --- a/packages/uni-mp-weixin/dist/index.js +++ b/packages/uni-mp-weixin/dist/index.js @@ -105,16 +105,19 @@ function upx2px (number, newDeviceWidth) { if (number === 0) { return 0 } - number = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); - number = Math.floor(number + EPS); - if (number === 0) { - if (deviceDPR === 1 || !isIOS) { - return 1 - } else { - return 0.5 - } - } - return number + let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + if (result < 0) { + result = -result; + } + result = Math.floor(result + EPS); + if (result === 0) { + if (deviceDPR === 1 || !isIOS) { + return 1 + } else { + return 0.5 + } + } + return number < 0 ? -result : result } var protocols = {}; diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json index 541be565..0240b2bd 100644 --- a/packages/uni-mp-weixin/package.json +++ b/packages/uni-mp-weixin/package.json @@ -1,6 +1,6 @@ { "name": "@dcloudio/uni-mp-weixin", - "version": "0.0.4", + "version": "0.0.5", "description": "uni-app mp-weixin", "main": "dist/index.js", "scripts": { diff --git a/src/core/runtime/upx2px.js b/src/core/runtime/upx2px.js index 38785161..6cb2e2c1 100644 --- a/src/core/runtime/upx2px.js +++ b/src/core/runtime/upx2px.js @@ -25,14 +25,17 @@ export function upx2px (number, newDeviceWidth) { if (number === 0) { return 0 } - number = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth) - number = Math.floor(number + EPS) - if (number === 0) { - if (deviceDPR === 1 || !isIOS) { - return 1 - } else { - return 0.5 - } - } - return number + let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth) + if (result < 0) { + result = -result + } + result = Math.floor(result + EPS) + if (result === 0) { + if (deviceDPR === 1 || !isIOS) { + return 1 + } else { + return 0.5 + } + } + return number < 0 ? -result : result } -- GitLab