From 775d6eca81b86f4d9b5b6c0f372368f76a1ea04a Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Wed, 5 Jul 2017 19:13:00 +0800
Subject: [PATCH] try fixing hyb1996-guest/AutoJsIssueReport#4720

---
 .../ui/error/AbstractIssueReporterActivity.java          | 2 +-
 .../scriptdroid/ui/error/ErrorReportActivity.java        | 2 +-
 .../stardust/autojs/runtime/console/ConsoleFloaty.java   | 9 +--------
 .../stardust/autojs/runtime/console/StardustConsole.java | 8 +++++++-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/error/AbstractIssueReporterActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/error/AbstractIssueReporterActivity.java
index f5274c14..6f67acaa 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/error/AbstractIssueReporterActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/error/AbstractIssueReporterActivity.java
@@ -35,7 +35,6 @@ import android.widget.Toast;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
-import com.github.aakira.expandablelayout.BuildConfig;
 import com.github.aakira.expandablelayout.ExpandableRelativeLayout;
 import com.heinrichreimersoftware.androidissuereporter.model.DeviceInfo;
 import com.heinrichreimersoftware.androidissuereporter.model.Report;
@@ -58,6 +57,7 @@ import java.lang.ref.WeakReference;
 import static android.util.Patterns.EMAIL_ADDRESS;
 
 import com.heinrichreimersoftware.androidissuereporter.R;
+import com.stardust.scriptdroid.BuildConfig;
 import com.stardust.theme.ThemeColorManager;
 
 /**
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/error/ErrorReportActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/error/ErrorReportActivity.java
index d42aacf2..589020fe 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/error/ErrorReportActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/error/ErrorReportActivity.java
@@ -118,7 +118,7 @@ public class ErrorReportActivity extends BaseActivity {
     }
 
     private String getDeviceMessage() {
-        return String.format(Locale.getDefault(), "Version: %s\nAndroid: %d", BuildConfig.VERSION_CODE, Build.VERSION.SDK_INT);
+        return String.format(Locale.getDefault(), "Version: %s\nAndroid: %d\n", BuildConfig.VERSION_CODE, Build.VERSION.SDK_INT);
     }
 
     private void exitAfter(long millis) {
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 114136d5..2cf47dd2 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
@@ -35,14 +35,7 @@ public class ConsoleFloaty extends ResizableExpandableFloaty.AbstractResizableEx
     @Override
     public View inflateCollapsedView(FloatyService service, final ResizableExpandableFloatyWindow window) {
         ensureContextWrapper(service);
-        View view = View.inflate(mContextWrapper, R.layout.floating_window_collapse, null);
-        view.post(new Runnable() {
-            @Override
-            public void run() {
-                window.expand();
-            }
-        });
-        return view;
+        return View.inflate(mContextWrapper, R.layout.floating_window_collapse, null);
     }
 
     private void ensureContextWrapper(Context context) {
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 cb52e951..f65f986e 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
@@ -61,8 +61,14 @@ public class StardustConsole extends AbstractConsole {
     public StardustConsole(UiHandler uiHandler, Console globalConsole) {
         mUiHandler = uiHandler;
         mConsoleFloaty = new ConsoleFloaty(this);
-        mFloatyWindow = new ResizableExpandableFloatyWindow(mConsoleFloaty);
         mGlobalConsole = globalConsole;
+        mFloatyWindow = new ResizableExpandableFloatyWindow(mConsoleFloaty) {
+            @Override
+            public void onCreate(FloatyService service, WindowManager manager) {
+                super.onCreate(service, manager);
+                expand();
+            }
+        };
     }
 
     public void setConsoleView(ConsoleView consoleView) {