From c9e42711c025c173089aff8061eb064f9914c2de Mon Sep 17 00:00:00 2001
From: LinJZong <405376689@qq.com>
Date: Thu, 14 Feb 2019 15:20:19 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E8=A7=A3=E5=86=B3#52=20#53=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doraemondemo/MainActivity.java            | 11 ------
 .../app/src/main/res/layout/activity_main.xml |  6 ---
 Android/app/src/main/res/values/styles.xml    |  1 -
 .../doraemonkit/DoraemonHooker.java           |  2 +-
 .../didichuxing/doraemonkit/DoraemonKit.java  | 28 ++-----------
 .../kit/blockmonitor/BlockListFragment.java   |  3 +-
 .../doraemonkit/ui/base/FloatPageManager.java |  4 +-
 .../res/layout/dk_fragment_block_list.xml     | 39 ++++++++-----------
 8 files changed, 24 insertions(+), 70 deletions(-)

diff --git a/Android/app/src/main/java/com/didichuxing/doraemondemo/MainActivity.java b/Android/app/src/main/java/com/didichuxing/doraemondemo/MainActivity.java
index de5851c0..e52db9a9 100644
--- a/Android/app/src/main/java/com/didichuxing/doraemondemo/MainActivity.java
+++ b/Android/app/src/main/java/com/didichuxing/doraemondemo/MainActivity.java
@@ -4,8 +4,6 @@ import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 
-import com.didichuxing.doraemonkit.DoraemonKit;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,7 +26,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         findViewById(R.id.btn_test_urlconnection).setOnClickListener(this);
         findViewById(R.id.btn_test_okhttp).setOnClickListener(this);
         findViewById(R.id.btn_test_crash).setOnClickListener(this);
-        findViewById(R.id.btn_switch_floating_Window).setOnClickListener(this);
     }
 
     @Override
@@ -43,19 +40,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
             case R.id.btn_test_crash:
                 testCrash().length();
                 break;
-            case R.id.btn_switch_floating_Window:
-                switchFloatingWindow();
-                break;
             default:
                 break;
         }
     }
 
-
-    public void switchFloatingWindow() {
-        DoraemonKit.setFloatingWindow(!DoraemonKit.isFloatingWindowShowing());
-    }
-
     public String testCrash() {
         return null;
     }
diff --git a/Android/app/src/main/res/layout/activity_main.xml b/Android/app/src/main/res/layout/activity_main.xml
index 5527db33..7f66b56a 100644
--- a/Android/app/src/main/res/layout/activity_main.xml
+++ b/Android/app/src/main/res/layout/activity_main.xml
@@ -24,10 +24,4 @@
         android:layout_height="50dp"
         android:text="Crash Test" />
 
-    <Button
-        android:id="@+id/btn_switch_floating_Window"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:text="Switch Floating Window" />
-
 </LinearLayout>
diff --git a/Android/app/src/main/res/values/styles.xml b/Android/app/src/main/res/values/styles.xml
index 9431d411..5885930d 100644
--- a/Android/app/src/main/res/values/styles.xml
+++ b/Android/app/src/main/res/values/styles.xml
@@ -6,7 +6,6 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textAllCaps">false</item>
     </style>
 
 </resources>
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonHooker.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonHooker.java
index e0873655..7a6a1937 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonHooker.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonHooker.java
@@ -42,7 +42,7 @@ public class DoraemonHooker {
         LogHelper.d(TAG, "hook application.onCreate start");
         proceedingJoinPoint.proceed();
         Application app = (Application) proceedingJoinPoint.getTarget();
-        DoraemonKit.install(app, true);
+        DoraemonKit.install(app);
         LogHelper.d(TAG, "hook application.onCreate end");
     }
 }
\ No newline at end of file
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKit.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKit.java
index 9a8bd4c3..d98c66cb 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKit.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKit.java
@@ -52,10 +52,8 @@ public class DoraemonKit {
 
     private static boolean sHasInit = false;
 
-    private static boolean sShowFloatingWindow;//显示悬浮窗
-
-    public static void install(final Application app, boolean showFloatingWindow) {
-        install(app, showFloatingWindow, null);
+    public static void install(final Application app) {
+        install(app, null);
     }
 
     public static void setWebDoorCallback(WebDoorManager.WebDoorCallback callback) {
@@ -68,7 +66,7 @@ public class DoraemonKit {
         }
     }
 
-    public static void install(final Application app, boolean showFloatingWindow, List<IKit> selfKits) {
+    public static void install(final Application app, List<IKit> selfKits) {
         if (sHasInit) {
             if (selfKits != null) {
                 List<IKit> biz = sKitMap.get(Category.BIZ);
@@ -83,7 +81,6 @@ public class DoraemonKit {
             return;
         }
         sHasInit = true;
-        sShowFloatingWindow = showFloatingWindow;
         GpsHookManager.getInstance().init();
         app.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
             int startedActivityCounts;
@@ -103,10 +100,6 @@ public class DoraemonKit {
 
             @Override
             public void onActivityResumed(Activity activity) {
-                if (!sShowFloatingWindow) {
-                    return;
-                }
-
                 FloatPageManager.getInstance().onActivityResumed(activity);
                 if (PermissionUtil.canDrawOverlays(activity)) {
                     showFloatIcon(activity);
@@ -237,19 +230,4 @@ public class DoraemonKit {
         }
     }
 
-    public static void setFloatingWindow(boolean showFloatingWindow) {
-        if (sShowFloatingWindow == showFloatingWindow) {
-            return;
-        }
-        sShowFloatingWindow = showFloatingWindow;
-        if (sShowFloatingWindow) {
-            FloatPageManager.getInstance().notifyForeground();
-        } else {
-            FloatPageManager.getInstance().notifyBackground();
-        }
-    }
-
-    public static boolean isFloatingWindowShowing() {
-        return sShowFloatingWindow;
-    }
 }
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
index 65d2d2bb..290359f7 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
@@ -49,7 +49,6 @@ public class BlockListFragment extends BaseFragment implements OnBlockInfoUpdate
 
     private void initView() {
         mBlockList = findViewById(R.id.block_list);
-        final View scrollDetail = findViewById(R.id.sv_block_detail);
         mLogDetail = findViewById(R.id.tx_block_detail);
         LinearLayoutManager layoutManager = new LinearLayoutManager(getContext());
         mBlockList.setLayoutManager(layoutManager);
@@ -62,7 +61,7 @@ public class BlockListFragment extends BaseFragment implements OnBlockInfoUpdate
             @Override
             public void onClick(BlockInfo info) {
                 mLogDetail.setText(info.toString());
-                scrollDetail.setVisibility(View.VISIBLE);
+                mLogDetail.setVisibility(View.VISIBLE);
                 mBlockList.setVisibility(View.GONE);
                 mTitleBar.setTitle(R.string.dk_kit_block_monitor_detail);
             }
diff --git a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/FloatPageManager.java b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/FloatPageManager.java
index 544fde00..85133703 100644
--- a/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/FloatPageManager.java
+++ b/Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/FloatPageManager.java
@@ -24,7 +24,6 @@ public class FloatPageManager {
 
     private Activity mResumedActivity;
 
-
     public void notifyBackground() {
         for (BaseFloatPage page : mPages) {
             page.onEnterBackground();
@@ -81,7 +80,8 @@ public class FloatPageManager {
             page.setTag(pageIntent.tag);
             mPages.add(page);
             page.performCreate(mContext);
-            mWindowManager.addView(page.getRootView(), page.getLayoutParams());
+            mWindowManager.addView(page.getRootView(),
+                    page.getLayoutParams());
         } catch (InstantiationException e) {
             LogHelper.e(TAG, e.toString());
         } catch (IllegalAccessException e) {
diff --git a/Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml b/Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml
index b07bc4f8..511533bb 100644
--- a/Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml
+++ b/Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:background="@color/dk_color_FFFFFF"
-    android:orientation="vertical">
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@color/dk_color_FFFFFF"
+              android:orientation="vertical">
 
     <com.didichuxing.doraemonkit.ui.widget.titlebar.TitleBar
         android:id="@+id/title_bar"
@@ -12,9 +12,10 @@
         android:layout_height="@dimen/dk_title_height"
         app:dkLeftIcon="@drawable/dk_title_back"
         app:dkLeftText="@string/dk_back"
-        app:dkTitle="@string/dk_kit_block_monitor_list" />
+        app:dkTitle="@string/dk_kit_block_monitor_list"/>
 
-    <View style="@style/DK.Shadow.Bottom" />
+    <View
+        style="@style/DK.Shadow.Bottom"/>
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -26,22 +27,16 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:overScrollMode="never"
-            android:scrollbars="none" />
+            android:scrollbars="none"/>
 
-        <ScrollView
-            android:id="@+id/sv_block_detail"
-            android:visibility="gone"
+        <TextView
+            android:id="@+id/tx_block_detail"
+            style="@style/DK.TextSmall.Dark"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:id="@+id/tx_block_detail"
-                style="@style/DK.TextSmall.Dark"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="top|left"
-                android:clickable="true"
-                android:gravity="left" />
-        </ScrollView>
+            android:layout_height="match_parent"
+            android:layout_gravity="top|left"
+            android:clickable="true"
+            android:gravity="left"
+            android:visibility="gone"/>
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
-- 
GitLab