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

6.7.0 - Alpha21 - 修复代码编辑器置于后台时可能导致 TransactionTooLargeException 异常的问题

Browse Source
This commit is contained in:
SuperMonster003
2026-02-25 17:19:31 +08:00
parent 3e8f70de24
commit cc347aaa12
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/autojs/autojs/ui/edit/EditorView.kt
View File

@@ -72,7 +72,7 @@ import org.autojs.autojs.ui.edit.completion.CodeCompletionBar.OnHintClickListene
import org.autojs.autojs.ui.edit.debug.DebugBar
import org.autojs.autojs.ui.edit.editor.CodeEditor
import org.autojs.autojs.ui.edit.editor.CodeEditor.CheckedPatternSyntaxException
import org.autojs.autojs.ui.edit.editor.JavaScriptHighlighter.MAX_HIGHLIGHT_CHARS
import org.autojs.autojs.ui.edit.editor.JavaScriptHighlighter
import org.autojs.autojs.ui.edit.editor.LayoutHelper
import org.autojs.autojs.ui.edit.keyboard.FunctionsKeyboardHelper
import org.autojs.autojs.ui.edit.keyboard.FunctionsKeyboardView
@@ -420,6 +420,10 @@ class EditorView : LinearLayout, OnHintClickListener, ClickCallback, ToolbarFrag
findViewById<View>(R.id.redo).visibility = GONE
findViewById<View>(R.id.save).visibility = GONE
}
if (mLargeFileMode) {
findViewById<View>(R.id.undo).visibility = GONE
findViewById<View>(R.id.redo).visibility = GONE
}
if (!intent.getBooleanExtra(EXTRA_RUN_ENABLED, true)) {
findViewById<View>(R.id.run).visibility = GONE
}
@@ -698,7 +702,7 @@ class EditorView : LinearLayout, OnHintClickListener, ClickCallback, ToolbarFrag
}
private fun loadUri(uri: Uri): Observable<String> {
val streamThresholdBytes = MAX_HIGHLIGHT_CHARS
val streamThresholdBytes = LARGE_FILE_MODE_THRESHOLD
val sizeOrNull = runCatching { queryContentLengthOrNull(uri) }.getOrNull()
if (sizeOrNull != null && sizeOrNull >= streamThresholdBytes) {
@@ -1143,7 +1147,7 @@ class EditorView : LinearLayout, OnHintClickListener, ClickCallback, ToolbarFrag
return
}
val progressiveThreshold = MAX_HIGHLIGHT_CHARS
val progressiveThreshold = LARGE_FILE_MODE_THRESHOLD
if (text.length > progressiveThreshold) {
mLargeFileMode = true
setInitialTextProgressively(text)
@@ -1175,7 +1179,7 @@ class EditorView : LinearLayout, OnHintClickListener, ClickCallback, ToolbarFrag
// Re-highlight once after fast load, but only when size is within highlighter limit.
// zh-CN: 快速加载完成后主动触发一次高亮, 但仅在文本大小不超过高亮上限时执行.
if (text.length <= MAX_HIGHLIGHT_CHARS) {
if (text.length <= JavaScriptHighlighter.MAX_HIGHLIGHT_CHARS) {
post { editor.refreshHighlightTokensIfAllowed() }
}
}
@@ -2679,6 +2683,8 @@ class EditorView : LinearLayout, OnHintClickListener, ClickCallback, ToolbarFrag
private const val MIN_CONFIDENCE_TO_WRITE_FILE = 90
private val DEFAULT_CHARSET_TO_WRITE_FILE = StandardCharsets.UTF_8
private const val LARGE_FILE_MODE_THRESHOLD = JavaScriptHighlighter.MAX_HIGHLIGHT_CHARS
// Internal storage root (no external SD).
// zh-CN: 内部存储根目录 (不访问外置 SD).
private const val INTERNAL_STORAGE_ROOT: String = "/storage/emulated/0"

15
app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.kt
View File

@@ -137,6 +137,15 @@ class CodeEditText : AppCompatEditText {
}
mCursorChangeCallbacks = CopyOnWriteArrayList()
// Prevent Android framework from saving/restoring huge editor text via View state.
// Otherwise minimizing the Activity may trigger TransactionTooLargeException for large files.
//
// zh-CN:
// 禁止系统通过 View state 自动保存/恢复超大的编辑器文本.
// 否则在最小化 Activity 时, 大文件很容易触发 TransactionTooLargeException.
isSaveEnabled = false
freezesText = false
// Ensure selection is possible by default.
// zh-CN: 默认确保可以进行文本选择.
setTextIsSelectable(true)
@@ -590,9 +599,9 @@ class CodeEditText : AppCompatEditText {
// Also drop selection-changed events entirely in large-text mode.
// zh-CN: 大文本模式下直接丢弃 selection-changed 事件.
if (event.eventType == AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED) {
return
}
if (event.eventType == AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED) return
if (event.eventType == AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED) return
if (event.eventType == AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY) return
}
super.sendAccessibilityEventUnchecked(event)
}