From d04ef71a6729a1f7a92494382a7a0c670ff9180e Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Tue, 11 Jul 2017 20:46:34 +0800
Subject: [PATCH] fix some part of console hidden on low dpi device

---
 autojs/src/main/AndroidManifest.xml                         | 2 ++
 .../com/stardust/autojs/runtime/console/ConsoleFloaty.java  | 4 +++-
 .../stardust/autojs/runtime/console/StardustConsole.java    | 6 ++++++
 autojs/src/main/res/layout/floating_window_collapse.xml     | 5 ++---
 autojs/src/main/res/xml/accessibility_service_config.xml    | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/autojs/src/main/AndroidManifest.xml b/autojs/src/main/AndroidManifest.xml
index fd33788b..ed63e9a6 100644
--- a/autojs/src/main/AndroidManifest.xml
+++ b/autojs/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <application
         >
         <activity android:name=".execution.ScriptExecuteActivity"/>
+
         <service
             android:name="com.stardust.view.accessibility.AccessibilityService"
             android:label="@string/_app_name"
@@ -18,6 +19,7 @@
                 android:resource="@xml/accessibility_service_config"/>
 
         </service>
+
     </application>
 
 </manifest>
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleFloaty.java b/autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleFloaty.java
index 2cf47dd2..b64a17a2 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleFloaty.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleFloaty.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import com.stardust.enhancedfloaty.FloatyService;
 import com.stardust.enhancedfloaty.ResizableExpandableFloaty;
 import com.stardust.enhancedfloaty.ResizableExpandableFloatyWindow;
+import com.stardust.util.ScreenMetrics;
 import com.stardust.util.ViewUtil;
 import com.stardust.autojs.R;
 
@@ -30,6 +31,7 @@ public class ConsoleFloaty extends ResizableExpandableFloaty.AbstractResizableEx
         setShouldRequestFocusWhenExpand(false);
         setInitialX(100);
         setInitialY(1000);
+        setCollapsedViewUnpressedAlpha(1.0f);
     }
 
     @Override
@@ -58,7 +60,7 @@ public class ConsoleFloaty extends ResizableExpandableFloaty.AbstractResizableEx
         view.post(new Runnable() {
             @Override
             public void run() {
-                ViewUtil.setViewMeasure(view, 800, 800);
+                ViewUtil.setViewMeasure(view, ScreenMetrics.getDeviceScreenWidth() * 2 / 3, ScreenMetrics.getDeviceScreenHeight() / 3);
             }
         });
     }
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/console/StardustConsole.java b/autojs/src/main/java/com/stardust/autojs/runtime/console/StardustConsole.java
index 4ddc063d..29c35c5e 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/console/StardustConsole.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/console/StardustConsole.java
@@ -124,6 +124,12 @@ public class StardustConsole extends AbstractConsole {
     @Override
     public void show() {
         if (!SettingsCompat.canDrawOverlays(mUiHandler.getContext())) {
+            mUiHandler.post(new Runnable() {
+                @Override
+                public void run() {
+
+                }
+            });
             SettingsCompat.manageDrawOverlays(mUiHandler.getContext());
             mUiHandler.toast(R.string.text_no_floating_window_permission);
         }
diff --git a/autojs/src/main/res/layout/floating_window_collapse.xml b/autojs/src/main/res/layout/floating_window_collapse.xml
index 94250936..3fc26ba5 100644
--- a/autojs/src/main/res/layout/floating_window_collapse.xml
+++ b/autojs/src/main/res/layout/floating_window_collapse.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="46dp"
-              android:layout_height="46dp"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
               android:background="@android:color/transparent"
               android:orientation="vertical">
 
     <ImageView
         android:layout_width="46dp"
         android:layout_height="46dp"
-        android:padding="5dp"
         android:src="@drawable/ic_debug_console"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/autojs/src/main/res/xml/accessibility_service_config.xml b/autojs/src/main/res/xml/accessibility_service_config.xml
index 28a7fdb7..a557ab7b 100644
--- a/autojs/src/main/res/xml/accessibility_service_config.xml
+++ b/autojs/src/main/res/xml/accessibility_service_config.xml
@@ -7,4 +7,4 @@
                        android:canRequestEnhancedWebAccessibility="true"
                        android:canRetrieveWindowContent="true"
                        android:description="@string/text_accessibility_service_description"
-                       android:notificationTimeout="0"/>
\ No newline at end of file
+                       android:notificationTimeout="100"/>
\ No newline at end of file