diff --git a/packages/uni-mp-alipay/dist/index.js b/packages/uni-mp-alipay/dist/index.js index 996ca20ed6b709384adea3adb43fb872e032defd..bc2fe38b7476515a977484e31a8b0e82aca69f32 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 e0631ab229ac3b6689279c3fe8dc09e8162a87eb..1aa3d71de9da2b1cb8041f8d51620a0a9307c52f 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 0b3911448484844b3c59a776030731646cac0c3c..f9ef198ed73306dc64e36e67ceefd773035a934d 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 38039c09cc572c241158c0ab8dafe1fde8ca9d80..cd9eb48b955e14968d240f560b5e7a2b45df2bbe 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 f8bb1d928c2c3f5db49208e9cf60181a1d8b0a1b..e6da70983ab84bf521e6f13ad6d730aecd3be2fd 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 559c32ffea71593e1b22db005e3007623c9b99ba..599df7c6ecc824601274055cc5a9d89ed9b49b59 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 fd8a5cc0cdfc872e317b400995e004c55f4c7393..91818c629cd307cbbc7581c9c67ef4e474d6e617 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 541be565a3965a4f375a7805c4f7f496026e2f42..0240b2bd3db9d2358bb64c9c208d1497da35ee91 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 38785161d9846ed28800966eaa6319159708ef99..6cb2e2c1fd4f250397512966cf908d810783aec2 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 }