From e301e5952c4e821c325ed852d5905b5116543109 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Sun, 22 Oct 2017 18:40:54 +0800
Subject: [PATCH] refactor: move package console to package core

---
 .../main/java/com/stardust/scriptdroid/autojs/AutoJs.java    | 5 ++---
 .../scriptdroid/ui/main/task/TaskManagerFragment.java        | 4 ++--
 app/src/main/res/layout/activity_console.xml                 | 2 +-
 app/src/main/res/layout/floating_console_expand.xml          | 2 +-
 app/src/main/res/layout/fragment_task_manager.xml            | 2 +-
 .../autojs/{runtime => core}/console/ConsoleFloaty.java      | 2 +-
 .../autojs/{runtime => core}/console/ConsoleView.java        | 3 +--
 .../{runtime => core}/console/GlobalStardustConsole.java     | 5 +----
 .../autojs/{runtime/api => core/console}/NoOpConsole.java    | 2 +-
 .../autojs/{runtime => core}/console/StardustConsole.java    | 5 +----
 autojs/src/main/res/layout/floating_console_expand.xml       | 2 +-
 inrt/src/main/java/com/stardust/auojs/inrt/rt/AutoJs.java    | 4 ++--
 12 files changed, 15 insertions(+), 23 deletions(-)
 rename autojs/src/main/java/com/stardust/autojs/{runtime => core}/console/ConsoleFloaty.java (99%)
 rename autojs/src/main/java/com/stardust/autojs/{runtime => core}/console/ConsoleView.java (98%)
 rename autojs/src/main/java/com/stardust/autojs/{runtime => core}/console/GlobalStardustConsole.java (91%)
 rename autojs/src/main/java/com/stardust/autojs/{runtime/api => core/console}/NoOpConsole.java (96%)
 rename autojs/src/main/java/com/stardust/autojs/{runtime => core}/console/StardustConsole.java (98%)

diff --git a/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java b/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java
index 0f6a2320..ac61aee3 100644
--- a/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java
+++ b/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java
@@ -17,8 +17,7 @@ import com.stardust.autojs.engine.ScriptEngine;
 import com.stardust.autojs.engine.ScriptEngineManager;
 import com.stardust.autojs.core.accessibility.AccessibilityBridge;
 import com.stardust.autojs.runtime.ScriptRuntime;
-import com.stardust.autojs.runtime.api.NoOpConsole;
-import com.stardust.autojs.runtime.console.GlobalStardustConsole;
+import com.stardust.autojs.core.console.GlobalStardustConsole;
 import com.stardust.autojs.runtime.exception.ScriptException;
 import com.stardust.autojs.runtime.api.AbstractShell;
 import com.stardust.autojs.runtime.api.AppUtils;
@@ -32,7 +31,7 @@ import com.stardust.scriptdroid.Pref;
 import com.stardust.scriptdroid.R;
 import com.stardust.autojs.runtime.api.image.ScreenCaptureRequestActivity;
 import com.stardust.autojs.runtime.api.Shell;
-import com.stardust.autojs.runtime.console.StardustConsole;
+import com.stardust.autojs.core.console.StardustConsole;
 import com.stardust.util.ScreenMetrics;
 import com.stardust.util.Supplier;
 import com.stardust.util.UiHandler;
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java
index 0aa68f15..a6ffb718 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java
@@ -7,8 +7,8 @@ import android.view.View;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
-import com.stardust.autojs.runtime.console.ConsoleView;
-import com.stardust.autojs.runtime.console.StardustConsole;
+import com.stardust.autojs.core.console.ConsoleView;
+import com.stardust.autojs.core.console.StardustConsole;
 import com.stardust.scriptdroid.R;
 import com.stardust.scriptdroid.autojs.AutoJs;
 import com.stardust.scriptdroid.ui.main.ViewPagerFragment;
diff --git a/app/src/main/res/layout/activity_console.xml b/app/src/main/res/layout/activity_console.xml
index 81d66b4b..ac013ad0 100644
--- a/app/src/main/res/layout/activity_console.xml
+++ b/app/src/main/res/layout/activity_console.xml
@@ -20,7 +20,7 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <com.stardust.autojs.runtime.console.ConsoleView
+    <com.stardust.autojs.core.console.ConsoleView
         android:id="@+id/console"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/floating_console_expand.xml b/app/src/main/res/layout/floating_console_expand.xml
index adb18c44..0a592b8c 100644
--- a/app/src/main/res/layout/floating_console_expand.xml
+++ b/app/src/main/res/layout/floating_console_expand.xml
@@ -68,7 +68,7 @@
 
         </LinearLayout>
 
-        <com.stardust.autojs.runtime.console.ConsoleView
+        <com.stardust.autojs.core.console.ConsoleView
             android:id="@+id/console"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_task_manager.xml b/app/src/main/res/layout/fragment_task_manager.xml
index acb17cad..888ec85a 100644
--- a/app/src/main/res/layout/fragment_task_manager.xml
+++ b/app/src/main/res/layout/fragment_task_manager.xml
@@ -67,7 +67,7 @@
                 android:textSize="16sp"/>
         </FrameLayout>
 
-        <com.stardust.autojs.runtime.console.ConsoleView
+        <com.stardust.autojs.core.console.ConsoleView
             android:id="@+id/console"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleFloaty.java b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java
similarity index 99%
rename from autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleFloaty.java
rename to autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java
index b64a17a2..e51cd311 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleFloaty.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java
@@ -1,4 +1,4 @@
-package com.stardust.autojs.runtime.console;
+package com.stardust.autojs.core.console;
 
 import android.content.Context;
 import android.content.ContextWrapper;
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleView.java b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java
similarity index 98%
rename from autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleView.java
rename to autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java
index 03ce004c..48932e84 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleView.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java
@@ -1,4 +1,4 @@
-package com.stardust.autojs.runtime.console;
+package com.stardust.autojs.core.console;
 
 import android.content.Context;
 import android.support.annotation.Nullable;
@@ -21,7 +21,6 @@ import com.stardust.enhancedfloaty.ResizableExpandableFloatyWindow;
 import com.stardust.util.SparseArrayEntries;
 
 import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Created by Stardust on 2017/5/2.
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/console/GlobalStardustConsole.java b/autojs/src/main/java/com/stardust/autojs/core/console/GlobalStardustConsole.java
similarity index 91%
rename from autojs/src/main/java/com/stardust/autojs/runtime/console/GlobalStardustConsole.java
rename to autojs/src/main/java/com/stardust/autojs/core/console/GlobalStardustConsole.java
index bb688274..19aea2e7 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/console/GlobalStardustConsole.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/console/GlobalStardustConsole.java
@@ -1,10 +1,7 @@
-package com.stardust.autojs.runtime.console;
+package com.stardust.autojs.core.console;
 
-import android.graphics.Color;
-import android.util.Log;
 import android.util.SparseArray;
 
-import com.stardust.autojs.runtime.api.Console;
 import com.stardust.util.UiHandler;
 
 import java.text.SimpleDateFormat;
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/NoOpConsole.java b/autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java
similarity index 96%
rename from autojs/src/main/java/com/stardust/autojs/runtime/api/NoOpConsole.java
rename to autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java
index 87c9574d..cbb09941 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/NoOpConsole.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java
@@ -1,4 +1,4 @@
-package com.stardust.autojs.runtime.api;
+package com.stardust.autojs.core.console;
 
 import android.support.annotation.Nullable;
 
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/console/StardustConsole.java b/autojs/src/main/java/com/stardust/autojs/core/console/StardustConsole.java
similarity index 98%
rename from autojs/src/main/java/com/stardust/autojs/runtime/console/StardustConsole.java
rename to autojs/src/main/java/com/stardust/autojs/core/console/StardustConsole.java
index eaaa419c..1045f271 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/console/StardustConsole.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/console/StardustConsole.java
@@ -1,4 +1,4 @@
-package com.stardust.autojs.runtime.console;
+package com.stardust.autojs.core.console;
 
 import android.content.Context;
 import android.content.Intent;
@@ -15,9 +15,6 @@ import com.stardust.enhancedfloaty.ResizableExpandableFloatyWindow;
 import com.stardust.util.UiHandler;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/autojs/src/main/res/layout/floating_console_expand.xml b/autojs/src/main/res/layout/floating_console_expand.xml
index adb18c44..0a592b8c 100644
--- a/autojs/src/main/res/layout/floating_console_expand.xml
+++ b/autojs/src/main/res/layout/floating_console_expand.xml
@@ -68,7 +68,7 @@
 
         </LinearLayout>
 
-        <com.stardust.autojs.runtime.console.ConsoleView
+        <com.stardust.autojs.core.console.ConsoleView
             android:id="@+id/console"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/rt/AutoJs.java b/inrt/src/main/java/com/stardust/auojs/inrt/rt/AutoJs.java
index 89eb6076..13d61da7 100644
--- a/inrt/src/main/java/com/stardust/auojs/inrt/rt/AutoJs.java
+++ b/inrt/src/main/java/com/stardust/auojs/inrt/rt/AutoJs.java
@@ -24,11 +24,11 @@ import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.autojs.runtime.api.AbstractShell;
 import com.stardust.autojs.runtime.api.AppUtils;
 import com.stardust.autojs.runtime.api.Console;
-import com.stardust.autojs.runtime.api.NoOpConsole;
+import com.stardust.autojs.core.console.NoOpConsole;
 import com.stardust.autojs.runtime.api.Shell;
 import com.stardust.autojs.runtime.api.image.ScreenCaptureRequestActivity;
 import com.stardust.autojs.runtime.api.image.ScreenCaptureRequester;
-import com.stardust.autojs.runtime.console.StardustConsole;
+import com.stardust.autojs.core.console.StardustConsole;
 import com.stardust.autojs.runtime.exception.ScriptException;
 import com.stardust.autojs.script.AutoFileSource;
 import com.stardust.autojs.script.JavaScriptSource;