[Android] fix whiteScreen viewTree record && run state history record (…

…#2629)
apache · Jun 28, 2019 · 925a922 · 925a922
1 parent 1960291
commit 925a922
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 31 deletions.
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -895,7 +895,7 @@ private void checkWhiteScreen(){
     }
     WXErrorCode errorCode = WXErrorCode.WX_ERROR_WHITE_SCREEN;
     Map<String,String> args = new HashMap<>(1);
-    String vieTreeMsg = WhiteScreenUtils.getViewMsg(this);
+    String vieTreeMsg = WhiteScreenUtils.takeViewTreeSnapShot(this);
     args.put("viewTree",null == vieTreeMsg?"null viewTreeMsg":vieTreeMsg);
 
     for (Map.Entry<String,String> entry: WXStateRecord.getInstance().getStateInfo().entrySet()){

diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/WXStateRecord.java b/android/sdk/src/main/java/com/taobao/weex/performance/WXStateRecord.java
@@ -110,7 +110,7 @@ public RecordList(int maxSize) {
         @Override
         public boolean add(E e) {
             if (this.size()>0 && this.size() >= maxSize){
-                remove(this.size() - 1);
+                remove(0);
             }
             return super.add(e);
         }

diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/WhiteScreenUtils.java b/android/sdk/src/main/java/com/taobao/weex/performance/WhiteScreenUtils.java
@@ -115,38 +115,16 @@ private static boolean hasLeafViewOrSizeIgnore(View v,int checkDeep) {
     /**
      * get instance viewTree && component tree msg
      */
-    public static String getViewMsg(WXSDKInstance instance) {
+    public static String takeViewTreeSnapShot(WXSDKInstance instance) {
         if (null == instance) {
             return "nullInstance";
         }
         View v = instance.getContainerView();
-        StringBuilder builder = new StringBuilder();
-        WXComponent component = instance.getRootComponent();
-        if (null != component) {
-            builder.append("componentMsg:").append(getComponentTreeMsg(component)).append("-----");
+        JSONObject root = geViewDetailTreeMsg(v);
+        if (null != root) {
+            return root.toString();
         }
-        if (null != v) {
-            builder.append("viewTreeMsg:").append(geViewDetailTreeMsg(v));
-        }
-        return builder.toString();
-    }
-
-    private static String getComponentTreeMsg(WXComponent component) {
-        if (null == component) {
-            return "nullComponent";
-        }
-
-        if (!(component instanceof WXVContainer)) {
-            return component.getRef();
-        }
-        WXVContainer container = (WXVContainer)component;
-        StringBuilder builder = new StringBuilder();
-        builder.append(" _start_ ");
-        for (int i = 0; i < container.getChildCount(); i++) {
-            builder.append(getComponentTreeMsg(container.getChild(i))).append(",");
-        }
-        builder.append(" _end_ ");
-        return builder.toString();
+        return "";
     }
 
     private static JSONObject geViewDetailTreeMsg(View view) {
@@ -165,10 +143,10 @@ private static JSONObject geViewDetailTreeMsg(View view) {
             node.put("y", location[1]);
 
             if (view instanceof ViewGroup) {
-                node.put("type", "ViewGroup");
+                node.put("type", view.getClass().getSimpleName());
                 ViewGroup group = (ViewGroup)view;
                 for (int i = 0; i < group.getChildCount(); i++) {
-                    node.put("child", geViewDetailTreeMsg(group.getChildAt(i)));
+                    node.put("child_"+i, geViewDetailTreeMsg(group.getChildAt(i)));
                 }
             } else {
                 node.put("type", view.getClass().getSimpleName());