Merge pull request eleme#46 from itkxl/master

bug 版本号判断
netdebug · Sep 25, 2018 · aa53b40 · aa53b40
2 parents aee5e41 + 7d45276
commit aa53b40
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/uetool/src/main/java/me/ele/uetool/CollectViewsLayout.java b/uetool/src/main/java/me/ele/uetool/CollectViewsLayout.java
@@ -92,7 +92,13 @@ protected void onAttachedToWindow() {
                 if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
                     Field mViewsField = Class.forName("android.view.WindowManagerGlobal").getDeclaredField("mViews");
                     mViewsField.setAccessible(true);
-                    List<View> views = (List<View>) mViewsField.get(mGlobalField.get(windowManager));
+                    List<View> views;
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT){
+                        views = (List<View>) mViewsField.get(mGlobalField.get(windowManager));
+                    }else {
+                        views = Arrays.asList((View[]) mViewsField.get(mGlobalField.get(windowManager)));
+                    }
+
                     for (int i = views.size() - 1; i >= 0; i--) {
                         View targetView = getTargetDecorView(targetActivity, views.get(i));
                         if (targetView != null) {
@@ -104,11 +110,7 @@ protected void onAttachedToWindow() {
                     Field mRootsField = Class.forName("android.view.WindowManagerGlobal").getDeclaredField("mRoots");
                     mRootsField.setAccessible(true);
                     List viewRootImpls;
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        viewRootImpls = (List) mRootsField.get(mGlobalField.get(windowManager));
-                    } else {
-                        viewRootImpls = Arrays.asList((Object[]) mRootsField.get(mGlobalField.get(windowManager)));
-                    }
+                    viewRootImpls = (List) mRootsField.get(mGlobalField.get(windowManager));
                     for (int i = viewRootImpls.size() - 1; i >= 0; i--) {
                         Class clazz = Class.forName("android.view.ViewRootImpl");
                         Object object = viewRootImpls.get(i);