diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/RootTool.java b/app/src/main/java/com/stardust/scriptdroid/tool/RootTool.java index 4ee2b8ea..da5830e9 100644 --- a/app/src/main/java/com/stardust/scriptdroid/tool/RootTool.java +++ b/app/src/main/java/com/stardust/scriptdroid/tool/RootTool.java @@ -1,5 +1,6 @@ package com.stardust.scriptdroid.tool; +import com.stardust.autojs.core.util.ProcessShell; import com.stericson.RootShell.RootShell; /** @@ -16,4 +17,29 @@ public class RootTool { return false; } } + + private static final String cmd = "enabled=$(settings get system pointer_location)\n" + + "pkg=%s\n" + + "if [[ $enabled == 1 ]]\n" + + "then\n" + + "settings put system pointer_location 0\n" + + "else\n" + + "settings put system pointer_location 1\n" + + "fi\n"; + + public static void togglePointerLocation() { + try { + ProcessShell.execCommand(cmd, true); + } catch (Exception ignored) { + ignored.printStackTrace(); + } + } + + public static void setPointerLocationEnabled(boolean enabled) { + try { + ProcessShell.execCommand("settings put system pointer_location " + (enabled ? 1 : 0), true); + } catch (Exception ignored) { + + } + } } diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java b/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java index c3f23d60..c03c47a8 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java @@ -79,6 +79,7 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp private Context mContext; private GlobalActionRecorder mRecorder; private MaterialDialog mSettingsDialog; + private MaterialDialog mLayoutInspectDialog; private String mRunningPackage, mRunningActivity; private Deferred mCaptureDeferred; @@ -182,10 +183,25 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp mRecorder.stop(); } + @Optional + @OnClick(R.id.layout_inspect) + void inspectLayout() { + mWindow.collapse(); + mLayoutInspectDialog = new OperationDialogBuilder(mContext) + .item(R.id.layout_bounds, R.drawable.ic_circular_menu_bounds, R.string.text_inspect_layout_bounds) + .item(R.id.layout_hierarchy, R.drawable.ic_circular_menu_hierarchy, + R.string.text_inspect_layout_hierarchy) + .bindItemClick(this) + .title(R.string.text_inspect_layout) + .build(); + DialogUtils.showDialog(mLayoutInspectDialog); + } + @Optional @OnClick(R.id.layout_bounds) void showLayoutBounds() { - mWindow.collapse(); + mLayoutInspectDialog.dismiss(); + mLayoutInspectDialog = null; if (!ensureCapture()) { return; } @@ -200,7 +216,8 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp @Optional @OnClick(R.id.layout_hierarchy) void showLayoutHierarchy() { - mWindow.collapse(); + mLayoutInspectDialog.dismiss(); + mLayoutInspectDialog = null; if (!ensureCapture()) { return; } @@ -212,6 +229,15 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp } + + @Optional + @OnClick(R.id.stop_all_scripts) + void stopAllScripts() { + mWindow.collapse(); + AutoJs.getInstance().getScriptEngineService().stopAllAndToast(); + } + + @Override public void onCaptureAvailable(NodeInfo capture) { if (mCaptureDeferred != null && mCaptureDeferred.isPending()) @@ -250,6 +276,7 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp .item(R.id.class_name, R.drawable.ic_ali_android, mContext.getString(R.string.text_current_activity) + mRunningActivity) .item(R.id.open_launcher, R.drawable.ic_android_eat_js, R.string.text_open_main_activity) + .item(R.id.pointer_location, R.drawable.ic_zoom_out_map_white_24dp, R.string.text_pointer_location) .item(R.id.exit, R.drawable.ic_close_white_48dp, R.string.text_exit_floating_window) .bindItemClick(this) .title(R.string.text_more) @@ -265,6 +292,7 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp AccessibilityServiceTool.enableAccessibilityService(); } + private void dismissSettingsDialog() { if (mSettingsDialog == null) return; @@ -300,6 +328,12 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); } + @Optional + @OnClick(R.id.pointer_location) + void togglePointerLocation() { + dismissSettingsDialog(); + RootTool.togglePointerLocation(); + } @Optional @OnClick(R.id.exit) diff --git a/app/src/main/res/drawable-hdpi/ic_zoom_out_map_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_zoom_out_map_white_24dp.png new file mode 100644 index 00000000..141adc87 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_zoom_out_map_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_zoom_out_map_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_zoom_out_map_white_24dp.png new file mode 100644 index 00000000..b707939e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_zoom_out_map_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_zoom_out_map_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_zoom_out_map_white_24dp.png new file mode 100644 index 00000000..2182249e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_zoom_out_map_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_zoom_out_map_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_zoom_out_map_white_24dp.png new file mode 100644 index 00000000..e85a8168 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_zoom_out_map_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_zoom_out_map_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_zoom_out_map_white_24dp.png new file mode 100644 index 00000000..470a6f48 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_zoom_out_map_white_24dp.png differ diff --git a/app/src/main/res/layout/circular_action_menu.xml b/app/src/main/res/layout/circular_action_menu.xml index 8683d964..95a7332a 100644 --- a/app/src/main/res/layout/circular_action_menu.xml +++ b/app/src/main/res/layout/circular_action_menu.xml @@ -29,26 +29,24 @@ android:src="@drawable/ic_ali_record"/> + android:src="@drawable/ic_circular_menu_bounds"/> + android:padding="8dp" + android:src="@drawable/ic_close_white_48dp"/> + android:src="@drawable/ic_circular_menu_settings"/> \ No newline at end of file diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index 518e7de3..cb558626 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -8,4 +8,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2c1d3716..4364203b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -351,4 +351,8 @@ 正则表达式不能向前查找 通知 打包插件版本过低，打包的应用可能无法正常运行。是否立即下载对应版本的打包插件？ + 布局范围分析 + 布局层次分析 + 布局分析 + 指针位置[Root]