diff --git a/.readme/common.json b/.readme/common.json index 4909240f..bb2afa09 100644 --- a/.readme/common.json +++ b/.readme/common.json @@ -1,15 +1,15 @@ { - "android_studio_latest_recommended_version_name": "Android Studio Otter 2 Feature Drop | 2025.2.2 Patch 1", - "var_date_android_studio_latest_recommended_version_name": "2025/12/23", - "android_studio_latest_recommended_file_name_of_exe": "android-studio-2025.2.2.8-windows.exe", - "android_studio_latest_recommended_download_address_of_exe": "https://redirector.gvt1.com/edgedl/android/studio/install/2025.2.2.8/android-studio-2025.2.2.8-windows.exe", - "android_studio_latest_recommended_file_size_of_exe": "1.34 GiB", - "android_studio_latest_recommended_file_name_of_zip": "android-studio-2025.2.2.8-windows.zip", - "android_studio_latest_recommended_download_address_of_zip": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2025.2.2.8/android-studio-2025.2.2.8-windows.zip", - "android_studio_latest_recommended_file_size_of_zip": "1.35 GiB", - "android_studio_latest_recommended_file_name_of_tar": "android-studio-2025.2.2.8-linux.tar.gz", - "android_studio_latest_recommended_download_address_of_tar": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2025.2.2.8/android-studio-2025.2.2.8-linux.tar.gz", - "android_studio_latest_recommended_file_size_of_tar": "1.38 GiB", + "android_studio_latest_recommended_version_name": "Android Studio Otter 3 Feature Drop | 2025.2.3", + "var_date_android_studio_latest_recommended_version_name": "2026/01/15", + "android_studio_latest_recommended_file_name_of_exe": "android-studio-2025.2.3.9-windows.exe", + "android_studio_latest_recommended_download_address_of_exe": "https://edgedl.me.gvt1.com/android/studio/install/2025.2.3.9/android-studio-2025.2.3.9-windows.exe", + "android_studio_latest_recommended_file_size_of_exe": "1.35 GiB", + "android_studio_latest_recommended_file_name_of_zip": "android-studio-2025.2.3.9-windows.zip", + "android_studio_latest_recommended_download_address_of_zip": "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.2.3.9/android-studio-2025.2.3.9-windows.zip", + "android_studio_latest_recommended_file_size_of_zip": "1.36 GiB", + "android_studio_latest_recommended_file_name_of_tar": "android-studio-2025.2.3.9-linux.tar.gz", + "android_studio_latest_recommended_download_address_of_tar": "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.2.3.9/android-studio-2025.2.3.9-linux.tar.gz", + "android_studio_latest_recommended_file_size_of_tar": "1.39 GiB", "var_date_contribution_table_data_updated": "2025/12/26", "latest_rhino_engine_name_with_github_lineno_address": "[v2.0.0-SNAPSHOT](http://rhino.autojs6.com/blob/master/gradle.properties#L3)", "var_date_rhino_engine_latest_committed": "2025/12/25", diff --git a/.utils/scrape-and-inject-agp-gradle-compatibility-map.mjs b/.utils/scrape-and-inject-agp-gradle-compatibility-map.mjs index e4bd665f..7cecc666 100644 --- a/.utils/scrape-and-inject-agp-gradle-compatibility-map.mjs +++ b/.utils/scrape-and-inject-agp-gradle-compatibility-map.mjs @@ -5,7 +5,12 @@ import { findTargetRows } from './utils/puppeteer-helpers.mjs'; import { getMinSupportedAgpVersion, getMinSupportedGradleVersion } from './utils/properties.mjs'; import { updateGradleMapData } from './utils/update-helper.mjs'; -const URL = 'https://developer.android.com/build/releases/gradle-plugin#updating-gradle'; +// @Hint by SuperMonster003 on Jan 16, 2026. +// ! Invalid since Jan 16, 2026. +// ! zh-CN: 自 2026 年 1 月 16 日起无效. +// # const URL = 'https://developer.android.com/build/releases/gradle-plugin#updating-gradle'; + +const URL = 'https://developer.android.com/build/releases/about-agp'; (async function main() { const rows = await findTargetRows({ diff --git a/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt b/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt index f3bc64e6..9914c8b3 100644 --- a/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt +++ b/app/src/main/java/org/autojs/autojs/core/console/ConsoleImpl.kt @@ -257,7 +257,7 @@ open class ConsoleImpl(val uiHandler: UiHandler) : AbstractConsole() { content("$msgReason, $msgAction.") widgetThemeColor() cancelable(false) - negativeText(R.string.dialog_button_quit) + negativeText(R.string.dialog_button_abandon) negativeColorRes(R.color.dialog_button_default) positiveText(R.string.dialog_button_continue) positiveColorRes(R.color.dialog_button_attraction) diff --git a/app/src/main/java/org/autojs/autojs/runtime/api/ImageFeatureMatching.java b/app/src/main/java/org/autojs/autojs/runtime/api/ImageFeatureMatching.java index d96cdeda..8e9af8cb 100644 --- a/app/src/main/java/org/autojs/autojs/runtime/api/ImageFeatureMatching.java +++ b/app/src/main/java/org/autojs/autojs/runtime/api/ImageFeatureMatching.java @@ -332,7 +332,7 @@ public final class ImageFeatureMatching { * @param keyPoint Detected key points in the image.
* zh-CN: 在图像中检测到的关键点集. * @param corners Virtual corners of the image after scale, always [TL, TR, BL, BR]. Used for homography calculation.
- * zh-CN: 缩放后图像的虚拟四角点坐标, 按 [左上,右上,左下,右下] 顺序, 用于单应矩阵计算. + * zh-CN: 缩放后图像的虚拟四角点坐标, 按 [左上, 右上, 左下, 右下] 顺序, 用于单应矩阵计算. */ public FeatureMatchingDescriptor(Mat descriptors, MatOfKeyPoint keyPoint, MatOfPoint2f corners) { mDescriptors = descriptors; diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java b/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java index 365c8b74..87afe344 100644 --- a/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java +++ b/app/src/main/java/org/autojs/autojs/ui/floating/CircularMenu.java @@ -170,7 +170,7 @@ public class CircularMenu implements LayoutInspector.CaptureAvailableListener { DialogUtils.showDialog(new AppLevelThemeDialogBuilder(mContext) .title(mContext.getString(R.string.text_no_root_access)) .content(mContext.getString(R.string.no_root_access_for_record)) - .positiveText(R.string.dialog_button_quit) + .positiveText(R.string.dialog_button_abandon) .positiveColorRes(R.color.dialog_button_failure) .build()); } else { diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/LauncherIconPreference.kt b/app/src/main/java/org/autojs/autojs/ui/settings/LauncherIconPreference.kt index fc785924..c75e3b03 100644 --- a/app/src/main/java/org/autojs/autojs/ui/settings/LauncherIconPreference.kt +++ b/app/src/main/java/org/autojs/autojs/ui/settings/LauncherIconPreference.kt @@ -89,7 +89,7 @@ class LauncherIconPreference : MaterialListPreference, SharedPreferences.OnShare title(R.string.text_prompt) content(R.string.text_transparent_background_launcher_icon_may_not_take_effect) widgetThemeColor() - negativeText(R.string.text_quit) + negativeText(R.string.dialog_button_abandon) negativeColorRes(R.color.dialog_button_default) onNegative { dialog, _ -> dialog.dismiss().also { resetIfNeeded(R.string.key_launcher_icon_adaptive) } } positiveText(R.string.dialog_button_continue) @@ -136,7 +136,7 @@ class LauncherIconPreference : MaterialListPreference, SharedPreferences.OnShare show() } } - negativeText(R.string.text_quit) + negativeText(R.string.dialog_button_abandon) negativeColorRes(R.color.dialog_button_default) onNegative { dialog, _ -> dialog.dismiss().also { syncValueWithCurrentComponent() } } positiveText(R.string.dialog_button_continue) diff --git a/gradle/data/agp-gradle-compat.properties b/gradle/data/agp-gradle-compat.properties index 91db93db..9e4103b3 100644 --- a/gradle/data/agp-gradle-compat.properties +++ b/gradle/data/agp-gradle-compat.properties @@ -1,4 +1,5 @@ -#Wed Oct 01 21:45:47 GMT+8 2025 +#Fri Jan 16 16:23:34 GMT+8 2026 +9.0=9.1.0 8.13=8.13 8.12=8.13 8.11=8.13 diff --git a/gradle/data/agp-releases.list b/gradle/data/agp-releases.list index 24aa9f7d..ec9a5752 100644 --- a/gradle/data/agp-releases.list +++ b/gradle/data/agp-releases.list @@ -1,6 +1,6 @@ -#Sun Jan 11 23:07:21 GMT+8 2026 -9.1.0-alpha04 -9.0.0-rc03 +#Fri Jan 16 16:31:36 GMT+8 2026 +9.1.0-alpha05 +9.0.0 8.13.2 8.12.3 8.11.2 diff --git a/gradle/data/android-studio-agp-compat.properties b/gradle/data/android-studio-agp-compat.properties index a5ac47de..19b93acc 100644 --- a/gradle/data/android-studio-agp-compat.properties +++ b/gradle/data/android-studio-agp-compat.properties @@ -1,4 +1,5 @@ -#Sun Dec 07 19:51:17 GMT+8 2025 +#Fri Jan 16 15:48:25 GMT+8 2026 +2025.2.3=9.0 2025.2.2=8.13 2025.2.1=8.13 2025.1.4=8.13 diff --git a/gradle/data/android-studio-build-version.properties b/gradle/data/android-studio-build-version.properties index ccddaf4f..1866fc46 100644 --- a/gradle/data/android-studio-build-version.properties +++ b/gradle/data/android-studio-build-version.properties @@ -1,8 +1,10 @@ -#Sun Jan 11 23:06:27 GMT+8 2026 +#Fri Jan 16 15:48:07 GMT+8 2026 +253.29346.138.2531.14721781=2025.3.1.5 253.29346.138.2531.14682307=2025.3.1.4 253.29346.138.2531.14653457=2025.3.1.3 253.29346.138.2531.14643844=2025.3.1.2 253.28294.334.2531.14612490=2025.3.1.1 +252.28238.7.2523.14688667=2025.2.3.9 252.28238.7.2523.14678998=2025.2.3.8 252.28238.7.2523.14636682=2025.2.3.7 252.28238.7.2523.14608894=2025.2.3.6 diff --git a/modules/jieba-analysis/src/main/java/com/huaban/analysis/jieba/CharacterUtil.kt b/modules/jieba-analysis/src/main/java/com/huaban/analysis/jieba/CharacterUtil.kt index 4702efd0..7bf208dc 100644 --- a/modules/jieba-analysis/src/main/java/com/huaban/analysis/jieba/CharacterUtil.kt +++ b/modules/jieba-analysis/src/main/java/com/huaban/analysis/jieba/CharacterUtil.kt @@ -19,7 +19,7 @@ object CharacterUtil { fun ccFind(ch: Char) = isChineseLetter(ch) || isEnglishLetter(ch) || isDigit(ch) || isConnector(ch) /** - * 全角 to 半角,大写 to 小写 + * 全角 to 半角, 大写 to 小写 * * @param input * 输入字符