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

api: floaty

Browse Source
This commit is contained in:
hyb1996
2017-12-30 15:23:48 +08:00
parent f39516a4b4
commit 6d9fda6862
15 changed files with 142 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
autojs/src/main/assets/modules/__ui__.js
View File

@@ -75,7 +75,15 @@ module.exports = function(__runtime__, scope){
}
view.longClick = function(listener){
if(listener){
view.setOnLongClickListener(new android.view.View.OnLongClickListener(listener));
view.setOnLongClickListener(new android.view.View.OnLongClickListener(function(view){
try{
var r = listener(view);
return !!r;
}catch(e){
console.error(e.getMessage());
return false;
}
}));
}else{
view.performLongClick();
}

2
autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java
View File

@@ -179,8 +179,6 @@ public class ScriptEngineService {
int n = stopAll();
if (n > 0)
mUiHandler.toast(String.format(mContext.getString(R.string.text_already_stop_n_scripts), n));
else
mUiHandler.toast(mContext.getString(R.string.text_no_running_script));
}
public Set<ScriptEngine> getEngines() {

5
autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java
View File

@@ -17,6 +17,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.stardust.autojs.R;
import com.stardust.concurrent.ConcurrentArrayList;
import com.stardust.enhancedfloaty.ResizableExpandableFloatyWindow;
import com.stardust.util.SparseArrayEntries;
@@ -24,7 +25,7 @@ import java.util.ArrayList;
/**
* Created by Stardust on 2017/5/2.
*
* <p>
* TODO: 优化为无锁形式
*/
public class ConsoleView extends FrameLayout implements StardustConsole.LogListener {
@@ -153,7 +154,7 @@ public class ConsoleView extends FrameLayout implements StardustConsole.LogListe
return;
int oldSize = mLogs.size();
ArrayList<StardustConsole.Log> logs = mConsole.getAllLogs();
synchronized (logs) {
synchronized (mConsole.getAllLogs()) {
final int size = logs.size();
if (size == 0) {
return;

2
autojs/src/main/java/com/stardust/autojs/core/console/StardustConsole.java
View File

@@ -2,7 +2,6 @@ package com.stardust.autojs.core.console;
import android.content.Context;
import android.content.Intent;
import android.os.Looper;
import android.support.annotation.NonNull;
import android.view.WindowManager;
@@ -11,6 +10,7 @@ import com.stardust.autojs.annotation.ScriptInterface;
import com.stardust.autojs.runtime.api.AbstractConsole;
import com.stardust.autojs.runtime.api.Console;
import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
import com.stardust.concurrent.ConcurrentArrayList;
import com.stardust.enhancedfloaty.FloatyService;
import com.stardust.enhancedfloaty.ResizableExpandableFloatyWindow;
import com.stardust.util.UiHandler;

8
autojs/src/main/java/com/stardust/autojs/core/floaty/FloatyWindow.java
View File

@@ -23,6 +23,7 @@ public class FloatyWindow extends ResizableFloatyWindow {
private boolean mCreated = false;
private View mMoveCursor;
private View mResizer;
private View mCloseButton;
private MyFloaty mFloaty;
@@ -59,15 +60,22 @@ public class FloatyWindow extends ResizableFloatyWindow {
View root = (View) mView.getParent().getParent();
mMoveCursor = root.findViewById(R.id.move_cursor);
mResizer = root.findViewById(R.id.resizer);
mCloseButton = root.findViewById(R.id.close);
}
public void setOnCloseButtonClickListener(View.OnClickListener listener){
mCloseButton.setOnClickListener(listener);
}
public void setAdjustEnabled(boolean enabled) {
if (!enabled) {
mMoveCursor.setVisibility(View.GONE);
mResizer.setVisibility(View.GONE);
mCloseButton.setVisibility(View.GONE);
} else {
mMoveCursor.setVisibility(View.VISIBLE);
mResizer.setVisibility(View.VISIBLE);
mCloseButton.setVisibility(View.VISIBLE);
}
}

1
autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java
View File

@@ -1,6 +1,7 @@
package com.stardust.autojs.core.inputevent;
import android.content.Context;
import android.os.Build;
import android.os.SystemClock;
import android.support.annotation.Nullable;
import android.view.ViewConfiguration;

1
autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java
View File

@@ -17,6 +17,7 @@ import com.stardust.pio.UncheckedIOException;
import org.mozilla.javascript.Callable;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ContextFactory;
import org.mozilla.javascript.ErrorReporter;
import org.mozilla.javascript.ImporterTopLevel;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;

6
autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java
View File

@@ -188,7 +188,7 @@ public class ScriptRuntime {
engines = new Engines(builder.mEngineService);
dialogs = new Dialogs(app, uiHandler, bridges);
device = new Device(uiHandler.getContext());
floaty = new Floaty(uiHandler, ui);
floaty = new Floaty(uiHandler, ui, this);
}
public void init() {
@@ -295,7 +295,9 @@ public class ScriptRuntime {
public void exit() {
mThread.interrupt();
throw new ScriptInterruptedException();
if (Looper.myLooper() != Looper.getMainLooper()) {
throw new ScriptInterruptedException();
}
}
@Deprecated

35
autojs/src/main/java/com/stardust/autojs/runtime/api/Floaty.java
View File

@@ -10,22 +10,15 @@ import com.stardust.autojs.R;
import com.stardust.autojs.core.floaty.FloatyWindow;
import com.stardust.autojs.core.ui.JsLayoutInflater;
import com.stardust.autojs.core.ui.JsViewHelper;
import com.stardust.autojs.rhino.ProxyObject;
import com.stardust.autojs.runtime.ScriptRuntime;
import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
import com.stardust.concurrent.VolatileDispose;
import com.stardust.enhancedfloaty.FloatyService;
import com.stardust.util.UiHandler;
import com.stardust.util.ViewUtil;
import org.mozilla.javascript.NativeJavaObject;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
import org.mozilla.javascript.UniqueTag;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
/**
@@ -38,9 +31,11 @@ public class Floaty {
private Context mContext;
private UiHandler mUiHandler;
private Set<JsFloatyWindow> mWindows = new HashSet<>();
private ScriptRuntime mRuntime;
public Floaty(UiHandler uiHandler, UI ui) {
public Floaty(UiHandler uiHandler, UI ui, ScriptRuntime runtime) {
mUiHandler = uiHandler;
mRuntime = runtime;
mContext = new ContextThemeWrapper(mUiHandler.getContext(), R.style.AppTheme);
mJsLayoutInflater = ui.getJsLayoutInflater();
}
@@ -69,20 +64,16 @@ public class Floaty {
Iterator<JsFloatyWindow> iterator = mWindows.iterator();
while (iterator.hasNext()) {
JsFloatyWindow window = iterator.next();
if (Looper.myLooper() == Looper.getMainLooper()) {
window.mWindow.close();
} else {
mUiHandler.post(() -> window.mWindow.close());
}
window.close();
iterator.remove();
}
}
public class JsFloatyWindow {
private Map<String, View> mViewCache = new HashMap<>();
private View mView;
private FloatyWindow mWindow;
private boolean mExitOnClose = false;
public JsFloatyWindow(View view) {
mWindow = new FloatyWindow(view);
@@ -91,6 +82,7 @@ public class Floaty {
FloatyService.addWindow(mWindow);
});
mWindow.waitFor();
mWindow.setOnCloseButtonClickListener(v -> close());
//setSize(mWindow.getWindowBridge().getScreenWidth() / 2, mWindow.getWindowBridge().getScreenHeight() / 2);
mView = view;
}
@@ -108,17 +100,17 @@ public class Floaty {
}
public int getWidth() {
return mWindow.getWindowBridge().getWidth();
return mWindow.getRootView().getWidth();
}
public int getHeight() {
return mWindow.getWindowBridge().getHeight();
return mWindow.getRootView().getHeight();
}
public void setSize(int w, int h) {
if (Looper.myLooper() == Looper.getMainLooper()) {
ViewUtil.setViewMeasure(mWindow.getRootView(), w, h);
// mWindow.getWindowBridge().updateMeasure(w, h);
// mWindow.getWindowBridge().updateMeasure(w, h);
} else {
mUiHandler.post(() -> {
ViewUtil.setViewMeasure(mWindow.getRootView(), w, h);
@@ -147,6 +139,10 @@ public class Floaty {
return mWindow.isAdjustEnabled();
}
public void exitOnClose() {
mExitOnClose = true;
}
public void close() {
if (!mWindows.remove(this)) {
return;
@@ -156,6 +152,9 @@ public class Floaty {
} else {
mUiHandler.post(() -> mWindow.close());
}
if (mExitOnClose) {
mRuntime.exit();
}
}
}

41
autojs/src/main/res/layout/floaty_window.xml
View File

@@ -1,42 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="12dp">
</FrameLayout>
<ImageView
android:id="@+id/resizer"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_gravity="bottom|right"
android:background="@drawable/circle_cool_black"
android:padding="6dp"
android:scaleType="fitXY"
android:src="@drawable/ic_resizer"
android:tint="@android:color/white"
android:visibility="gone"/>
android:visibility="gone"
tools:visibility="visible"/>
<ImageView
android:id="@+id/close"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_gravity="top|right"
android:background="@drawable/circle_cool_black"
android:padding="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic_close_white_24dp"
android:tint="@android:color/white"
android:visibility="gone"
tools:visibility="visible"/>
<ImageView
android:id="@+id/move_cursor"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_gravity="top|left"
android:background="@drawable/circle_cool_black"
android:padding="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic_move_cursor"
android:tint="@android:color/white"
android:visibility="gone"/>
android:visibility="gone"
tools:visibility="visible"/>
</RelativeLayout>
</FrameLayout>