diff --git a/.readme/common.json b/.readme/common.json
index 428adbca..e812ac51 100644
--- a/.readme/common.json
+++ b/.readme/common.json
@@ -1,15 +1,15 @@
{
- "android_studio_latest_recommended_version_name": "Android Studio Otter | 2025.2.1 Patch 1",
- "var_date_android_studio_latest_recommended_version_name": "2025/11/17",
- "android_studio_latest_recommended_file_name_of_exe": "android-studio-2025.2.1.8-windows.exe",
- "android_studio_latest_recommended_download_address_of_exe": "https://redirector.gvt1.com/edgedl/android/studio/install/2025.2.1.8/android-studio-2025.2.1.8-windows.exe",
+ "android_studio_latest_recommended_version_name": "Android Studio Otter 2 Feature Drop | 2025.2.2",
+ "var_date_android_studio_latest_recommended_version_name": "2025/12/04",
+ "android_studio_latest_recommended_file_name_of_exe": "android-studio-2025.2.2.7-windows.exe",
+ "android_studio_latest_recommended_download_address_of_exe": "https://redirector.gvt1.com/edgedl/android/studio/install/2025.2.2.7/android-studio-2025.2.2.7-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.1.8-windows.zip",
- "android_studio_latest_recommended_download_address_of_zip": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2025.2.1.8/android-studio-2025.2.1.8-windows.zip",
+ "android_studio_latest_recommended_file_name_of_zip": "android-studio-2025.2.2.7-windows.zip",
+ "android_studio_latest_recommended_download_address_of_zip": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2025.2.2.7/android-studio-2025.2.2.7-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.1.8-linux.tar.gz",
- "android_studio_latest_recommended_download_address_of_tar": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2025.2.1.8/android-studio-2025.2.1.8-linux.tar.gz",
- "android_studio_latest_recommended_file_size_of_tar": "1.37 GiB",
+ "android_studio_latest_recommended_file_name_of_tar": "android-studio-2025.2.2.7-linux.tar.gz",
+ "android_studio_latest_recommended_download_address_of_tar": "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2025.2.2.7/android-studio-2025.2.2.7-linux.tar.gz",
+ "android_studio_latest_recommended_file_size_of_tar": "1.38 GiB",
"var_date_contribution_table_data_updated": "2025/09/06",
"latest_rhino_engine_name_with_github_lineno_address": "[v1.8.1-SNAPSHOT](http://rhino.autojs6.com/blob/master/gradle.properties#L3)",
"var_date_rhino_engine_latest_committed": "2025/10/05",
diff --git a/.utils/declarations/index.d.ts b/.utils/declarations/index.d.ts
index 5657b0a8..0d8557a3 100644
--- a/.utils/declarations/index.d.ts
+++ b/.utils/declarations/index.d.ts
@@ -76,6 +76,49 @@ interface FindTargetRowsOptionsBase {
interface FindTargetRowsOptions extends FindTargetRowsOptionsBase {
/** @default [] */
tableDataStructure?: Array<{ [dataItemName: TableDataStructureItemName]: TableDataStructureItem } | TableDataStructureItemName>;
+
+ /**
+ * Configuration for "expand" actions needed before searching the table.
+ * Example: { toggleSelector: 'a.exw-control' } will click Devsite's collapsible controls.
+ * zh-CN:
+ * 在查找表格前需要进行的 "展开" 动作配置.
+ * 示例: { toggleSelector: 'a.exw-control' } 将点击 Devsite 的可折叠控件.
+ */
+ expandBeforeFinding?: ExpandBeforeFindingOptions | ExpandBeforeFindingOptions[];
+}
+
+interface ExpandBeforeFindingOptions {
+ /**
+ * Optional container selector to limit the scope of operation.
+ * zh-CN: 限定作用范围容器选择器, 可选.
+ */
+ containerSelector?: string;
+ /**
+ * Selector for the "expand/collapse" button or toggle that needs to be clicked (required).
+ * zh-CN: 需要点击的 "展开/折叠" 按钮或开关的选择器 (必填).
+ */
+ toggleSelector: string;
+ /**
+ * Attribute name to determine if expanded, defaults to 'aria-expanded'.
+ * zh-CN: 判定已展开的属性名, 默认 'aria-expanded'.
+ *
+ * @default 'aria-expanded'
+ */
+ expandedAttr?: string;
+ /**
+ * Attribute value to determine if expanded, defaults to 'true'.
+ * zh-CN: 判定已展开的属性值, 默认 'true'.
+ *
+ * @default 'true'
+ */
+ expandedValue?: string;
+ /**
+ * Maximum number of targets to click, no limit by default.
+ * zh-CN: 最多点击的目标数量, 默认无限制.
+ *
+ * @default Infinity
+ */
+ maxClicks?: number;
}
interface FindTargetRowsOptionsForPageEvaluate extends FindTargetRowsOptionsBase {
diff --git a/.utils/fetch-and-parse-android-studio-agp-compatibility-table.mjs b/.utils/fetch-and-parse-android-studio-agp-compatibility-table.mjs
index 58f1ee06..4ceb52af 100644
--- a/.utils/fetch-and-parse-android-studio-agp-compatibility-table.mjs
+++ b/.utils/fetch-and-parse-android-studio-agp-compatibility-table.mjs
@@ -18,6 +18,9 @@ export async function fetchStudioAgpTable() {
// @ts-ignore
return findTargetRows({
url: URL,
+ expandBeforeFinding: {
+ toggleSelector: 'a.exw-control',
+ },
tableFilter: {
th: /Android Studio version/i,
},
diff --git a/.utils/fetch-and-parse-autojs6-merged-pr-commits-statistics.mjs b/.utils/fetch-and-parse-autojs6-merged-pr-commits-statistics.mjs
index 95c96daf..42d2b78f 100644
--- a/.utils/fetch-and-parse-autojs6-merged-pr-commits-statistics.mjs
+++ b/.utils/fetch-and-parse-autojs6-merged-pr-commits-statistics.mjs
@@ -248,7 +248,7 @@ async function getPRCommitStatsByAuthor(pr) {
* zh-CN: 要处理的输入项列表.
* @param {number} limit
* Maximum concurrency (>=1).
- * zh=CN: 最大并发数 (>=1).
+ * zh-CN: 最大并发数 (>=1).
* @param {(item: Item, idx: number) => Promise} mapper
* Async function to process one item.
* zh-CN: 处理单个项的异步函数.
diff --git a/.utils/utils/puppeteer-helpers.mjs b/.utils/utils/puppeteer-helpers.mjs
index b333f06d..9f59c29d 100644
--- a/.utils/utils/puppeteer-helpers.mjs
+++ b/.utils/utils/puppeteer-helpers.mjs
@@ -55,6 +55,66 @@ function toEncodedRegexTagOptions(options) {
return structuredClone(traverse(options));
}
+/**
+ * Try to click the "Expand" control before searching for the table.
+ * zh-CN: 在查找表格前尝试点击 "展开" 控件.
+ *
+ * @param {import('puppeteer').Page} page
+ * @param {FindTargetRowsOptions & PuppeteerOptions} options
+ * @returns {Promise} Actual number of clicks. (zh-CN: 实际点击次数.)
+ */
+async function expandContentIfNeeded(page, options) {
+ const configs = options.expandBeforeFinding;
+ if (!configs) return 0;
+
+ /** @type {ExpandBeforeFindingOptions[]} */
+ const list = Array.isArray(configs) ? configs : [ configs ];
+
+ let totalClicked = 0;
+ for (const cfg of list) {
+ if (!cfg || !cfg.toggleSelector) continue;
+ const {
+ containerSelector,
+ toggleSelector,
+ expandedAttr = 'aria-expanded',
+ expandedValue = 'true',
+ maxClicks = Infinity,
+ } = cfg;
+
+ const containerHandle = containerSelector ? await page.$(containerSelector) : null;
+ const toggles = containerHandle
+ ? await containerHandle.$$(toggleSelector)
+ : await page.$$(toggleSelector);
+
+ let clicked = 0;
+ for (const toggle of toggles) {
+ if (clicked >= maxClicks) break;
+ const isExpanded = await toggle.evaluate((el, attr, val) => {
+ const cur = el.getAttribute(attr);
+ return cur === val;
+ }, expandedAttr, expandedValue);
+ if (!isExpanded) {
+ try {
+ await toggle.click({ delay: 10 });
+ clicked++;
+ totalClicked++;
+ await sleep(200);
+ } catch {
+ /* Ignored. */
+ }
+ }
+ }
+ if (containerHandle) {
+ try {
+ await containerHandle.dispose();
+ } catch {
+ /* Ignored. */
+ }
+ }
+ }
+ return totalClicked;
+}
+
/**
* @param {Page} page
* @returns {Promise}
@@ -87,7 +147,7 @@ async function findTargetRowsWithPage(page, options = {}) {
return await page.evaluate((options, consts) => {
const regex = new RegExp(consts.regexId + String.raw`(?:(\w+):)?(.+)`);
const targets = Array.from(document.querySelectorAll(options.tableSelector ?? 'table'));
- const target = targets.find(t => {
+ const filteredTargets = targets.filter(t => {
for (const [ selector, filter ] of Object.entries(options.tableFilter ?? {})) {
const elements = Array.from(t.querySelectorAll(selector));
if (Array.isArray(filter)) {
@@ -130,11 +190,11 @@ async function findTargetRowsWithPage(page, options = {}) {
}
return true;
});
- if (!target) {
+ if (!filteredTargets.length) {
throw new Error('No target table found');
}
- const tableRows = Array.from(target.querySelectorAll(options.tableRowSelector ?? 'tbody tr'));
+ const tableRows = filteredTargets.map(target => Array.from(target.querySelectorAll(options.tableRowSelector ?? 'tbody tr'))).flat(1);
const tableDataList = [];
tableRows.forEach((tr) => {
const tableData = {};
@@ -209,8 +269,11 @@ export async function findTargetRows(options) {
let rows = null;
const deadline = Date.now() + (options.findTargetRowsTimeout ?? 30000);
while (Date.now() < deadline) {
+ await expandContentIfNeeded(page, options);
+
rows = await findTargetRowsWithPage(page, options);
if (rows && rows.length) break;
+
await autoScroll(page);
await sleep(300);
}
diff --git a/app/src/main/java/org/autojs/autojs/core/console/ConsoleFloaty.kt b/app/src/main/java/org/autojs/autojs/core/console/ConsoleFloaty.kt
index cc1c049a..ce5aabd4 100644
--- a/app/src/main/java/org/autojs/autojs/core/console/ConsoleFloaty.kt
+++ b/app/src/main/java/org/autojs/autojs/core/console/ConsoleFloaty.kt
@@ -226,7 +226,7 @@ class ConsoleFloaty(private val console: ConsoleImpl) : AbstractResizableExpanda
internal fun setCloseButton(resId: Int) {
mCloseButton?.let {
val res = console.uiHandler.applicationContext.resources
- val padding = (7 * res.displayMetrics.density).toInt()
+ val padding = (7 * res.displayMetrics.density).roundToInt()
it.post {
it.setImageDrawable(ResourcesCompat.getDrawable(res, resId, null))
it.setPadding(padding, padding, padding, padding)
diff --git a/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginResponseHandler.java b/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginResponseHandler.java
index 5ed1ea52..e923a6ef 100644
--- a/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginResponseHandler.java
+++ b/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginResponseHandler.java
@@ -132,8 +132,11 @@ public class DevPluginResponseHandler implements Handler {
if (message == null) {
ViewUtils.showToast(mContext, R.string.text_invalid_project, true);
} else {
- // 使用 ErrorDialogActivity 代替直接显示 MaterialDialog
- // 这样可以避免在非UI线程或Activity不可见状态下调用对话框的问题
+ // Use ErrorDialogActivity instead of showing MaterialDialog directly
+ // This avoids issues when calling dialogs from non-UI threads or when Activity is not visible.
+ // zh-CN:
+ // 使用 ErrorDialogActivity 代替直接显示 MaterialDialog,
+ // 这样可以避免在非 UI 线程或 Activity 不可见状态下调用对话框的问题.
ErrorDialogActivity.showErrorDialog(
mContext.getApplicationContext(),
R.string.text_invalid_project,
diff --git a/app/src/main/java/org/autojs/autojs/theme/app/ColorInfoDialogManager.kt b/app/src/main/java/org/autojs/autojs/theme/app/ColorInfoDialogManager.kt
index 90f21ab7..be09c58e 100644
--- a/app/src/main/java/org/autojs/autojs/theme/app/ColorInfoDialogManager.kt
+++ b/app/src/main/java/org/autojs/autojs/theme/app/ColorInfoDialogManager.kt
@@ -18,7 +18,7 @@ import org.autojs.autojs.extension.MaterialDialogExtensions.setCopyableText
import org.autojs.autojs.runtime.api.augment.colors.Colors
import org.autojs.autojs.util.ColorUtils
import org.autojs.autojs6.R
-import org.autojs.autojs6.databinding.ColorInfoDialogListItemBinding
+import org.autojs.autojs6.databinding.ColorInfoDialogItemsBinding
object ColorInfoDialogManager {
@@ -38,7 +38,7 @@ object ColorInfoDialogManager {
.show()
return
}
- val binding = ColorInfoDialogListItemBinding.inflate(LayoutInflater.from(context))
+ val binding = ColorInfoDialogItemsBinding.inflate(LayoutInflater.from(context))
val colorWithoutAlpha = color or -0x1000000
@@ -73,7 +73,7 @@ object ColorInfoDialogManager {
}
}
- private fun restoreEssentialViews(binding: ColorInfoDialogListItemBinding) {
+ private fun restoreEssentialViews(binding: ColorInfoDialogItemsBinding) {
listOf(
binding.colorHexColon to binding.colorHexValue,
binding.colorRgbColon to binding.colorRgbValue,
@@ -87,7 +87,7 @@ object ColorInfoDialogManager {
}
}
- private fun updateGuidelines(binding: ColorInfoDialogListItemBinding) {
+ private fun updateGuidelines(binding: ColorInfoDialogItemsBinding) {
val filteredBindings = listOf(
binding.colorHexLabel to binding.colorHexGuideline,
binding.colorRgbLabel to binding.colorRgbGuideline,
diff --git a/app/src/main/java/org/autojs/autojs/theme/app/ColorSelectActivity.kt b/app/src/main/java/org/autojs/autojs/theme/app/ColorSelectActivity.kt
index 0ace37ea..6a5fa8ea 100644
--- a/app/src/main/java/org/autojs/autojs/theme/app/ColorSelectActivity.kt
+++ b/app/src/main/java/org/autojs/autojs/theme/app/ColorSelectActivity.kt
@@ -54,15 +54,13 @@ class ColorSelectActivity : ColorSelectBaseActivity() {
return super.onCreateOptionsMenu(menu)
}
- override fun onOptionsItemSelected(item: MenuItem): Boolean {
- when (item.itemId) {
- R.id.action_toggle_color_select_layout -> {
- isLegacyLayout = false
- startActivity(this, isToggled = true)
- true
- }
+ override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+ R.id.action_toggle_color_select_layout -> {
+ isLegacyLayout = false
+ startActivity(this, isToggled = true)
+ true
}
- return super.onOptionsItemSelected(item)
+ else -> super.onOptionsItemSelected(item)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/autojs/autojs/ui/error/ErrorDialogActivity.java b/app/src/main/java/org/autojs/autojs/ui/error/ErrorDialogActivity.java
index a267338d..0743fe7e 100644
--- a/app/src/main/java/org/autojs/autojs/ui/error/ErrorDialogActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/error/ErrorDialogActivity.java
@@ -1,15 +1,21 @@
package org.autojs.autojs.ui.error;
+import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import com.afollestad.materialdialogs.MaterialDialog;
import org.autojs.autojs.extension.MaterialDialogExtensions;
import org.autojs.autojs.ui.BaseActivity;
+import org.autojs.autojs.util.ClipboardUtils;
+import org.autojs.autojs.util.ViewUtils;
import org.autojs.autojs6.R;
+import java.util.Objects;
+
/**
* A simple activity to show error dialogs when a context is not available or valid
* for showing dialogs directly.
+ * zh-CN: 一个简单的 Activity，用于在上下文不可用或无效而无法直接显示对话框时显示错误对话框.
*/
public class ErrorDialogActivity extends BaseActivity {
@@ -21,35 +27,51 @@ public class ErrorDialogActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- // Get extras from intent
+ // Get extras from intent.
+ // zh-CN: 从 Intent 获取附加数据.
Intent intent = getIntent();
String title = intent.getStringExtra(EXTRA_TITLE);
String message = intent.getStringExtra(EXTRA_MESSAGE);
String positiveButtonText = intent.getStringExtra(EXTRA_POSITIVE_BUTTON_TEXT);
- // If no positive button text provided, use default dismiss text
+ // If no positive button text provided, use default dismiss text.
+ // zh-CN: 如果没有提供确认按钮文本，则使用默认的关闭文本.
if (positiveButtonText == null) {
positiveButtonText = getString(R.string.dialog_button_dismiss);
}
- // Show dialog
- var materialDialog = new MaterialDialog.Builder(this)
- .title(title)
- .content(message)
+ String content = Objects.requireNonNullElse(message, "");
+
+ MaterialDialog.Builder builder = new MaterialDialog.Builder(this)
+ .title(Objects.requireNonNullElse(title, getString(R.string.text_prompt)))
+ .content(content)
.positiveText(positiveButtonText)
.positiveColorRes(R.color.dialog_button_default)
+ .autoDismiss(false)
.cancelable(false)
.canceledOnTouchOutside(false)
- .onPositive((dialog, which) -> finish())
- .show();
+ .onPositive((dialog, which) -> dialog.dismiss())
+ .dismissListener(dialog -> finish());
+
+ if (!content.isBlank()) {
+ builder.neutralText(R.string.text_copy_all);
+ builder.neutralColorRes(R.color.dialog_button_hint);
+ builder.onNeutral((dialog, which) -> {
+ ClipboardUtils.setClip(dialog.getContext(), content);
+ ViewUtils.showSnack(dialog.getView(), R.string.text_already_copied_to_clip, false);
+ });
+ }
+
+ var materialDialog = builder.show();
MaterialDialogExtensions.makeTextCopyable(materialDialog, materialDialog.getContentView());
}
/**
- * Helper method to show an error dialog from any context
+ * Helper method to show an error dialog from any context.
+ * zh-CN: 用于从任何上下文显示错误对话框的辅助方法.
*/
- public static void showErrorDialog(android.content.Context context, int titleRes, String message) {
+ public static void showErrorDialog(Context context, int titleRes, String message) {
Intent intent = new Intent(context, ErrorDialogActivity.class);
intent.putExtra(EXTRA_TITLE, context.getString(titleRes));
intent.putExtra(EXTRA_MESSAGE, message);
@@ -58,9 +80,10 @@ public class ErrorDialogActivity extends BaseActivity {
}
/**
- * Helper method to show an error dialog from any context with custom positive button text
+ * Helper method to show an error dialog from any context with custom positive button text.
+ * zh-CN: 用于从任何上下文显示带有自定义确认按钮文本的错误对话框的辅助方法.
*/
- public static void showErrorDialog(android.content.Context context, int titleRes, String message, int positiveButtonTextRes) {
+ public static void showErrorDialog(Context context, int titleRes, String message, int positiveButtonTextRes) {
Intent intent = new Intent(context, ErrorDialogActivity.class);
intent.putExtra(EXTRA_TITLE, context.getString(titleRes));
intent.putExtra(EXTRA_MESSAGE, message);
@@ -68,4 +91,5 @@ public class ErrorDialogActivity extends BaseActivity {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
}
+
}
diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/WindowSwitchingDialog.java b/app/src/main/java/org/autojs/autojs/ui/floating/WindowSwitchingDialog.java
index 340f51b8..638f930c 100644
--- a/app/src/main/java/org/autojs/autojs/ui/floating/WindowSwitchingDialog.java
+++ b/app/src/main/java/org/autojs/autojs/ui/floating/WindowSwitchingDialog.java
@@ -81,7 +81,7 @@ public class WindowSwitchingDialog extends AppLevelThemeDialogBuilder {
@NonNull
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
- return new ViewHolder(LayoutInflater.from(mContext).inflate(R.layout.window_switching_dialog_list_item, parent, false));
+ return new ViewHolder(LayoutInflater.from(mContext).inflate(R.layout.window_switching_dialog_items, parent, false));
}
@Override
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/scripts/EditableFileInfoDialogManager.kt b/app/src/main/java/org/autojs/autojs/ui/main/scripts/EditableFileInfoDialogManager.kt
index d49ebff5..d220d0ce 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/scripts/EditableFileInfoDialogManager.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/main/scripts/EditableFileInfoDialogManager.kt
@@ -23,7 +23,7 @@ import org.autojs.autojs.util.IntentUtils.SnackExceptionHolder
import org.autojs.autojs.util.StringUtils
import org.autojs.autojs.util.StringUtils.dropBom
import org.autojs.autojs6.R
-import org.autojs.autojs6.databinding.EditableFileInfoDialogListItemBinding
+import org.autojs.autojs6.databinding.EditableFileInfoDialogItemsBinding
import java.io.File
import java.nio.charset.Charset
import java.nio.file.Files
@@ -40,7 +40,7 @@ object EditableFileInfoDialogManager {
.show()
return
}
- val binding = EditableFileInfoDialogListItemBinding.inflate(LayoutInflater.from(context))
+ val binding = EditableFileInfoDialogItemsBinding.inflate(LayoutInflater.from(context))
val textUnknown = context.getString(R.string.text_unknown)
@@ -119,7 +119,7 @@ object EditableFileInfoDialogManager {
}
}
- private fun updateGuidelines(binding: EditableFileInfoDialogListItemBinding) {
+ private fun updateGuidelines(binding: EditableFileInfoDialogItemsBinding) {
val bindings = listOf(
binding.filePathLabel to binding.filePathGuideline,
binding.fileSizeLabel to binding.fileSizeGuideline,
diff --git a/app/src/main/java/org/autojs/autojs/ui/main/scripts/MediaInfoDialogManager.kt b/app/src/main/java/org/autojs/autojs/ui/main/scripts/MediaInfoDialogManager.kt
index ac740063..8c22bd00 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/scripts/MediaInfoDialogManager.kt
+++ b/app/src/main/java/org/autojs/autojs/ui/main/scripts/MediaInfoDialogManager.kt
@@ -21,7 +21,7 @@ import org.autojs.autojs.extension.MaterialDialogExtensions.setCopyableText
import org.autojs.autojs.model.explorer.ExplorerItem
import org.autojs.autojs.util.ViewUtils
import org.autojs.autojs6.R
-import org.autojs.autojs6.databinding.MediaFileInfoDialogListItemBinding
+import org.autojs.autojs6.databinding.MediaFileInfoDialogItemsBinding
import org.mediainfo.android.MediaInfo
import org.mediainfo.android.MediaInfo.StreamKind.AUDIO
import org.mediainfo.android.MediaInfo.StreamKind.GENERAL
@@ -34,7 +34,7 @@ object MediaInfoDialogManager {
@JvmStatic
@SuppressLint("SetTextI18n")
fun showMediaInfoDialog(context: Context, explorerItem: ExplorerItem) {
- val binding = MediaFileInfoDialogListItemBinding.inflate(LayoutInflater.from(context))
+ val binding = MediaFileInfoDialogItemsBinding.inflate(LayoutInflater.from(context))
// Create an independent Scope for the Dialog, bind its lifecycle with the Dialog.
// zh-CN: 针对 Dialog 独立创建一个 Scope, 生命周期与 Dialog 绑定.
@@ -154,7 +154,7 @@ object MediaInfoDialogManager {
}
}
- private fun setViewsAsVideoPlaceholder(binding: MediaFileInfoDialogListItemBinding) {
+ private fun setViewsAsVideoPlaceholder(binding: MediaFileInfoDialogItemsBinding) {
binding.videoFormatParent.isVisible = true
binding.bitRateForVideoParent.isVisible = true
binding.resolutionParent.isVisible = true
@@ -162,7 +162,7 @@ object MediaInfoDialogManager {
binding.frameRateParent.isVisible = true
}
- private fun setViewsAsMediaPlaceholder(binding: MediaFileInfoDialogListItemBinding) {
+ private fun setViewsAsMediaPlaceholder(binding: MediaFileInfoDialogItemsBinding) {
binding.audioFormatParent.isVisible = true
binding.bitRateForAudioParent.isVisible = true
binding.albumParent.isVisible = true
@@ -171,16 +171,16 @@ object MediaInfoDialogManager {
}
@Suppress("UNUSED_PARAMETER", "unused")
- private fun setViewsAsMediaMenuPlaceholder(binding: MediaFileInfoDialogListItemBinding) {
+ private fun setViewsAsMediaMenuPlaceholder(binding: MediaFileInfoDialogItemsBinding) {
/* Nothing to do yet. */
}
@Suppress("UNUSED_PARAMETER", "unused")
- private fun setViewsAsLeastPlaceholder(binding: MediaFileInfoDialogListItemBinding) {
+ private fun setViewsAsLeastPlaceholder(binding: MediaFileInfoDialogItemsBinding) {
/* Nothing to do yet. */
}
- private fun restoreEssentialViews(binding: MediaFileInfoDialogListItemBinding, context: Context) {
+ private fun restoreEssentialViews(binding: MediaFileInfoDialogItemsBinding, context: Context) {
binding.containerFormatLabel.text = context.getString(R.string.media_info_container_format_label)
binding.containerFormatColon.isVisible = true
binding.containerFormatValue.isVisible = true
@@ -201,7 +201,7 @@ object MediaInfoDialogManager {
}
}
- private fun updateGuidelines(binding: MediaFileInfoDialogListItemBinding) {
+ private fun updateGuidelines(binding: MediaFileInfoDialogItemsBinding) {
val filteredBindings = listOf(
binding.containerFormatLabel to binding.containerFormatGuideline,
binding.videoFormatLabel to binding.videoFormatGuideline,
@@ -228,7 +228,7 @@ object MediaInfoDialogManager {
}
}
- private fun updateSplitLineVisibility(binding: MediaFileInfoDialogListItemBinding) {
+ private fun updateSplitLineVisibility(binding: MediaFileInfoDialogItemsBinding) {
binding.splitLine.isVisible = listOf(
binding.bitRateForVideoParent,
binding.resolutionParent,
diff --git a/app/src/main/java/org/autojs/autojs/util/IntentUtils.kt b/app/src/main/java/org/autojs/autojs/util/IntentUtils.kt
index 0b99c26c..1200b6cb 100644
--- a/app/src/main/java/org/autojs/autojs/util/IntentUtils.kt
+++ b/app/src/main/java/org/autojs/autojs/util/IntentUtils.kt
@@ -358,7 +358,7 @@ object IntentUtils {
context.startActivity(launchIntent)
} else {
// All scripts will call the scheduleAppLaunch method.
- // zh-CM: 脚本一律调用 scheduleAppLaunch 方法.
+ // zh-CN: 脚本一律调用 scheduleAppLaunch 方法.
scheduleAppLaunch(context, launchIntent)
}
@@ -431,7 +431,7 @@ object IntentUtils {
// zh-CN: 主页抽屉 "重启" 按钮点击时, 如果启用了 "快速重启", 则不调用 finishAllAppTasksSafely 方法.
} else {
// All scripts will call the finishAllAppTasksSafely method.
- // zh-CM: 脚本一律调用 finishAllAppTasksSafely 方法.
+ // zh-CN: 脚本一律调用 finishAllAppTasksSafely 方法.
finishAllAppTasksSafely(context)
}
diff --git a/app/src/main/java/org/mediainfo/android/MediaInfo.kt b/app/src/main/java/org/mediainfo/android/MediaInfo.kt
index 06c93f3f..37b0c1e4 100644
--- a/app/src/main/java/org/mediainfo/android/MediaInfo.kt
+++ b/app/src/main/java/org/mediainfo/android/MediaInfo.kt
@@ -116,6 +116,8 @@ class MediaInfo {
getMediaInfoOption(param)
}
+ fun getIsCanceled() = mIsCanceled
+
fun getMediaInfoTrimmed(filename: String): String = checkAvailability {
var result = getMediaInfo(filename)
@@ -141,7 +143,7 @@ class MediaInfo {
private fun countSpacesBeforeColon(input: String): Int {
val index = input.indexOf(':')
- if (index == -1) return 0 // 如果没有冒号, 则返回0
+ if (index == -1) return 0
var count = 0
for (i in index - 1 downTo 0) {
diff --git a/app/src/main/res/layout/color_info_dialog_list_item.xml b/app/src/main/res/layout/color_info_dialog_items.xml
similarity index 100%
rename from app/src/main/res/layout/color_info_dialog_list_item.xml
rename to app/src/main/res/layout/color_info_dialog_items.xml
diff --git a/app/src/main/res/layout/editable_file_info_dialog_list_item.xml b/app/src/main/res/layout/editable_file_info_dialog_items.xml
similarity index 100%
rename from app/src/main/res/layout/editable_file_info_dialog_list_item.xml
rename to app/src/main/res/layout/editable_file_info_dialog_items.xml
diff --git a/app/src/main/res/layout/media_file_info_dialog_list_item.xml b/app/src/main/res/layout/media_file_info_dialog_items.xml
similarity index 100%
rename from app/src/main/res/layout/media_file_info_dialog_list_item.xml
rename to app/src/main/res/layout/media_file_info_dialog_items.xml
diff --git a/app/src/main/res/layout/window_switching_dialog_list_item.xml b/app/src/main/res/layout/window_switching_dialog_items.xml
similarity index 100%
rename from app/src/main/res/layout/window_switching_dialog_list_item.xml
rename to app/src/main/res/layout/window_switching_dialog_items.xml
diff --git a/gradle/data/agp-releases.list b/gradle/data/agp-releases.list
index f1c6ae12..30de421f 100644
--- a/gradle/data/agp-releases.list
+++ b/gradle/data/agp-releases.list
@@ -1,5 +1,5 @@
-#Sat Nov 15 12:31:16 GMT+8 2025
-9.0.0-beta01
+#Sun Dec 07 19:51:46 GMT+8 2025
+9.0.0-beta03
8.13.1
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 4bae688f..a5ac47de 100644
--- a/gradle/data/android-studio-agp-compat.properties
+++ b/gradle/data/android-studio-agp-compat.properties
@@ -1,4 +1,5 @@
-#Fri Oct 31 23:54:17 GMT+8 2025
+#Sun Dec 07 19:51:17 GMT+8 2025
+2025.2.2=8.13
2025.2.1=8.13
2025.1.4=8.13
2025.1.3=8.13
diff --git a/gradle/data/android-studio-build-version.properties b/gradle/data/android-studio-build-version.properties
index 972448dd..20bd9c25 100644
--- a/gradle/data/android-studio-build-version.properties
+++ b/gradle/data/android-studio-build-version.properties
@@ -1,5 +1,9 @@
-#Wed Nov 19 13:38:14 GMT+8 2025
+#Sun Dec 07 19:51:05 GMT+8 2025
+252.28238.7.2523.14499447=2025.2.3.3
+252.27397.103.2523.14473358=2025.2.3.2
252.27397.103.2523.14431943=2025.2.3.1
+252.27397.103.2522.14514259=2025.2.2.7
+252.27397.103.2522.14468004=2025.2.2.6
252.27397.103.2522.14425743=2025.2.2.5
252.27397.103.2522.14395761=2025.2.2.4
252.25557.131.2522.14357309=2025.2.2.3