Skip to content

Commit

Permalink
build mp-alipay,mp-baidu,mp-toutiao,mp-weixin
Browse files Browse the repository at this point in the history
  • Loading branch information
fxy060608 committed Jan 28, 2019
1 parent 9947a97 commit f7fc741
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 57 deletions.
27 changes: 16 additions & 11 deletions packages/uni-mp-alipay/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 列表
Expand Down Expand Up @@ -159,7 +162,9 @@ const TODOS = [
'getUpdateManager',
'setEnableDebug',
'getExtConfig',
'getExtConfigSync'
'getExtConfigSync',
'onWindowResize',
'offWindowResize'
];

function _handleNetworkInfo (result) {
Expand Down
2 changes: 1 addition & 1 deletion packages/uni-mp-alipay/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
27 changes: 16 additions & 11 deletions packages/uni-mp-baidu/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 列表
Expand Down Expand Up @@ -146,7 +149,9 @@ const TODOS = [
'getBeacons',
'startBeaconDiscovery',
'stopBeaconDiscovery',
'hideShareMenu'
'hideShareMenu',
'onWindowResize',
'offWindowResize'
];

function createTodoMethod (contextName, methodName) {
Expand Down
2 changes: 1 addition & 1 deletion packages/uni-mp-baidu/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
27 changes: 16 additions & 11 deletions packages/uni-mp-toutiao/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 列表
Expand Down Expand Up @@ -195,7 +198,9 @@ const TODOS = [
'sendTemplateMessage',
'setEnableDebug',
'getExtConfig',
'getExtConfigSync'
'getExtConfigSync',
'onWindowResize',
'offWindowResize'
];

// 需要做转换的 API 列表
Expand Down
2 changes: 1 addition & 1 deletion packages/uni-mp-toutiao/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
23 changes: 13 additions & 10 deletions packages/uni-mp-weixin/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand Down
2 changes: 1 addition & 1 deletion packages/uni-mp-weixin/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
23 changes: 13 additions & 10 deletions src/core/runtime/upx2px.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

0 comments on commit f7fc741

Please sign in to comment.