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

6.7.0 - Alpha18 - Fine tuning

Browse Source
This commit is contained in:
SuperMonster003
2026-01-28 17:24:29 +08:00
parent 148d347ed5
commit 6e6d288c34
9 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/autojs/autojs/permission/PostNotificationsPermission.kt
View File

@@ -86,7 +86,7 @@ class PostNotificationsPermission(override val context: Context) : PermissionIte
} }
// First request (or still allowed without rationale). // First request (or still allowed without rationale).
// zh-CN: 首次请求 (或无需 rationale 也允许再次请求)时直接发起系统权限请求. // zh-CN: 首次请求 (或无需 rationale 也允许再次请求) 时直接发起系统权限请求.
launchRequest() launchRequest()
return true return true
} }

26
app/src/main/java/org/autojs/autojs/ui/main/FloatingActionMenu.java
View File

@@ -22,6 +22,7 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import io.reactivex.subjects.PublishSubject; import io.reactivex.subjects.PublishSubject;
import org.autojs.autojs6.R; import org.autojs.autojs6.R;
import org.jetbrains.annotations.NotNull;
/** /**
* Created by Stardust on Sep 24, 2017. * Created by Stardust on Sep 24, 2017.
@@ -54,6 +55,7 @@ public class FloatingActionMenu extends FrameLayout implements View.OnClickListe
private OnFloatingActionButtonClickListener mOnFloatingActionButtonClickListener; private OnFloatingActionButtonClickListener mOnFloatingActionButtonClickListener;
private View mToggleFab; private View mToggleFab;
private int[] mToggleFabLoc;
public FloatingActionMenu(@NonNull Context context) { public FloatingActionMenu(@NonNull Context context) {
super(context); super(context);
@@ -110,8 +112,9 @@ public class FloatingActionMenu extends FrameLayout implements View.OnClickListe
mOnFloatingActionButtonClickListener = listener; mOnFloatingActionButtonClickListener = listener;
} }
public void setToggleFab(@Nullable View toggleFab) { public void setToggleFab(@Nullable View toggleFab, int @NotNull [] locFab) {
mToggleFab = toggleFab; mToggleFab = toggleFab;
mToggleFabLoc = locFab;
} }
@Override @Override
@@ -190,29 +193,28 @@ public class FloatingActionMenu extends FrameLayout implements View.OnClickListe
FloatingActionMenu thisMenu = this; FloatingActionMenu thisMenu = this;
mOverlay = new View(context) { mOverlay = new View(context) {
private final int[] loc = new int[2];
private final Rect menuRectOnScreen = new Rect(); private final Rect menuRectOnScreen = new Rect();
private final Rect toggleFabRectOnScreen = new Rect(); private final Rect toggleFabRectOnScreen = new Rect();
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
@Override @Override
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
thisMenu.getLocationOnScreen(loc); int[] locMenu = new int[2];
thisMenu.getLocationOnScreen(locMenu);
menuRectOnScreen.set( menuRectOnScreen.set(
loc[0], locMenu[0],
loc[1], locMenu[1],
loc[0] + thisMenu.getWidth(), locMenu[0] + thisMenu.getWidth(),
loc[1] + thisMenu.getHeight() locMenu[1] + thisMenu.getHeight()
); );
boolean hasToggleFab = (mToggleFab != null) && mToggleFab.isShown(); boolean hasToggleFab = (mToggleFab != null) && mToggleFab.isShown();
if (hasToggleFab) { if (hasToggleFab) {
mToggleFab.getLocationOnScreen(loc);
toggleFabRectOnScreen.set( toggleFabRectOnScreen.set(
loc[0], mToggleFabLoc[0],
loc[1], mToggleFabLoc[1],
loc[0] + mToggleFab.getWidth(), mToggleFabLoc[0] + mToggleFab.getWidth(),
loc[1] + mToggleFab.getHeight() mToggleFabLoc[1] + mToggleFab.getHeight()
); );
} else { } else {
toggleFabRectOnScreen.setEmpty(); toggleFabRectOnScreen.setEmpty();

26
app/src/main/java/org/autojs/autojs/ui/main/plugin/PluginFloatingActionMenu.java
View File

@@ -22,6 +22,7 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import io.reactivex.subjects.PublishSubject; import io.reactivex.subjects.PublishSubject;
import org.autojs.autojs6.R; import org.autojs.autojs6.R;
import org.jetbrains.annotations.NotNull;
/** /**
* Created by SuperMonster003 on Jan 17, 2026. * Created by SuperMonster003 on Jan 17, 2026.
@@ -49,6 +50,7 @@ public class PluginFloatingActionMenu extends FrameLayout implements View.OnClic
private OnFloatingActionButtonClickListener mOnFloatingActionButtonClickListener; private OnFloatingActionButtonClickListener mOnFloatingActionButtonClickListener;
private View mToggleFab; private View mToggleFab;
private int[] mToggleFabLoc;
public PluginFloatingActionMenu(@NonNull Context context) { public PluginFloatingActionMenu(@NonNull Context context) {
super(context); super(context);
@@ -105,8 +107,9 @@ public class PluginFloatingActionMenu extends FrameLayout implements View.OnClic
mOnFloatingActionButtonClickListener = listener; mOnFloatingActionButtonClickListener = listener;
} }
public void setToggleFab(@Nullable View toggleFab) { public void setToggleFab(@Nullable View toggleFab, int @NotNull [] locFab) {
mToggleFab = toggleFab; mToggleFab = toggleFab;
mToggleFabLoc = locFab;
} }
@Override @Override
@@ -185,29 +188,28 @@ public class PluginFloatingActionMenu extends FrameLayout implements View.OnClic
PluginFloatingActionMenu thisMenu = this; PluginFloatingActionMenu thisMenu = this;
mOverlay = new View(context) { mOverlay = new View(context) {
private final int[] loc = new int[2];
private final Rect menuRectOnScreen = new Rect(); private final Rect menuRectOnScreen = new Rect();
private final Rect toggleFabRectOnScreen = new Rect(); private final Rect toggleFabRectOnScreen = new Rect();
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
@Override @Override
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
thisMenu.getLocationOnScreen(loc); int[] locMenu = new int[2];
thisMenu.getLocationOnScreen(locMenu);
menuRectOnScreen.set( menuRectOnScreen.set(
loc[0], locMenu[0],
loc[1], locMenu[1],
loc[0] + thisMenu.getWidth(), locMenu[0] + thisMenu.getWidth(),
loc[1] + thisMenu.getHeight() locMenu[1] + thisMenu.getHeight()
); );
boolean hasToggleFab = (mToggleFab != null) && mToggleFab.isShown(); boolean hasToggleFab = (mToggleFab != null) && mToggleFab.isShown();
if (hasToggleFab) { if (hasToggleFab) {
mToggleFab.getLocationOnScreen(loc);
toggleFabRectOnScreen.set( toggleFabRectOnScreen.set(
loc[0], mToggleFabLoc[0],
loc[1], mToggleFabLoc[1],
loc[0] + mToggleFab.getWidth(), mToggleFabLoc[0] + mToggleFab.getWidth(),
loc[1] + mToggleFab.getHeight() mToggleFabLoc[1] + mToggleFab.getHeight()
); );
} else { } else {
toggleFabRectOnScreen.setEmpty(); toggleFabRectOnScreen.setEmpty();

4
app/src/main/java/org/autojs/autojs/ui/main/plugin/PluginFragment.kt
View File

@@ -100,6 +100,8 @@ class PluginFragment : ViewPagerFragment(0), OnFloatingActionButtonClickListener
private fun initFloatingActionMenuIfNeeded(fab: FloatingActionButton): PluginFloatingActionMenu { private fun initFloatingActionMenuIfNeeded(fab: FloatingActionButton): PluginFloatingActionMenu {
return mFloatingActionMenu ?: requireActivity().findViewById<PluginFloatingActionMenu>(R.id.plugin_floating_action_menu).also { menu -> return mFloatingActionMenu ?: requireActivity().findViewById<PluginFloatingActionMenu>(R.id.plugin_floating_action_menu).also { menu ->
val locFab = IntArray(2)
fab.getLocationOnScreen(locFab)
menu.state menu.state
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(object : SimpleObserver<Boolean?>() { .subscribe(object : SimpleObserver<Boolean?>() {
@@ -114,7 +116,7 @@ class PluginFragment : ViewPagerFragment(0), OnFloatingActionButtonClickListener
menu.layoutParams.runCatching { menu.layoutParams.runCatching {
javaClass.getField("bottomMargin").setInt(this, fab.marginBottom) javaClass.getField("bottomMargin").setInt(this, fab.marginBottom)
} }
menu.setToggleFab(fab) menu.setToggleFab(fab, locFab)
mFloatingActionMenu = menu mFloatingActionMenu = menu
} }
} }

4
app/src/main/java/org/autojs/autojs/ui/main/scripts/ExplorerFragment.kt
View File

@@ -125,6 +125,8 @@ class ExplorerFragment : ViewPagerFragment(0), OnFloatingActionButtonClickListen
private fun initFloatingActionMenuIfNeeded(fab: FloatingActionButton): FloatingActionMenu { private fun initFloatingActionMenuIfNeeded(fab: FloatingActionButton): FloatingActionMenu {
return mFloatingActionMenu ?: requireActivity().findViewById<FloatingActionMenu>(R.id.floating_action_menu).also { menu -> return mFloatingActionMenu ?: requireActivity().findViewById<FloatingActionMenu>(R.id.floating_action_menu).also { menu ->
val locFab = IntArray(2)
fab.getLocationOnScreen(locFab)
menu.state menu.state
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(object : SimpleObserver<Boolean?>() { .subscribe(object : SimpleObserver<Boolean?>() {
@@ -139,7 +141,7 @@ class ExplorerFragment : ViewPagerFragment(0), OnFloatingActionButtonClickListen
menu.layoutParams.runCatching { menu.layoutParams.runCatching {
javaClass.getField("bottomMargin").setInt(this, fab.marginBottom) javaClass.getField("bottomMargin").setInt(this, fab.marginBottom)
} }
menu.setToggleFab(fab) menu.setToggleFab(fab, locFab)
mFloatingActionMenu = menu mFloatingActionMenu = menu
} }
} }

4
gradle/data/agp-releases.list
View File

@@ -1,5 +1,5 @@
#Fri Jan 16 16:31:36 GMT+8 2026 #Tue Jan 27 22:23:42 GMT+8 2026
9.1.0-alpha05 9.1.0-alpha06
9.0.0 9.0.0
8.13.2 8.13.2
8.12.3 8.12.3

3
gradle/data/android-studio-build-version.properties
View File

@@ -1,4 +1,5 @@
#Fri Jan 16 15:48:07 GMT+8 2026 #Tue Jan 27 22:22:32 GMT+8 2026
253.29346.138.2532.14775144=2025.3.2.1
253.29346.138.2531.14721781=2025.3.1.5 253.29346.138.2531.14721781=2025.3.1.5
253.29346.138.2531.14682307=2025.3.1.4 253.29346.138.2531.14682307=2025.3.1.4
253.29346.138.2531.14653457=2025.3.1.3 253.29346.138.2531.14653457=2025.3.1.3

3
gradle/wrappers/g8/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,7 @@
#Tue Jan 27 22:22:08 GMT+8 2026
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

6
version.properties
View File

@@ -1,5 +1,5 @@
#Wed Jan 28 15:47:25 CST 2026 #Wed Jan 28 17:23:27 CST 2026
BUILD_TIME=1769586445990 BUILD_TIME=1769592207672
COMPILE_SDK_VERSION=36 COMPILE_SDK_VERSION=36
IMAGE_QUANT_CMAKE_VERSION=3.22.1 IMAGE_QUANT_CMAKE_VERSION=3.22.1
IMAGE_QUANT_NDK_VERSION=26.1.10909125 IMAGE_QUANT_NDK_VERSION=26.1.10909125
@@ -27,6 +27,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13
RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3
TARGET_SDK_VERSION=36 TARGET_SDK_VERSION=36
TARGET_SDK_VERSION_INRT=29 TARGET_SDK_VERSION_INRT=29
VERSION_BUILD=3664 VERSION_BUILD=3665
VERSION_NAME=6.7.0 Alpha18 VERSION_NAME=6.7.0 Alpha18
VSCODE_EXT_REQUIRED_VERSION=1.0.13 VSCODE_EXT_REQUIRED_VERSION=1.0.13