Merge pull request #60 from JeasonWong/master

opt elements sort
eleme · Jun 27, 2019 · 144378c · 144378c
2 parents 0edbf2e + 7f4cdbf
commit 144378c
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -84,11 +84,11 @@ At present, UETool provides functionality as follows:
 
 ```gradle
 dependencies {
-  debugImplementation 'me.ele:uetool:1.2.0'
-  releaseImplementation 'me.ele:uetool-no-op:1.2.0'
+  debugImplementation 'me.ele:uetool:1.2.1'
+  releaseImplementation 'me.ele:uetool-no-op:1.2.1'
 
   // if you want to show more attrs about Fresco's DraweeView
-  debugImplementation 'me.ele:uetool-fresco:1.2.0'
+  debugImplementation 'me.ele:uetool-fresco:1.2.1'
 }
 ```
 

diff --git a/README_zh.md b/README_zh.md
@@ -81,11 +81,11 @@ UETool 是一个各方人员（设计师、程序员、测试）都可以使用
 
 ```gradle
 dependencies {
-  debugImplementation 'me.ele:uetool:1.2.0'
-  releaseImplementation 'me.ele:uetool-no-op:1.2.0'
+  debugImplementation 'me.ele:uetool:1.2.1'
+  releaseImplementation 'me.ele:uetool-no-op:1.2.1'
 
   // if you want to show more attrs about Fresco's DraweeView
-  debugImplementation 'me.ele:uetool-fresco:1.2.0'
+  debugImplementation 'me.ele:uetool-fresco:1.2.1'
 }
 ```
 

diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_second.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_dialog_email"
-        />
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="@dimen/fab_margin"
+            app:srcCompat="@android:drawable/ic_dialog_email"/>
+
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#20000000"/>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
                     'supportLibrary': '27.1.1',
                     'fresco'        : '1.0.1',
 
-                    'release'       : '1.2.0',]
+                    'release'       : '1.2.1',]
     repositories {
         jcenter()
         google()

diff --git a/uetool-base/src/main/java/me/ele/uetool/base/Element.java b/uetool-base/src/main/java/me/ele/uetool/base/Element.java
@@ -56,6 +56,11 @@ public Element getParentElement() {
         return parentElement;
     }
 
+    //  view 的面积
+    public int getArea() {
+        return view.getWidth() * view.getHeight();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/uetool/src/main/java/me/ele/uetool/CollectViewsLayout.java b/uetool/src/main/java/me/ele/uetool/CollectViewsLayout.java
@@ -16,9 +16,7 @@
 import me.ele.uetool.base.ReflectionP;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 import static me.ele.uetool.base.DimenUtil.*;
 
@@ -94,7 +92,7 @@ protected void onAttachedToWindow() {
                     for (int i = views.size() - 1; i >= 0; i--) {
                         View targetView = getTargetDecorView(targetActivity, views.get(i));
                         if (targetView != null) {
-                            traverse(targetView);
+                            createElements(targetView);
                             break;
                         }
                     }
@@ -118,7 +116,7 @@ public void call() {
                                     WindowManager.LayoutParams layoutParams = (WindowManager.LayoutParams) mWindowAttributesField.get(object);
                                     if (layoutParams.getTitle().toString().contains(targetActivity.getClass().getName())
                                             || getTargetDecorView(targetActivity, decorView) != null) {
-                                        traverse(decorView);
+                                        createElements(decorView);
                                         break;
                                     }
                                 }
@@ -138,7 +136,7 @@ public void call() {
                 for (int i = views.size() - 1; i >= 0; i--) {
                     View targetView = getTargetDecorView(targetActivity, views.get(i));
                     if (targetView != null) {
-                        traverse(targetView);
+                        createElements(targetView);
                         break;
                     }
                 }
@@ -156,15 +154,32 @@ protected void onDetachedFromWindow() {
         parentElement = null;
     }
 
-    private void traverse(View view) {
+    private void createElements(View view) {
+
+        List<Element> elements = new ArrayList<>();
+        traverse(view, elements);
+
+        //  面积从大到小排序
+        Collections.sort(elements, new Comparator<Element>() {
+            @Override
+            public int compare(Element o1, Element o2) {
+                return o2.getArea() - o1.getArea();
+            }
+        });
+
+        this.elements.addAll(elements);
+
+    }
+
+    private void traverse(View view, List<Element> elements) {
         if (UETool.getInstance().getFilterClasses().contains(view.getClass().getName())) return;
         if (view.getAlpha() == 0 || view.getVisibility() != View.VISIBLE) return;
         if (getResources().getString(R.string.uet_disable).equals(view.getTag())) return;
         elements.add(new Element(view));
         if (view instanceof ViewGroup) {
             ViewGroup parent = (ViewGroup) view;
             for (int i = 0; i < parent.getChildCount(); i++) {
-                traverse(parent.getChildAt(i));
+                traverse(parent.getChildAt(i), elements);
             }
         }
     }