You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2018/06/19 09:41:09 UTC
[22/50] [abbrv] incubator-weex git commit: [WEEX-457][Android] add
back performance point of maxVDomDeep && interactionTime
[WEEX-457][Android] add back performance point of maxVDomDeep && interactionTime
* [Android] rm useless file
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8a0f304f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8a0f304f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8a0f304f
Branch: refs/heads/release
Commit: 8a0f304fca8c539bd75aeb53424d314472d707a6
Parents: 1e71562
Author: zhongcang <qh...@gmail.com>
Authored: Wed Jun 13 16:35:21 2018 +0800
Committer: zhongcang <qh...@gmail.com>
Committed: Wed Jun 13 16:37:38 2018 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/WXSDKInstance.java | 27 ++++++--------------
.../weex/ui/action/GraphicActionAddElement.java | 5 ++++
.../ui/action/GraphicActionMoveElement.java | 5 ++++
.../ui/action/GraphicActionRemoveElement.java | 5 ++++
.../taobao/weex/ui/component/WXComponent.java | 1 +
.../taobao/weex/ui/component/WXVContainer.java | 2 ++
6 files changed, 26 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a0f304f/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 fba31d6..d7d8581 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -267,9 +267,6 @@ public class WXSDKInstance implements IWXActivityStateListener,View.OnLayoutChan
}
}
- private int mMaxDeepLayer;
- private int mMaxVDomDeepLayer;
-
public boolean isTrackComponent() {
return trackComponent;
}
@@ -919,7 +916,6 @@ public class WXSDKInstance implements IWXActivityStateListener,View.OnLayoutChan
if(componentTypes!=null && componentTypes.contains(WXBasicComponentType.SCROLLER)){
mWXPerformance.useScroller=1;
}
- mWXPerformance.maxDeepViewLayer=getMaxDeepLayer();
mWXPerformance.wxDims = mwxDims;
mWXPerformance.measureTimes = measureTimes;
if (mUserTrackAdapter != null) {
@@ -1186,7 +1182,7 @@ public class WXSDKInstance implements IWXActivityStateListener,View.OnLayoutChan
}
/**
- * when add/rm element
+ * when add/rm/mv element
*/
public void onElementChange(){
if (isDestroy() || !mEnd ||null == mRenderContainer || mRenderContainer.isPageHasEvent() ||
@@ -1427,6 +1423,7 @@ public class WXSDKInstance implements IWXActivityStateListener,View.OnLayoutChan
public void onRootCreated(WXComponent root) {
this.mRootComp = root;
+ this.mRootComp.deepInComponentTree=1;
mRenderContainer.addView(root.getHostView());
setSize(mRenderContainer.getWidth(),mRenderContainer.getHeight());
}
@@ -1656,21 +1653,13 @@ public class WXSDKInstance implements IWXActivityStateListener,View.OnLayoutChan
}
}
- public int getMaxDeepLayer() {
- return mMaxDeepLayer;
- }
-
- public void setMaxDeepLayer(int maxDeepLayer) {
- mMaxDeepLayer = maxDeepLayer;
- }
-
- public int getMaxDomDeep() {
- return mMaxVDomDeepLayer;
- }
-
public void setMaxDomDeep(int maxDomDeep){
- mMaxVDomDeepLayer = maxDomDeep;
- mWXPerformance.maxDeepVDomLayer = maxDomDeep;
+ if (null == mWXPerformance){
+ return;
+ }
+ if (mWXPerformance.maxDeepVDomLayer <= maxDomDeep){
+ mWXPerformance.maxDeepVDomLayer = maxDomDeep;
+ }
}
public void onHttpStart(){
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a0f304f/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java
index 6bdb0b7..c73e704 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java
@@ -120,6 +120,11 @@ public class GraphicActionAddElement extends GraphicActionAbstractAddElement {
child.applyLayoutAndEvent(child);
child.bindData(child);
+ WXSDKInstance instance = WXSDKManager.getInstance().getWXRenderManager().getWXSDKInstance(getPageId());
+ if (null!=instance){
+ instance.onElementChange();
+ // instance.setma
+ }
} catch (Exception e) {
WXLogUtils.e("add component failed.", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a0f304f/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionMoveElement.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionMoveElement.java b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionMoveElement.java
index ac6474b..3cec87c 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionMoveElement.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionMoveElement.java
@@ -18,6 +18,7 @@
*/
package com.taobao.weex.ui.action;
+import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.WXSDKManager;
import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.ui.component.WXVContainer;
@@ -48,5 +49,9 @@ public class GraphicActionMoveElement extends BasicGraphicAction {
if (!component.isVirtualComponent()) {
((WXVContainer) newParent).addSubView(component.getHostView(), mIndex);
}
+ WXSDKInstance instance = WXSDKManager.getInstance().getWXRenderManager().getWXSDKInstance(getPageId());
+ if (null!=instance){
+ instance.onElementChange();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a0f304f/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveElement.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveElement.java b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveElement.java
index 36d31dd..2b24eab 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveElement.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionRemoveElement.java
@@ -18,6 +18,7 @@
*/
package com.taobao.weex.ui.action;
+import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.WXSDKManager;
import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.ui.component.WXVContainer;
@@ -52,5 +53,9 @@ public class GraphicActionRemoveElement extends BasicGraphicAction {
clearRegistryForComponent(container.getChild(i));
}
}
+ WXSDKInstance instance = WXSDKManager.getInstance().getWXRenderManager().getWXSDKInstance(getPageId());
+ if (null!=instance){
+ instance.onElementChange();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a0f304f/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 26fedbc..cba19d3 100644
--- 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
@@ -166,6 +166,7 @@ public abstract class WXComponent<T extends View> extends WXBasicComponent imple
private int mType = TYPE_COMMON;
private boolean mNeedLayoutOnAnimation = false;
private String mLastBoxShadowId;
+ public int deepInComponentTree = 0;
public WXTracing.TraceInfo mTraceInfo = new WXTracing.TraceInfo();
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a0f304f/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
index 88c9818..ee64b98 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
@@ -264,6 +264,8 @@ public abstract class WXVContainer<T extends ViewGroup> extends WXComponent<T> {
if (child == null || index < -1) {
return;
}
+ child.deepInComponentTree = this.deepInComponentTree+1;
+ getInstance().setMaxDomDeep(child.deepInComponentTree);
int count = mChildren.size();
index = index >= count ? -1 : index;
if (index == -1) {