tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: move package console to package core

Browse Source
This commit is contained in:
hyb1996
2017-10-22 18:40:54 +08:00
parent 38740657b8
commit e301e5952c
12 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java
View File

@@ -17,8 +17,7 @@ import com.stardust.autojs.engine.ScriptEngine;
import com.stardust.autojs.engine.ScriptEngineManager; import com.stardust.autojs.engine.ScriptEngineManager;
import com.stardust.autojs.core.accessibility.AccessibilityBridge; import com.stardust.autojs.core.accessibility.AccessibilityBridge;
import com.stardust.autojs.runtime.ScriptRuntime; import com.stardust.autojs.runtime.ScriptRuntime;
import com.stardust.autojs.runtime.api.NoOpConsole; import com.stardust.autojs.core.console.GlobalStardustConsole;
import com.stardust.autojs.runtime.console.GlobalStardustConsole;
import com.stardust.autojs.runtime.exception.ScriptException; import com.stardust.autojs.runtime.exception.ScriptException;
import com.stardust.autojs.runtime.api.AbstractShell; import com.stardust.autojs.runtime.api.AbstractShell;
import com.stardust.autojs.runtime.api.AppUtils; import com.stardust.autojs.runtime.api.AppUtils;
@@ -32,7 +31,7 @@ import com.stardust.scriptdroid.Pref;
import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.R;
import com.stardust.autojs.runtime.api.image.ScreenCaptureRequestActivity; import com.stardust.autojs.runtime.api.image.ScreenCaptureRequestActivity;
import com.stardust.autojs.runtime.api.Shell; 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.ScreenMetrics;
import com.stardust.util.Supplier; import com.stardust.util.Supplier;
import com.stardust.util.UiHandler; import com.stardust.util.UiHandler;

4
app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java
View File

@@ -7,8 +7,8 @@ import android.view.View;
import android.widget.PopupMenu; import android.widget.PopupMenu;
import android.widget.TextView; import android.widget.TextView;
import com.stardust.autojs.runtime.console.ConsoleView; import com.stardust.autojs.core.console.ConsoleView;
import com.stardust.autojs.runtime.console.StardustConsole; import com.stardust.autojs.core.console.StardustConsole;
import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.autojs.AutoJs; import com.stardust.scriptdroid.autojs.AutoJs;
import com.stardust.scriptdroid.ui.main.ViewPagerFragment; import com.stardust.scriptdroid.ui.main.ViewPagerFragment;

2
app/src/main/res/layout/activity_console.xml
View File

@@ -20,7 +20,7 @@
</android.support.design.widget.AppBarLayout> </android.support.design.widget.AppBarLayout>
<com.stardust.autojs.runtime.console.ConsoleView <com.stardust.autojs.core.console.ConsoleView
android:id="@+id/console" android:id="@+id/console"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>

2
app/src/main/res/layout/floating_console_expand.xml
View File

@@ -68,7 +68,7 @@
</LinearLayout> </LinearLayout>
<com.stardust.autojs.runtime.console.ConsoleView <com.stardust.autojs.core.console.ConsoleView
android:id="@+id/console" android:id="@+id/console"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
app/src/main/res/layout/fragment_task_manager.xml
View File

@@ -67,7 +67,7 @@
android:textSize="16sp"/> android:textSize="16sp"/>
</FrameLayout> </FrameLayout>
<com.stardust.autojs.runtime.console.ConsoleView <com.stardust.autojs.core.console.ConsoleView
android:id="@+id/console" android:id="@+id/console"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

2
autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleFloaty.java → autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java
View File

@@ -1,4 +1,4 @@
package com.stardust.autojs.runtime.console; package com.stardust.autojs.core.console;
import android.content.Context; import android.content.Context;
import android.content.ContextWrapper; import android.content.ContextWrapper;

3
autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleView.java → autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java
View File

@@ -1,4 +1,4 @@
package com.stardust.autojs.runtime.console; package com.stardust.autojs.core.console;
import android.content.Context; import android.content.Context;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
@@ -21,7 +21,6 @@ import com.stardust.enhancedfloaty.ResizableExpandableFloatyWindow;
import com.stardust.util.SparseArrayEntries; import com.stardust.util.SparseArrayEntries;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
/** /**
* Created by Stardust on 2017/5/2. * Created by Stardust on 2017/5/2.

5
autojs/src/main/java/com/stardust/autojs/runtime/console/GlobalStardustConsole.java → autojs/src/main/java/com/stardust/autojs/core/console/GlobalStardustConsole.java
View File

@@ -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 android.util.SparseArray;
import com.stardust.autojs.runtime.api.Console;
import com.stardust.util.UiHandler; import com.stardust.util.UiHandler;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;

2
autojs/src/main/java/com/stardust/autojs/runtime/api/NoOpConsole.java → autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java
View File

@@ -1,4 +1,4 @@
package com.stardust.autojs.runtime.api; package com.stardust.autojs.core.console;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;

5
autojs/src/main/java/com/stardust/autojs/runtime/console/StardustConsole.java → autojs/src/main/java/com/stardust/autojs/core/console/StardustConsole.java
View File

@@ -1,4 +1,4 @@
package com.stardust.autojs.runtime.console; package com.stardust.autojs.core.console;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -15,9 +15,6 @@ import com.stardust.enhancedfloaty.ResizableExpandableFloatyWindow;
import com.stardust.util.UiHandler; import com.stardust.util.UiHandler;
import java.util.ArrayList; 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.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;

2
autojs/src/main/res/layout/floating_console_expand.xml
View File

@@ -68,7 +68,7 @@
</LinearLayout> </LinearLayout>
<com.stardust.autojs.runtime.console.ConsoleView <com.stardust.autojs.core.console.ConsoleView
android:id="@+id/console" android:id="@+id/console"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

4
inrt/src/main/java/com/stardust/auojs/inrt/rt/AutoJs.java
View File

@@ -24,11 +24,11 @@ import com.stardust.autojs.runtime.ScriptRuntime;
import com.stardust.autojs.runtime.api.AbstractShell; import com.stardust.autojs.runtime.api.AbstractShell;
import com.stardust.autojs.runtime.api.AppUtils; import com.stardust.autojs.runtime.api.AppUtils;
import com.stardust.autojs.runtime.api.Console; 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.Shell;
import com.stardust.autojs.runtime.api.image.ScreenCaptureRequestActivity; import com.stardust.autojs.runtime.api.image.ScreenCaptureRequestActivity;
import com.stardust.autojs.runtime.api.image.ScreenCaptureRequester; 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.runtime.exception.ScriptException;
import com.stardust.autojs.script.AutoFileSource; import com.stardust.autojs.script.AutoFileSource;
import com.stardust.autojs.script.JavaScriptSource; import com.stardust.autojs.script.JavaScriptSource;