You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/04/27 07:19:16 UTC
[2/6] incubator-weex git commit: [android] remove static viewport
[android] remove static viewport
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a54f554e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a54f554e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a54f554e
Branch: refs/heads/0.12-dev
Commit: a54f554ed73d887ac3a4ca4db5f18c31d67fe4ce
Parents: 30b673e
Author: \u884c\u4e45 <yi...@alibaba-inc.com>
Authored: Thu Apr 27 14:54:57 2017 +0800
Committer: \u884c\u4e45 <yi...@alibaba-inc.com>
Committed: Thu Apr 27 14:54:57 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/dom/WXDomObject.java | 24 ++---
.../main/java/com/taobao/weex/dom/WXStyle.java | 103 ++++++++++++++++++-
.../java/com/taobao/weex/utils/WXUtils.java | 18 +---
3 files changed, 115 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a54f554e/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index 82b619d..641c95a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -493,46 +493,46 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject
setMargin(Spacing.ALL, WXViewUtils.getRealPxByWidth(stylesMap.getMargin(vp), vp));
break;
case Constants.Name.MARGIN_LEFT:
- setMargin(Spacing.LEFT, WXViewUtils.getRealPxByWidth(stylesMap.getMarginLeft(),getViewPortWidth()));
+ setMargin(Spacing.LEFT, WXViewUtils.getRealPxByWidth(stylesMap.getMarginLeft(vp), vp));
break;
case Constants.Name.MARGIN_TOP:
- setMargin(Spacing.TOP, WXViewUtils.getRealPxByWidth(stylesMap.getMarginTop(),getViewPortWidth()));
+ setMargin(Spacing.TOP, WXViewUtils.getRealPxByWidth(stylesMap.getMarginTop(vp), vp));
break;
case Constants.Name.MARGIN_RIGHT:
- setMargin(Spacing.RIGHT, WXViewUtils.getRealPxByWidth(stylesMap.getMarginRight(),getViewPortWidth()));
+ setMargin(Spacing.RIGHT, WXViewUtils.getRealPxByWidth(stylesMap.getMarginRight(vp), vp));
break;
case Constants.Name.MARGIN_BOTTOM:
- setMargin(Spacing.BOTTOM, WXViewUtils.getRealPxByWidth(stylesMap.getMarginBottom(),getViewPortWidth()));
+ setMargin(Spacing.BOTTOM, WXViewUtils.getRealPxByWidth(stylesMap.getMarginBottom(vp), vp));
break;
case Constants.Name.BORDER_WIDTH:
setBorder(Spacing.ALL, WXViewUtils.getRealPxByWidth(stylesMap.getBorderWidth(vp), vp));
break;
case Constants.Name.BORDER_TOP_WIDTH:
- setBorder(Spacing.TOP, WXViewUtils.getRealPxByWidth(stylesMap.getBorderTopWidth(),getViewPortWidth()));
+ setBorder(Spacing.TOP, WXViewUtils.getRealPxByWidth(stylesMap.getBorderTopWidth(vp), vp));
break;
case Constants.Name.BORDER_RIGHT_WIDTH:
- setBorder(Spacing.RIGHT, WXViewUtils.getRealPxByWidth(stylesMap.getBorderRightWidth(),getViewPortWidth()));
+ setBorder(Spacing.RIGHT, WXViewUtils.getRealPxByWidth(stylesMap.getBorderRightWidth(vp), vp));
break;
case Constants.Name.BORDER_BOTTOM_WIDTH:
- setBorder(Spacing.BOTTOM, WXViewUtils.getRealPxByWidth(stylesMap.getBorderBottomWidth(),getViewPortWidth()));
+ setBorder(Spacing.BOTTOM, WXViewUtils.getRealPxByWidth(stylesMap.getBorderBottomWidth(vp), vp));
break;
case Constants.Name.BORDER_LEFT_WIDTH:
- setBorder(Spacing.LEFT, WXViewUtils.getRealPxByWidth(stylesMap.getBorderLeftWidth(),getViewPortWidth()));
+ setBorder(Spacing.LEFT, WXViewUtils.getRealPxByWidth(stylesMap.getBorderLeftWidth(vp), vp));
break;
case Constants.Name.PADDING:
setPadding(Spacing.ALL, WXViewUtils.getRealPxByWidth(stylesMap.getPadding(vp), vp));
break;
case Constants.Name.PADDING_LEFT:
- setPadding(Spacing.LEFT, WXViewUtils.getRealPxByWidth(stylesMap.getPaddingLeft(),getViewPortWidth()));
+ setPadding(Spacing.LEFT, WXViewUtils.getRealPxByWidth(stylesMap.getPaddingLeft(vp), vp));
break;
case Constants.Name.PADDING_TOP:
- setPadding(Spacing.TOP, WXViewUtils.getRealPxByWidth(stylesMap.getPaddingTop(),getViewPortWidth()));
+ setPadding(Spacing.TOP, WXViewUtils.getRealPxByWidth(stylesMap.getPaddingTop(vp), vp));
break;
case Constants.Name.PADDING_RIGHT:
- setPadding(Spacing.RIGHT, WXViewUtils.getRealPxByWidth(stylesMap.getPaddingRight(),getViewPortWidth()));
+ setPadding(Spacing.RIGHT, WXViewUtils.getRealPxByWidth(stylesMap.getPaddingRight(vp), vp));
break;
case Constants.Name.PADDING_BOTTOM:
- setPadding(Spacing.BOTTOM, WXViewUtils.getRealPxByWidth(stylesMap.getPaddingBottom(),getViewPortWidth()));
+ setPadding(Spacing.BOTTOM, WXViewUtils.getRealPxByWidth(stylesMap.getPaddingBottom(vp), vp));
break;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a54f554e/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
index 8f04f88..b7cfa46 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
@@ -311,10 +311,6 @@ public class WXStyle implements Map<String, Object>,Cloneable {
return temp;
}
- public float getBorderTopWidth() {
- return getBorderWidth(Constants.Name.BORDER_TOP_WIDTH);
- }
-
private float getBorderWidth(String key) {
float temp = WXUtils.getFloat(get(key));
if (WXUtils.isUndefined(temp)) {
@@ -323,6 +319,13 @@ public class WXStyle implements Map<String, Object>,Cloneable {
return temp;
}
+ private float getBorderWidth(String key, int viewport) {
+ float temp = WXUtils.getFloatByViewport(get(key), viewport);
+ if (WXUtils.isUndefined(temp)) {
+ return getBorderWidth(viewport);
+ }
+ return temp;
+ }
//TODO fix : only when set backgroundColor
@Deprecated
public float getBorderWidth() {
@@ -337,6 +340,10 @@ public class WXStyle implements Map<String, Object>,Cloneable {
return getBorderWidth(Constants.Name.BORDER_RIGHT_WIDTH);
}
+ public float getBorderTopWidth() {
+ return getBorderWidth(Constants.Name.BORDER_TOP_WIDTH);
+ }
+
public float getBorderBottomWidth() {
return getBorderWidth(Constants.Name.BORDER_BOTTOM_WIDTH);
}
@@ -345,6 +352,23 @@ public class WXStyle implements Map<String, Object>,Cloneable {
return getBorderWidth(Constants.Name.BORDER_LEFT_WIDTH);
}
+
+ public float getBorderRightWidth(int viewport) {
+ return getBorderWidth(Constants.Name.BORDER_RIGHT_WIDTH, viewport);
+ }
+
+ public float getBorderTopWidth(int viewport) {
+ return getBorderWidth(Constants.Name.BORDER_TOP_WIDTH, viewport);
+ }
+
+ public float getBorderBottomWidth(int viewport) {
+ return getBorderWidth(Constants.Name.BORDER_BOTTOM_WIDTH, viewport);
+ }
+
+ public float getBorderLeftWidth(int viewport) {
+ return getBorderWidth(Constants.Name.BORDER_LEFT_WIDTH, viewport);
+ }
+
public String getBorderColor() {
Object color = get(Constants.Name.BORDER_COLOR);
return color == null ? null : color.toString();
@@ -409,6 +433,41 @@ public class WXStyle implements Map<String, Object>,Cloneable {
}
/*
+ * margin
+ **/
+ public float getMarginTop(int viewport) {
+ float temp = WXUtils.getFloatByViewport(get(Constants.Name.MARGIN_TOP), viewport);
+ if (WXUtils.isUndefined(temp)) {
+ temp = WXUtils.getFloatByViewport(get(Constants.Name.MARGIN), viewport);
+ }
+ return temp;
+ }
+
+ public float getMarginLeft(int viewport) {
+ float temp = WXUtils.getFloatByViewport(get(Constants.Name.MARGIN_LEFT), viewport);
+ if (WXUtils.isUndefined(temp)) {
+ temp = WXUtils.getFloatByViewport(get(Constants.Name.MARGIN), viewport);
+ }
+ return temp;
+ }
+
+ public float getMarginRight(int viewport) {
+ float temp = WXUtils.getFloatByViewport(get(Constants.Name.MARGIN_RIGHT), viewport);
+ if (WXUtils.isUndefined(temp)) {
+ temp = WXUtils.getFloatByViewport(get(Constants.Name.MARGIN), viewport);
+ }
+ return temp;
+ }
+
+ public float getMarginBottom(int viewport) {
+ float temp = WXUtils.getFloatByViewport(get(Constants.Name.MARGIN_BOTTOM), viewport);
+ if (WXUtils.isUndefined(temp)) {
+ temp = WXUtils.getFloatByViewport(get(Constants.Name.MARGIN), viewport);
+ }
+ return temp;
+ }
+
+ /*
* padding
**/
public float getPaddingTop() {
@@ -443,6 +502,42 @@ public class WXStyle implements Map<String, Object>,Cloneable {
return temp;
}
+
+ /*
+ * padding
+ **/
+ public float getPaddingTop(int viewport) {
+ float temp = WXUtils.getFloatByViewport(get(Constants.Name.PADDING_TOP), viewport);
+ if (WXUtils.isUndefined(temp)) {
+ temp = WXUtils.getFloatByViewport(get(Constants.Name.PADDING), viewport);
+ }
+ return temp;
+ }
+
+ public float getPaddingLeft(int viewport) {
+ float temp = WXUtils.getFloatByViewport(get(Constants.Name.PADDING_LEFT), viewport);
+ if (WXUtils.isUndefined(temp)) {
+ temp = WXUtils.getFloatByViewport(get(Constants.Name.PADDING), viewport);
+ }
+ return temp;
+ }
+
+ public float getPaddingRight(int viewport) {
+ float temp = WXUtils.getFloatByViewport(get(Constants.Name.PADDING_RIGHT), viewport);
+ if (WXUtils.isUndefined(temp)) {
+ temp = WXUtils.getFloatByViewport(get(Constants.Name.PADDING), viewport);
+ }
+ return temp;
+ }
+
+ public float getPaddingBottom(int viewport) {
+ float temp = WXUtils.getFloatByViewport(get(Constants.Name.PADDING_BOTTOM), viewport);
+ if (WXUtils.isUndefined(temp)) {
+ temp = WXUtils.getFloatByViewport(get(Constants.Name.PADDING), viewport);
+ }
+ return temp;
+ }
+
/*
* position
**/
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a54f554e/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
index 11014ad..172b00a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
@@ -93,7 +93,7 @@ public class WXUtils {
String temp = value.toString().trim();
if (temp.endsWith("wx")) {
try {
- return transferWx(temp);
+ return transferWx(temp, 750);
} catch (NumberFormatException e) {
WXLogUtils.e("Argument format error! value is " + value, e);
} catch (Exception e) {
@@ -133,16 +133,6 @@ public class WXUtils {
return density * f * viewport / WXViewUtils.getScreenWidth();
}
- /**
- * @use transferWx(String stringWithWXPostfix, int viewport)
- * @param stringWithWXPostfix
- * @return
- */
- @Deprecated
- private static float transferWx(String stringWithWXPostfix) {
- return transferWx(stringWithWXPostfix, WXSDKInstance.getViewPortWidth());
- }
-
public static float fastGetFloat(String raw, int precision){
if(!TextUtils.isEmpty(raw)){
boolean positive=true;
@@ -218,7 +208,7 @@ public class WXUtils {
WXLogUtils.w("the value of " + value + " use wx unit, which will be not supported soon after.");
}
try {
- return (int) transferWx(temp);
+ return (int) transferWx(temp, 750);
} catch (NumberFormatException e) {
WXLogUtils.e("Argument format error! value is " + value, e);
} catch (Exception e) {
@@ -264,7 +254,7 @@ public class WXUtils {
WXLogUtils.w("the value of " + value + " use wx unit, which will be not supported soon after.");
}
try {
- return (long)transferWx(temp);
+ return (long)transferWx(temp, 750);
} catch (NumberFormatException e) {
WXLogUtils.e("Argument format error! value is " + value, e);
} catch (Exception e) {
@@ -308,7 +298,7 @@ public class WXUtils {
WXLogUtils.w("the value of " + value + " use wx unit, which will be not supported soon after.");
}
try {
- return transferWx(temp);
+ return transferWx(temp, 750);
} catch (NumberFormatException e) {
WXLogUtils.e("Argument format error! value is " + value, e);
} catch (Exception e) {