From 95f5ba6308dab152ceb3256acbd21363e3156193 Mon Sep 17 00:00:00 2001 From: SuperMonster003 Date: Mon, 26 Jan 2026 20:15:57 +0800 Subject: [PATCH] =?UTF-8?q?6.7.0=20-=20Alpha18=20-=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=8B=AC=E7=AB=8B=E9=A1=B5=E9=9D=A2=E9=80=80?= =?UTF-8?q?=E5=87=BA=E6=97=B6=E5=AF=BC=E8=87=B4=E5=BA=94=E7=94=A8=E5=B4=A9?= =?UTF-8?q?=E6=BA=83=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changelog/lang_zh-Hans.json | 2 +- .../autojs/ui/doc/DocumentationActivity.kt | 23 ++++++++++++++++--- .../org/autojs/autojs/ui/main/MainActivity.kt | 10 ++++---- app/src/main/res/values-zh-rHK/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values-zh/strings.xml | 2 +- version.properties | 6 ++--- 7 files changed, 32 insertions(+), 15 deletions(-) diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json index 7df63d1f..0dbb4393 100644 --- a/.changelog/lang_zh-Hans.json +++ b/.changelog/lang_zh-Hans.json @@ -1,7 +1,7 @@ { "$data": { "v6.7.0": { - "released_date": "2026/01/24", + "released_date": "2026/01/26", "feature": [ "插件中心功能, 支持插件的安装/卸载/更新等操作 (入口: 主页抽屉按钮/主页标签页)", "Paddle OCR (PP-OCRv5) 插件, 用于光学字符识别", diff --git a/app/src/main/java/org/autojs/autojs/ui/doc/DocumentationActivity.kt b/app/src/main/java/org/autojs/autojs/ui/doc/DocumentationActivity.kt index 16927b33..9da1460f 100644 --- a/app/src/main/java/org/autojs/autojs/ui/doc/DocumentationActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/doc/DocumentationActivity.kt @@ -3,10 +3,12 @@ package org.autojs.autojs.ui.doc import android.os.Bundle import android.webkit.WebView import androidx.activity.OnBackPressedCallback +import org.autojs.autojs.event.BackPressedHandler import org.autojs.autojs.ui.BaseActivity import org.autojs.autojs.util.DocsUtils.getUrl import org.autojs.autojs.util.ViewUtils import org.autojs.autojs.util.WebViewUtils +import org.autojs.autojs6.R import org.autojs.autojs6.databinding.ActivityDocumentationBinding import org.intellij.lang.annotations.Language @@ -17,6 +19,10 @@ import org.intellij.lang.annotations.Language */ class DocumentationActivity : BaseActivity() { + override val handleStatusBarThemeColorAutomatically = false + + private val mBackPressedHandler = BackPressedHandler.Observer() + private val mOnBackPressedCallback = object : OnBackPressedCallback(true) { // override fun onBackPressed() { @@ -30,12 +36,18 @@ class DocumentationActivity : BaseActivity() { override fun handleOnBackPressed() { if (mWebView.canGoBack()) { mWebView.goBack() - } else { - onBackPressedDispatcher.onBackPressed() + return } + + if (mBackPressedHandler.onBackPressed(this@DocumentationActivity)) { + return + } + + isEnabled = false + onBackPressedDispatcher.onBackPressed() + isEnabled = true } } - override val handleStatusBarThemeColorAutomatically = false private lateinit var mWebView: WebView @@ -60,6 +72,11 @@ class DocumentationActivity : BaseActivity() { } } + handleBackPressedHandlerAndCallback() + } + + private fun handleBackPressedHandlerAndCallback() { + mBackPressedHandler.registerHandler(BackPressedHandler.DoublePressExit(this, R.string.text_press_again_to_exit)) onBackPressedDispatcher.addCallback(this, mOnBackPressedCallback) } diff --git a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.kt b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.kt index 15305889..7b3dd5a5 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.kt @@ -102,7 +102,7 @@ class MainActivity : BaseActivity(), DelegateHost, HostActivity { // 2. Then, let the global Observer handle it (DrawerAutoClose / DoublePressExit). // zh-CN: 再给全局 Observer 处理 (DrawerAutoClose / DoublePressExit). - if (mBackPressObserver.onBackPressed(this@MainActivity)) { + if (mBackPressedObserver.onBackPressed(this@MainActivity)) { return } @@ -125,7 +125,7 @@ class MainActivity : BaseActivity(), DelegateHost, HostActivity { private val mActivityResultMediator = OnActivityResultDelegate.Mediator() private val mRequestPermissionCallbacks = RequestPermissionCallbacks() - private val mBackPressObserver = BackPressedHandler.Observer() + private val mBackPressedObserver = BackPressedHandler.Observer() private val mForeGroundService = ForegroundService(this) private var mSearchViewItem: SearchViewItem? = null private val mA11yTool = AccessibilityTool(this) @@ -222,8 +222,8 @@ class MainActivity : BaseActivity(), DelegateHost, HostActivity { } private fun registerBackPressHandlers(drawerLayout: DrawerLayout) { - mBackPressObserver.registerHandler(DrawerAutoClose(drawerLayout, Gravity.START)) - mBackPressObserver.registerHandler(DoublePressExit(this, R.string.text_press_again_to_exit)) + mBackPressedObserver.registerHandler(DrawerAutoClose(drawerLayout, Gravity.START)) + mBackPressedObserver.registerHandler(DoublePressExit(this, R.string.text_press_again_to_exit)) } private fun setUpToolbar(drawerLayout: DrawerLayout) { @@ -384,7 +384,7 @@ class MainActivity : BaseActivity(), DelegateHost, HostActivity { override fun getOnActivityResultDelegateMediator() = mActivityResultMediator - override fun getBackPressedObserver() = mBackPressObserver + override fun getBackPressedObserver() = mBackPressedObserver override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_main, menu) diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d7684223..8b3603dc 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -966,7 +966,7 @@ 預設對話框內容 預設對話框標題 再按一次關閉對話框 - 再按一次退出應用 + 再按一次退出 如需關閉窗口, 可按 \"返回鍵\" 或 \"音量減鍵\" 預覽 流程日誌 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ae363641..a20358b5 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -966,7 +966,7 @@ 預設對話方塊內容 預設對話方塊標題 再按一次關閉對話方塊 - 再按一次退出應用 + 再按一次退出 如需關閉視窗, 可按 \"返回鍵\" 或 \"音量減鍵\" 預覽 流程日誌 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index d0b49544..c6b00461 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -966,7 +966,7 @@ 预设对话框内容 预设对话框标题 再按一次关闭对话框 - 再按一次退出应用 + 再按一次退出 如需关闭窗口, 可按 \"返回键\" 或 \"音量减键\" 预览 流程日志 diff --git a/version.properties b/version.properties index 9b138728..a96cdc64 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ -#Mon Jan 26 14:25:52 CST 2026 -BUILD_TIME=1769408752043 +#Mon Jan 26 20:13:03 CST 2026 +BUILD_TIME=1769429583143 COMPILE_SDK_VERSION=36 IMAGE_QUANT_CMAKE_VERSION=3.22.1 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 TARGET_SDK_VERSION=36 TARGET_SDK_VERSION_INRT=29 -VERSION_BUILD=3657 +VERSION_BUILD=3658 VERSION_NAME=6.7.0 Alpha18 VSCODE_EXT_REQUIRED_VERSION=1.0.13