You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/13 07:18:59 UTC
[2/6] incubator-weex git commit: * [android] deprecated static
viewport getter and setter
* [android] deprecated static viewport getter and setter
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fcfb32b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fcfb32b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fcfb32b2
Branch: refs/heads/0.11-dev
Commit: fcfb32b282a5fed07d83816c2566310993a135ba
Parents: f62aa47
Author: zshshr <zh...@gmail.com>
Authored: Fri Mar 10 17:05:07 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Fri Mar 10 17:05:07 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/WXSDKInstance.java | 10 +++++--
.../main/java/com/taobao/weex/WXSDKManager.java | 2 +-
.../java/com/taobao/weex/dom/WXDomModule.java | 2 +-
.../java/com/taobao/weex/dom/WXDomObject.java | 2 +-
.../com/taobao/weex/dom/WXDomStatement.java | 4 +--
.../com/taobao/weex/ui/WXRenderStatement.java | 12 ++++----
.../weex/ui/animation/WXAnimationModule.java | 2 +-
.../ui/component/AbstractEditComponent.java | 4 +--
.../taobao/weex/ui/component/WXComponent.java | 30 ++++++++++----------
.../com/taobao/weex/ui/component/WXEmbed.java | 4 +--
.../taobao/weex/ui/component/WXIndicator.java | 2 +-
.../weex/ui/component/WXSliderNeighbor.java | 7 +----
.../ui/component/list/BasicListComponent.java | 14 ++++-----
.../taobao/weex/ui/view/gesture/WXGesture.java | 8 +++---
.../taobao/weex/ui/module/WXMetaModuleTest.java | 10 +++----
15 files changed, 57 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 2a74939..b63a9d7 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -347,10 +347,12 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
/*
* store custom ViewPort Width
*/
+ @Deprecated
public void setViewPortWidth(int viewPortWidth) {
mViewPortWidth = viewPortWidth;
}
+ @Deprecated
public static int getViewPortWidth() {
return mViewPortWidth;
}
@@ -359,6 +361,10 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
this.mInstanceViewPortWidth = instanceViewPortWidth;
}
+ public int getInstanceViewPortWidth(){
+ return mInstanceViewPortWidth;
+ }
+
public interface OnInstanceVisibleListener{
void onAppear();
void onDisappear();
@@ -1323,8 +1329,8 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
if (width < 0 || height < 0 || isDestroy || !mRendered) {
return;
}
- float realWidth = WXViewUtils.getWebPxByWidth(width,getViewPortWidth());
- float realHeight = WXViewUtils.getWebPxByWidth(height,getViewPortWidth());
+ float realWidth = WXViewUtils.getWebPxByWidth(width,getInstanceViewPortWidth());
+ float realHeight = WXViewUtils.getWebPxByWidth(height,getInstanceViewPortWidth());
View godView = mRenderContainer;
if (godView != null) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
index bee15e6..7f9f6dc 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
@@ -208,7 +208,7 @@ public class WXSDKManager {
}
public static int getInstanceViewPortWidth(String instanceId){
- return getInstance().getSDKInstance(instanceId).getViewPortWidth();
+ return getInstance().getSDKInstance(instanceId).getInstanceViewPortWidth();
}
static void setInstance(WXSDKManager manager){
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
index d7067ad..046366c 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomModule.java
@@ -697,6 +697,6 @@ public final class WXDomModule extends WXModule {
@NonNull
private float getWebPxValue(int value) {
- return WXViewUtils.getWebPxByWidth(value,mWXSDKInstance.getViewPortWidth());
+ return WXViewUtils.getWebPxByWidth(value,mWXSDKInstance.getInstanceViewPortWidth());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/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 d622aac..b2fae6c 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -835,7 +835,7 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject
WXDomObject domObject = WXDomObjectFactory.newInstance(type);
- domObject.setViewPortWidth(wxsdkInstance.getViewPortWidth());
+ domObject.setViewPortWidth(wxsdkInstance.getInstanceViewPortWidth());
if(domObject == null){
return null;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/dom/WXDomStatement.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomStatement.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomStatement.java
index 4fd29be..36f2713 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomStatement.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomStatement.java
@@ -1156,7 +1156,7 @@ class WXDomStatement {
int width=(int)domObject.getLayoutWidth();
int height=(int)domObject.getLayoutHeight();
animationBean.styles.init(animationBean.styles.transformOrigin,
- animationBean.styles.transform,width,height,WXSDKManager.getInstance().getSDKInstance(mInstanceId).getViewPortWidth());
+ animationBean.styles.transform,width,height,WXSDKManager.getInstance().getSDKInstance(mInstanceId).getInstanceViewPortWidth());
}
return animationBean;
} catch (RuntimeException e) {
@@ -1176,7 +1176,7 @@ class WXDomStatement {
int width = (int) domObject.getLayoutWidth();
int height = (int) domObject.getLayoutHeight();
animationBean.styles = new WXAnimationBean.Style();
- animationBean.styles.init(transformOrigin, (String) transform, width, height,WXSDKManager.getInstance().getSDKInstance(mInstanceId).getViewPortWidth());
+ animationBean.styles.init(transformOrigin, (String) transform, width, height,WXSDKManager.getInstance().getSDKInstance(mInstanceId).getInstanceViewPortWidth());
return animationBean;
}
}catch (RuntimeException e){
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderStatement.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderStatement.java b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderStatement.java
index ee8d2bb..0e621c1 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderStatement.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderStatement.java
@@ -540,12 +540,12 @@ class WXRenderStatement {
if (component != null) {
Map<String, Float> size = new HashMap<>();
Rect sizes = component.getComponentSize();
- size.put("width", WXViewUtils.getWebPxByWidth(sizes.width(),mWXSDKInstance.getViewPortWidth()));
- size.put("height", WXViewUtils.getWebPxByWidth(sizes.height(),mWXSDKInstance.getViewPortWidth()));
- size.put("bottom",WXViewUtils.getWebPxByWidth(sizes.bottom,mWXSDKInstance.getViewPortWidth()));
- size.put("left",WXViewUtils.getWebPxByWidth(sizes.left,mWXSDKInstance.getViewPortWidth()));
- size.put("right",WXViewUtils.getWebPxByWidth(sizes.right,mWXSDKInstance.getViewPortWidth()));
- size.put("top",WXViewUtils.getWebPxByWidth(sizes.top,mWXSDKInstance.getViewPortWidth()));
+ size.put("width", WXViewUtils.getWebPxByWidth(sizes.width(),mWXSDKInstance.getInstanceViewPortWidth()));
+ size.put("height", WXViewUtils.getWebPxByWidth(sizes.height(),mWXSDKInstance.getInstanceViewPortWidth()));
+ size.put("bottom",WXViewUtils.getWebPxByWidth(sizes.bottom,mWXSDKInstance.getInstanceViewPortWidth()));
+ size.put("left",WXViewUtils.getWebPxByWidth(sizes.left,mWXSDKInstance.getInstanceViewPortWidth()));
+ size.put("right",WXViewUtils.getWebPxByWidth(sizes.right,mWXSDKInstance.getInstanceViewPortWidth()));
+ size.put("top",WXViewUtils.getWebPxByWidth(sizes.top,mWXSDKInstance.getInstanceViewPortWidth()));
options.put("size", size);
options.put("result", true);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java b/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
index e974633..9da8f4d 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
@@ -274,7 +274,7 @@ public class WXAnimationModule extends WXModule {
return;
}
try {
- Animator animator = createAnimator(animationBean, component.getHostView(),instance.getViewPortWidth());
+ Animator animator = createAnimator(animationBean, component.getHostView(),instance.getInstanceViewPortWidth());
if (animator != null) {
Animator.AnimatorListener animatorCallback = createAnimatorListener(instance, callback);
if(Build.VERSION.SDK_INT<Build.VERSION_CODES.JELLY_BEAN_MR2) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
index d2fb083..d9d99c6 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
@@ -327,7 +327,7 @@ public abstract class AbstractEditComponent extends WXComponent<WXEditText> {
editText.setHintTextColor(colorInt);
}
- editText.setTextSize(TypedValue.COMPLEX_UNIT_PX, WXStyle.getFontSize(getDomObject().getStyles(),getInstance().getViewPortWidth()));
+ editText.setTextSize(TypedValue.COMPLEX_UNIT_PX, WXStyle.getFontSize(getDomObject().getStyles(),getInstance().getInstanceViewPortWidth()));
editText.setText(getDomObject().getAttrs().optString(Constants.Name.VALUE));
}
@@ -627,7 +627,7 @@ public abstract class AbstractEditComponent extends WXComponent<WXEditText> {
@WXComponentProp(name = Constants.Name.FONT_SIZE)
public void setFontSize(String fontSize) {
if (getHostView() != null && fontSize != null ) {
- getHostView().setTextSize(TypedValue.COMPLEX_UNIT_PX, WXStyle.getFontSize(getDomObject().getStyles(),getInstance().getViewPortWidth()));
+ getHostView().setTextSize(TypedValue.COMPLEX_UNIT_PX, WXStyle.getFontSize(getDomObject().getStyles(),getInstance().getInstanceViewPortWidth()));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index d1bf68d..5e7adc8 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -239,10 +239,10 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
Map<String, Object> position = WXDataStructureUtil.newHashMapWithExpectedSize(4);
int[] location = new int[2];
mHost.getLocationOnScreen(location);
- position.put("x", WXViewUtils.getWebPxByWidth(location[0],mInstance.getViewPortWidth()));
- position.put("y", WXViewUtils.getWebPxByWidth(location[1],mInstance.getViewPortWidth()));
- position.put("width", WXViewUtils.getWebPxByWidth(mDomObj.getLayoutWidth(),mInstance.getViewPortWidth()));
- position.put("height", WXViewUtils.getWebPxByWidth(mDomObj.getLayoutHeight(),mInstance.getViewPortWidth()));
+ position.put("x", WXViewUtils.getWebPxByWidth(location[0],mInstance.getInstanceViewPortWidth()));
+ position.put("y", WXViewUtils.getWebPxByWidth(location[1],mInstance.getInstanceViewPortWidth()));
+ position.put("width", WXViewUtils.getWebPxByWidth(mDomObj.getLayoutWidth(),mInstance.getInstanceViewPortWidth()));
+ position.put("height", WXViewUtils.getWebPxByWidth(mDomObj.getLayoutHeight(),mInstance.getInstanceViewPortWidth()));
param.put(Constants.Name.POSITION, position);
fireEvent(Constants.Event.CLICK,param);
}
@@ -1133,19 +1133,19 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
if (borderRadius >= 0) {
switch (key) {
case Constants.Name.BORDER_RADIUS:
- getOrCreateBorder().setBorderRadius(BorderDrawable.BORDER_RADIUS_ALL, WXViewUtils.getRealSubPxByWidth(borderRadius,mInstance.getViewPortWidth()));
+ getOrCreateBorder().setBorderRadius(BorderDrawable.BORDER_RADIUS_ALL, WXViewUtils.getRealSubPxByWidth(borderRadius,mInstance.getInstanceViewPortWidth()));
break;
case Constants.Name.BORDER_TOP_LEFT_RADIUS:
- getOrCreateBorder().setBorderRadius(BorderDrawable.BORDER_TOP_LEFT_RADIUS, WXViewUtils.getRealSubPxByWidth(borderRadius,mInstance.getViewPortWidth()));
+ getOrCreateBorder().setBorderRadius(BorderDrawable.BORDER_TOP_LEFT_RADIUS, WXViewUtils.getRealSubPxByWidth(borderRadius,mInstance.getInstanceViewPortWidth()));
break;
case Constants.Name.BORDER_TOP_RIGHT_RADIUS:
- getOrCreateBorder().setBorderRadius(BorderDrawable.BORDER_TOP_RIGHT_RADIUS, WXViewUtils.getRealSubPxByWidth(borderRadius,mInstance.getViewPortWidth()));
+ getOrCreateBorder().setBorderRadius(BorderDrawable.BORDER_TOP_RIGHT_RADIUS, WXViewUtils.getRealSubPxByWidth(borderRadius,mInstance.getInstanceViewPortWidth()));
break;
case Constants.Name.BORDER_BOTTOM_RIGHT_RADIUS:
- getOrCreateBorder().setBorderRadius(BorderDrawable.BORDER_BOTTOM_RIGHT_RADIUS, WXViewUtils.getRealSubPxByWidth(borderRadius,mInstance.getViewPortWidth()));
+ getOrCreateBorder().setBorderRadius(BorderDrawable.BORDER_BOTTOM_RIGHT_RADIUS, WXViewUtils.getRealSubPxByWidth(borderRadius,mInstance.getInstanceViewPortWidth()));
break;
case Constants.Name.BORDER_BOTTOM_LEFT_RADIUS:
- getOrCreateBorder().setBorderRadius(BorderDrawable.BORDER_BOTTOM_LEFT_RADIUS, WXViewUtils.getRealSubPxByWidth(borderRadius,mInstance.getViewPortWidth()));
+ getOrCreateBorder().setBorderRadius(BorderDrawable.BORDER_BOTTOM_LEFT_RADIUS, WXViewUtils.getRealSubPxByWidth(borderRadius,mInstance.getInstanceViewPortWidth()));
break;
}
}
@@ -1155,19 +1155,19 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
if (borderWidth >= 0) {
switch (key) {
case Constants.Name.BORDER_WIDTH:
- getOrCreateBorder().setBorderWidth(Spacing.ALL, WXViewUtils.getRealSubPxByWidth(borderWidth,getInstance().getViewPortWidth()));
+ getOrCreateBorder().setBorderWidth(Spacing.ALL, WXViewUtils.getRealSubPxByWidth(borderWidth,getInstance().getInstanceViewPortWidth()));
break;
case Constants.Name.BORDER_TOP_WIDTH:
- getOrCreateBorder().setBorderWidth(Spacing.TOP, WXViewUtils.getRealSubPxByWidth(borderWidth,getInstance().getViewPortWidth()));
+ getOrCreateBorder().setBorderWidth(Spacing.TOP, WXViewUtils.getRealSubPxByWidth(borderWidth,getInstance().getInstanceViewPortWidth()));
break;
case Constants.Name.BORDER_RIGHT_WIDTH:
- getOrCreateBorder().setBorderWidth(Spacing.RIGHT, WXViewUtils.getRealSubPxByWidth(borderWidth,getInstance().getViewPortWidth()));
+ getOrCreateBorder().setBorderWidth(Spacing.RIGHT, WXViewUtils.getRealSubPxByWidth(borderWidth,getInstance().getInstanceViewPortWidth()));
break;
case Constants.Name.BORDER_BOTTOM_WIDTH:
- getOrCreateBorder().setBorderWidth(Spacing.BOTTOM, WXViewUtils.getRealSubPxByWidth(borderWidth,getInstance().getViewPortWidth()));
+ getOrCreateBorder().setBorderWidth(Spacing.BOTTOM, WXViewUtils.getRealSubPxByWidth(borderWidth,getInstance().getInstanceViewPortWidth()));
break;
case Constants.Name.BORDER_LEFT_WIDTH:
- getOrCreateBorder().setBorderWidth(Spacing.LEFT, WXViewUtils.getRealSubPxByWidth(borderWidth,getInstance().getViewPortWidth()));
+ getOrCreateBorder().setBorderWidth(Spacing.LEFT, WXViewUtils.getRealSubPxByWidth(borderWidth,getInstance().getInstanceViewPortWidth()));
break;
}
}
@@ -1245,7 +1245,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
* This is an experimental feature for elevation of material design.
*/
private void updateElevation() {
- float elevation = getDomObject().getAttrs().getElevation(getInstance().getViewPortWidth());
+ float elevation = getDomObject().getAttrs().getElevation(getInstance().getInstanceViewPortWidth());
if (!Float.isNaN(elevation)) {
ViewCompat.setElevation(getHostView(), elevation);
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
index 033a05d..01bf99d 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXEmbed.java
@@ -359,8 +359,8 @@ public class WXEmbed extends WXDiv implements WXSDKInstance.OnInstanceVisibleLis
super(instance, node, parent);
mListener = new EmbedRenderListener(this);
- ERROR_IMG_WIDTH = (int) WXViewUtils.getRealPxByWidth(270,instance.getViewPortWidth());
- ERROR_IMG_HEIGHT = (int) WXViewUtils.getRealPxByWidth(260,instance.getViewPortWidth());
+ ERROR_IMG_WIDTH = (int) WXViewUtils.getRealPxByWidth(270,instance.getInstanceViewPortWidth());
+ ERROR_IMG_HEIGHT = (int) WXViewUtils.getRealPxByWidth(260,instance.getInstanceViewPortWidth());
if(instance instanceof EmbedManager) {
Object itemId = node.getAttrs().get(ITEM_ID);
if (itemId != null) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/ui/component/WXIndicator.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXIndicator.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXIndicator.java
index f8f87d9..8aa0540 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXIndicator.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXIndicator.java
@@ -321,7 +321,7 @@ public class WXIndicator extends WXComponent<WXCircleIndicator> {
if (itemSize < 0) {
return;
}
- getHostView().setRadius(WXViewUtils.getRealPxByWidth(itemSize,getInstance().getViewPortWidth()) / 2.0f);
+ getHostView().setRadius(WXViewUtils.getRealPxByWidth(itemSize,getInstance().getInstanceViewPortWidth()) / 2.0f);
getHostView().forceLayout();
getHostView().requestLayout();
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java
index c730d87..cd92296 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSliderNeighbor.java
@@ -214,22 +214,17 @@ import android.view.ViewGroup;
import android.widget.FrameLayout;
import com.taobao.weex.WXSDKInstance;
-import com.taobao.weex.WXSDKManager;
import com.taobao.weex.common.WXThread;
-import com.taobao.weex.dom.WXDomManager;
import com.taobao.weex.dom.WXDomObject;
import com.taobao.weex.ui.ComponentCreator;
import com.taobao.weex.ui.view.WXCircleIndicator;
import com.taobao.weex.ui.view.WXCirclePageAdapter;
import com.taobao.weex.ui.view.WXCircleViewPager;
-import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXUtils;
import com.taobao.weex.utils.WXViewUtils;
-import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
/**
* Known Issus: In auto play mode, neighbor view not scaled or aplhaed rarely.
@@ -528,7 +523,7 @@ public class WXSliderNeighbor extends WXSlider {
}
View realView = ((ViewGroup)hostPage).getChildAt(0);
float translation = (hostPage.getMeasuredWidth()-realView.getMeasuredWidth()*mNeighborScale)/4;
- translation += ((hostPage.getMeasuredWidth()-realView.getMeasuredWidth() * mCurrentItemScale)/2 - WXViewUtils.getRealPxByWidth(mNeighborSpace, getInstance().getViewPortWidth()))/2 ;
+ translation += ((hostPage.getMeasuredWidth()-realView.getMeasuredWidth() * mCurrentItemScale)/2 - WXViewUtils.getRealPxByWidth(mNeighborSpace, getInstance().getInstanceViewPortWidth()))/2 ;
return translation;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 40e1fdc..5af9075 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -536,7 +536,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
@WXComponentProp(name = Constants.Name.OFFSET_ACCURACY)
public void setOffsetAccuracy(int accuracy) {
- float real = WXViewUtils.getRealPxByWidth(accuracy, getInstance().getViewPortWidth());
+ float real = WXViewUtils.getRealPxByWidth(accuracy, getInstance().getInstanceViewPortWidth());
this.mOffsetAccuracy = (int) real;
}
@@ -593,7 +593,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
smooth = WXUtils.getBoolean(options.get(Constants.Name.ANIMATED), true);
if (offsetStr != null) {
try {
- offsetFloat = WXViewUtils.getRealPxByWidth(Float.parseFloat(offsetStr), WXSDKInstance.getViewPortWidth());
+ offsetFloat = WXViewUtils.getRealPxByWidth(Float.parseFloat(offsetStr), getInstance().getInstanceViewPortWidth());
}catch (Exception e ){
WXLogUtils.e("Float parseFloat error :"+e.getMessage());
}
@@ -1164,7 +1164,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
if (TextUtils.isEmpty(offset)) {
offset = "0";
}
- float offsetParsed = WXViewUtils.getRealPxByWidth(Integer.parseInt(offset),WXSDKInstance.getViewPortWidth());
+ float offsetParsed = WXViewUtils.getRealPxByWidth(Integer.parseInt(offset),getInstance().getInstanceViewPortWidth());
if (offScreenY < offsetParsed) {
@@ -1260,11 +1260,11 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
Map<String, Object> contentSize = new HashMap<>(2);
Map<String, Object> contentOffset = new HashMap<>(2);
- contentSize.put(Constants.Name.WIDTH, WXViewUtils.getWebPxByWidth(contentWidth, getInstance().getViewPortWidth()));
- contentSize.put(Constants.Name.HEIGHT, WXViewUtils.getWebPxByWidth(contentHeight, getInstance().getViewPortWidth()));
+ contentSize.put(Constants.Name.WIDTH, WXViewUtils.getWebPxByWidth(contentWidth, getInstance().getInstanceViewPortWidth()));
+ contentSize.put(Constants.Name.HEIGHT, WXViewUtils.getWebPxByWidth(contentHeight, getInstance().getInstanceViewPortWidth()));
- contentOffset.put(Constants.Name.X, - WXViewUtils.getWebPxByWidth(offsetX, getInstance().getViewPortWidth()));
- contentOffset.put(Constants.Name.Y, - WXViewUtils.getWebPxByWidth(offsetY, getInstance().getViewPortWidth()));
+ contentOffset.put(Constants.Name.X, - WXViewUtils.getWebPxByWidth(offsetX, getInstance().getInstanceViewPortWidth()));
+ contentOffset.put(Constants.Name.Y, - WXViewUtils.getWebPxByWidth(offsetY, getInstance().getInstanceViewPortWidth()));
event.put(Constants.Name.CONTENT_SIZE, contentSize);
event.put(Constants.Name.CONTENT_OFFSET, contentOffset);
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
index f0afd7c..95bb112 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
@@ -559,8 +559,8 @@ public class WXGesture extends GestureDetector.SimpleOnGestureListener implement
globalEventOffset.set((int) eventX, (int) eventY);
component.getRealView().getGlobalVisibleRect(globalRect, globalOffset);
globalEventOffset.offset(globalOffset.x, globalOffset.y);
- return new PointF(WXViewUtils.getWebPxByWidth(globalEventOffset.x,component.getInstance().getViewPortWidth()),
- WXViewUtils.getWebPxByWidth(globalEventOffset.y,component.getInstance().getViewPortWidth()));
+ return new PointF(WXViewUtils.getWebPxByWidth(globalEventOffset.x,component.getInstance().getInstanceViewPortWidth()),
+ WXViewUtils.getWebPxByWidth(globalEventOffset.y,component.getInstance().getInstanceViewPortWidth()));
}
/**
@@ -605,8 +605,8 @@ public class WXGesture extends GestureDetector.SimpleOnGestureListener implement
locLeftTop.set(0, 0);
component.computeVisiblePointInViewCoordinate(locLeftTop);
locEventOffset.offset(locLeftTop.x, locLeftTop.y);
- return new PointF(WXViewUtils.getWebPxByWidth(locEventOffset.x,component.getInstance().getViewPortWidth()),
- WXViewUtils.getWebPxByWidth(locEventOffset.y,component.getInstance().getViewPortWidth()));
+ return new PointF(WXViewUtils.getWebPxByWidth(locEventOffset.x,component.getInstance().getInstanceViewPortWidth()),
+ WXViewUtils.getWebPxByWidth(locEventOffset.y,component.getInstance().getInstanceViewPortWidth()));
}
private static class GestureHandler extends android.os.Handler {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fcfb32b2/android/sdk/src/test/java/com/taobao/weex/ui/module/WXMetaModuleTest.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/test/java/com/taobao/weex/ui/module/WXMetaModuleTest.java b/android/sdk/src/test/java/com/taobao/weex/ui/module/WXMetaModuleTest.java
index 37b19c6..da58fa6 100644
--- a/android/sdk/src/test/java/com/taobao/weex/ui/module/WXMetaModuleTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/ui/module/WXMetaModuleTest.java
@@ -241,23 +241,23 @@ public class WXMetaModuleTest {
JSONObject jsonObject = new JSONObject();
jsonObject.put(WXMetaModule.WIDTH,640);
mMeta.setViewport(jsonObject.toString());
- assertTrue(mMeta.mWXSDKInstance.getViewPortWidth() == 640);
+ assertTrue(mMeta.mWXSDKInstance.getInstanceViewPortWidth() == 640);
jsonObject.put(WXMetaModule.WIDTH,320.5);
mMeta.setViewport(jsonObject.toString());
- assertTrue(mMeta.mWXSDKInstance.getViewPortWidth() == 320);
+ assertTrue(mMeta.mWXSDKInstance.getInstanceViewPortWidth() == 320);
jsonObject.put(WXMetaModule.WIDTH,"-200");
mMeta.setViewport(jsonObject.toString());
- assertTrue(mMeta.mWXSDKInstance.getViewPortWidth() == 320);
+ assertTrue(mMeta.mWXSDKInstance.getInstanceViewPortWidth() == 320);
jsonObject.put(WXMetaModule.WIDTH,"error");
mMeta.setViewport(jsonObject.toString());
- assertTrue(mMeta.mWXSDKInstance.getViewPortWidth() == 320);
+ assertTrue(mMeta.mWXSDKInstance.getInstanceViewPortWidth() == 320);
mMeta.setViewport("ads");
- assertTrue(mMeta.mWXSDKInstance.getViewPortWidth() == 320);
+ assertTrue(mMeta.mWXSDKInstance.getInstanceViewPortWidth() == 320);
}
}
\ No newline at end of file