From 70847c8b978807dadc18732af8072d0914287a01 Mon Sep 17 00:00:00 2001 From: shen Date: Sun, 13 Sep 2026 21:02:12 +0800 Subject: [PATCH] fix: stabilize landscape controls and compact game library --- README.md | 2 +- app/build.gradle.kts | 4 +- .../main/java/org/neslite/app/MainActivity.kt | 71 +++++++++++++------ .../neslite/app/library/LibraryGridLayout.kt | 4 ++ .../org/neslite/app/system/SystemUiPolicy.kt | 11 ++- .../java/org/neslite/app/BuildIdentityTest.kt | 4 +- .../neslite/app/VirtualGamepadLayoutTest.kt | 27 +++++++ .../app/library/LibraryGridLayoutTest.kt | 14 ++++ .../neslite/app/system/SystemUiPolicyTest.kt | 24 ++++++- docs/architecture.md | 9 ++- docs/build.md | 4 +- docs/controller-x5lite.md | 2 +- docs/identity.md | 2 +- docs/known-issues.md | 2 +- docs/reports/m8-release-candidate.md | 4 +- docs/usage.md | 5 +- tools/package-rc.ps1 | 4 +- 17 files changed, 146 insertions(+), 47 deletions(-) create mode 100644 app/src/main/java/org/neslite/app/library/LibraryGridLayout.kt create mode 100644 app/src/test/java/org/neslite/app/library/LibraryGridLayoutTest.kt diff --git a/README.md b/README.md index 6e4b145..7eddb58 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # NESLite NESLite 是一个面向 Android 的轻量 NES/FC 模拟器前端。它使用固定版本的 -FCEUmm libretro 内核。当前仓库已准备 0.9.11 候选基线的冻结样本、输入延迟指标、升级架构、原生对齐审计 +FCEUmm libretro 内核。当前仓库已准备 0.9.12 候选基线的冻结样本、输入延迟指标、升级架构、原生对齐审计 和候选交付脚本;荣耀 Magic8 与 X5 Lite 已由截图确认枚举,但手机未开放 ADB,且发布签名和可观察 玩法的合法 ROM 样本尚未提供,因此 M2~M8 的完整实机验收及 G8 仍待补齐。 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d523fe3..cb44c87 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,8 +21,8 @@ android { applicationId = "org.neslite.app" minSdk = 28 targetSdk = 36 - versionCode = 9011 - versionName = "0.9.11" + versionCode = 9012 + versionName = "0.9.12" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" ndk { diff --git a/app/src/main/java/org/neslite/app/MainActivity.kt b/app/src/main/java/org/neslite/app/MainActivity.kt index 026d823..12d0b18 100644 --- a/app/src/main/java/org/neslite/app/MainActivity.kt +++ b/app/src/main/java/org/neslite/app/MainActivity.kt @@ -31,6 +31,7 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.ScrollView import android.widget.SeekBar +import android.widget.Space import android.widget.TextView import android.widget.Toast import android.app.AlertDialog @@ -57,6 +58,7 @@ import org.neslite.app.library.GameDatabase import org.neslite.app.library.GameEntity import org.neslite.app.library.LibraryRecovery import org.neslite.app.library.RomImporter +import org.neslite.app.library.libraryGridColumns import org.neslite.app.input.AxisHysteresis import org.neslite.app.input.BindingKind import org.neslite.app.input.ControllerIdentity @@ -823,7 +825,7 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener { libraryPanel = LinearLayout(context).apply { orientation = LinearLayout.VERTICAL visibility = View.GONE - addView(body("选择游戏后将返回主画面并自动开始运行。")) + addView(body("点游戏名开始运行;长按可查看详情、收藏或从列表移除。")) searchInput = EditText(context).apply { hint = "搜索游戏名称或哈希" isSingleLine = true @@ -1900,39 +1902,62 @@ class MainActivity : ComponentActivity(), InputManager.InputDeviceListener { if (games.isEmpty()) { gameList.addView(body(if (query.isEmpty()) "游戏库为空;请从文件导入 ROM。" else "没有匹配“$query”的游戏;可清空搜索后重试。")) } - games.forEach { game -> + val columns = libraryGridColumns(resources.configuration.screenWidthDp - 40) + games.chunked(columns).forEach { group -> gameList.addView(LinearLayout(this).apply { - orientation = LinearLayout.VERTICAL - addView(Button(context).apply { - text = (if (game.favorite) "★ " else "") + game.displayName - isAllCaps = false - isEnabled = game.status == GameEntity.STATUS_READY - setOnClickListener { loadGame(game) } - }) - addView(body("${game.format} · ${formatBytes(game.sizeBytes)} · SHA ${game.sha256.take(12)} · ${game.status}\n" + - "导入 ${formatDate(game.addedAtEpochMs)} · 最近 ${if (game.lastPlayedAtEpochMs == 0L) "未游玩" else formatDate(game.lastPlayedAtEpochMs)}")) - addView(LinearLayout(context).apply { - orientation = LinearLayout.HORIZONTAL + orientation = LinearLayout.HORIZONTAL + group.forEach { game -> addView(Button(context).apply { - text = if (game.favorite) "取消收藏" else "收藏" + text = (if (game.favorite) "★ " else "") + game.displayName + isAllCaps = false + isSingleLine = false + maxLines = Int.MAX_VALUE + ellipsize = null + textSize = 16f + minHeight = dp(56) setOnClickListener { - libraryExecutor.execute { - database.games().setFavorite(game.sha256, !game.favorite) - runOnUiThread { refreshLibrary() } - } + if (game.status == GameEntity.STATUS_READY) loadGame(game) + else Toast.makeText(context, "游戏文件不可用,可长按查看详情", Toast.LENGTH_SHORT).show() } + setOnLongClickListener { + showLibraryGameActions(game) + true + } + }, LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f).apply { + setMargins(dp(4), dp(3), dp(4), dp(3)) }) - addView(Button(context).apply { - text = "从列表移除" - setOnClickListener { confirmHideGame(game) } - }) - }) + } + repeat(columns - group.size) { + addView(Space(context), LinearLayout.LayoutParams(0, 1, 1f)) + } }) } } } } + private fun showLibraryGameActions(game: GameEntity) { + val actions = arrayOf("查看详情", if (game.favorite) "取消收藏" else "收藏", "从列表移除") + AlertDialog.Builder(this) + .setTitle(game.displayName) + .setItems(actions) { _, which -> + when (which) { + 0 -> AlertDialog.Builder(this) + .setTitle(game.displayName) + .setMessage("${game.format} · ${formatBytes(game.sizeBytes)} · SHA ${game.sha256.take(12)} · ${game.status}\n" + + "导入 ${formatDate(game.addedAtEpochMs)} · 最近 ${if (game.lastPlayedAtEpochMs == 0L) "未游玩" else formatDate(game.lastPlayedAtEpochMs)}") + .setPositiveButton("关闭", null) + .show() + 1 -> libraryExecutor.execute { + database.games().setFavorite(game.sha256, !game.favorite) + runOnUiThread { refreshLibrary() } + } + 2 -> confirmHideGame(game) + } + } + .show() + } + private fun confirmHideGame(game: GameEntity) { AlertDialog.Builder(this) .setTitle("从列表移除?") diff --git a/app/src/main/java/org/neslite/app/library/LibraryGridLayout.kt b/app/src/main/java/org/neslite/app/library/LibraryGridLayout.kt new file mode 100644 index 0000000..da77fe6 --- /dev/null +++ b/app/src/main/java/org/neslite/app/library/LibraryGridLayout.kt @@ -0,0 +1,4 @@ +package org.neslite.app.library + +/** Landscape library cards should stay wide enough to show complete ROM names. */ +fun libraryGridColumns(availableWidthDp: Int): Int = if (availableWidthDp >= 720) 3 else 2 diff --git a/app/src/main/java/org/neslite/app/system/SystemUiPolicy.kt b/app/src/main/java/org/neslite/app/system/SystemUiPolicy.kt index b16d06a..c917202 100644 --- a/app/src/main/java/org/neslite/app/system/SystemUiPolicy.kt +++ b/app/src/main/java/org/neslite/app/system/SystemUiPolicy.kt @@ -61,14 +61,19 @@ fun resolveLayoutSafeInsets( systemGestures: SafeInsets, ): LayoutSafeInsets { val gameplayEdges = mergeSafeInsets(displayCutout, systemGestures) + // A landscape rotation exchanges the physical left and right edges. Keep the + // playable geometry anchored to the same coordinates in either orientation. + val gameplaySide = maxOf(gameplayEdges.left, gameplayEdges.right) return LayoutSafeInsets( gameplay = SafeInsets( - left = gameplayEdges.left, + left = gameplaySide, top = 0, - right = gameplayEdges.right, + right = gameplaySide, bottom = 0, ), - overlay = mergeSafeInsets(systemBars, displayCutout, systemGestures), + // Menus are not touch controls: use the full width while keeping clear + // of visible top and bottom system bars. + overlay = SafeInsets(0, systemBars.top, 0, systemBars.bottom), ) } diff --git a/app/src/test/java/org/neslite/app/BuildIdentityTest.kt b/app/src/test/java/org/neslite/app/BuildIdentityTest.kt index b8641c3..0996273 100644 --- a/app/src/test/java/org/neslite/app/BuildIdentityTest.kt +++ b/app/src/test/java/org/neslite/app/BuildIdentityTest.kt @@ -7,7 +7,7 @@ class BuildIdentityTest { @Test fun debugBuildUsesTheDocumentedIdentity() { assertEquals("org.neslite.app.debug", BuildConfig.APPLICATION_ID) - assertEquals("0.9.11-debug", BuildConfig.VERSION_NAME) - assertEquals(9011, BuildConfig.VERSION_CODE) + assertEquals("0.9.12-debug", BuildConfig.VERSION_NAME) + assertEquals(9012, BuildConfig.VERSION_CODE) } } diff --git a/app/src/test/java/org/neslite/app/VirtualGamepadLayoutTest.kt b/app/src/test/java/org/neslite/app/VirtualGamepadLayoutTest.kt index 81217c9..1d6008b 100644 --- a/app/src/test/java/org/neslite/app/VirtualGamepadLayoutTest.kt +++ b/app/src/test/java/org/neslite/app/VirtualGamepadLayoutTest.kt @@ -3,6 +3,8 @@ package org.neslite.app import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test +import org.neslite.app.system.SafeInsets +import org.neslite.app.system.resolveLayoutSafeInsets import kotlin.math.hypot class VirtualGamepadLayoutTest { @@ -123,6 +125,31 @@ class VirtualGamepadLayoutTest { } } + @Test + fun flippedLandscapeKeepsTheViewportAndEveryControlAtTheSameCoordinates() { + val first = resolveLayoutSafeInsets( + systemBars = SafeInsets(0, 0, 0, 0), + displayCutout = SafeInsets(238, 0, 0, 0), + systemGestures = SafeInsets(28, 0, 24, 0), + ).gameplay + val flipped = resolveLayoutSafeInsets( + systemBars = SafeInsets(0, 0, 0, 0), + displayCutout = SafeInsets(0, 0, 238, 0), + systemGestures = SafeInsets(24, 0, 28, 0), + ).gameplay + + fun geometry(insets: SafeInsets) = computeVirtualGamepadGeometry( + width = 2760f, + height = 1256f, + maxRadius = 126f, + safeLeft = insets.left.toFloat(), + safeRight = insets.right.toFloat(), + dpadScale = 1.18f, + ) + + assertEquals(geometry(first), geometry(flipped)) + } + private fun distance(first: VirtualControl, second: VirtualControl): Float = hypot(first.x - second.x, first.y - second.y) } diff --git a/app/src/test/java/org/neslite/app/library/LibraryGridLayoutTest.kt b/app/src/test/java/org/neslite/app/library/LibraryGridLayoutTest.kt new file mode 100644 index 0000000..b5cfc2d --- /dev/null +++ b/app/src/test/java/org/neslite/app/library/LibraryGridLayoutTest.kt @@ -0,0 +1,14 @@ +package org.neslite.app.library + +import org.junit.Assert.assertEquals +import org.junit.Test + +class LibraryGridLayoutTest { + @Test + fun usesThreeColumnsOnWideLandscapeAndTwoOnNarrowScreens() { + assertEquals(3, libraryGridColumns(920)) + assertEquals(3, libraryGridColumns(720)) + assertEquals(2, libraryGridColumns(719)) + assertEquals(2, libraryGridColumns(540)) + } +} diff --git a/app/src/test/java/org/neslite/app/system/SystemUiPolicyTest.kt b/app/src/test/java/org/neslite/app/system/SystemUiPolicyTest.kt index 71187c4..4302de2 100644 --- a/app/src/test/java/org/neslite/app/system/SystemUiPolicyTest.kt +++ b/app/src/test/java/org/neslite/app/system/SystemUiPolicyTest.kt @@ -33,15 +33,33 @@ class SystemUiPolicyTest { } @Test - fun gameplayUsesOnlyHorizontalCutoutAndBackGestureInsets() { + fun gameplayIsSymmetricAndMenusUseTheFullWidth() { val resolved = resolveLayoutSafeInsets( systemBars = SafeInsets(0, 72, 0, 96), displayCutout = SafeInsets(54, 28, 12, 0), systemGestures = SafeInsets(24, 0, 30, 48), ) - assertEquals(SafeInsets(54, 0, 30, 0), resolved.gameplay) - assertEquals(SafeInsets(54, 72, 30, 96), resolved.overlay) + assertEquals(SafeInsets(54, 0, 54, 0), resolved.gameplay) + assertEquals(SafeInsets(0, 72, 0, 96), resolved.overlay) + } + + @Test + fun landscapeFlipKeepsGameplayInsetsAndDropsHiddenBars() { + val first = resolveLayoutSafeInsets( + systemBars = SafeInsets(0, 0, 0, 0), + displayCutout = SafeInsets(238, 0, 0, 0), + systemGestures = SafeInsets(28, 0, 24, 0), + ) + val flipped = resolveLayoutSafeInsets( + systemBars = SafeInsets(0, 0, 0, 0), + displayCutout = SafeInsets(0, 0, 238, 0), + systemGestures = SafeInsets(24, 0, 28, 0), + ) + + assertEquals(first.gameplay, flipped.gameplay) + assertEquals(SafeInsets(238, 0, 238, 0), first.gameplay) + assertEquals(SafeInsets(0, 0, 0, 0), first.overlay) } @Test diff --git a/docs/architecture.md b/docs/architecture.md index a948f3d..c7a1a24 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -1,4 +1,4 @@ -# NESLite 架构(0.9.11 候选基线) +# NESLite 架构(0.9.12 候选基线) ## 边界与线程 @@ -101,7 +101,7 @@ DataStore 保存,渲染线程只读取整数缩放和过滤快照,音频及 按 pointerId 维护触摸来源并送入与物理手柄相同的 `InputRouter`,因此多来源去重、相反方向和释放规则 一致;取消、滑出、失焦与暂停清空所有虚拟来源。首次使用状态也存于设置 DataStore,不接触用户存档。 -0.9.11 将游戏入口收敛为单一横屏主画面:中央 `AspectRatioFrameLayout` 只按 4:3 测量,左右剩余安全 +0.9.12 将游戏入口收敛为单一横屏主画面:中央 `AspectRatioFrameLayout` 只按 4:3 测量,左右剩余安全 区域绘制虚拟手柄;左上角横排图标入口独立于游戏安全内边距,打开游戏列表、导入和设置的全屏页面。 方向键与 ABXY 的半径为原布局的 1.5 倍,Select、Start、暂停和重置为原布局的 1.3 倍。Magic8 横屏 安全区允许时,方向键、Select、4:3 画面、Start、暂停和重置整体左移一个 A 键直径,右侧扩展空间用于 @@ -115,6 +115,11 @@ DataStore 保存,渲染线程只读取整数缩放和过滤快照,音频及 `InputRouter` 中约束物理摇杆。多触点状态以动作集合保存,因此 A 与 B 可以同时按住。方向键大小、 水平与垂直偏移存入 AppSettings DataStore。 +横屏翻转时挖孔和返回手势保护值会交换左右两侧。游戏画面与虚拟按键统一采用两侧保护值的最大值, +保证两种横屏方向中的坐标和大小一致;管理页面不使用左右防误触边距,只保留已显示顶部和底部系统栏 +所需空间。游戏库按可用横向宽度显示两列或三列完整、可换行的游戏名,长按条目才显示详情、收藏和 +移除操作。 + 手柄设置支持逐项向导和单项修改/清除。捕获目标动作后,物理 KeyEvent 或超过按下阈值的轴方向成为 该动作的唯一绑定;冲突必须由用户确认替换。轴捕获后必须先回到释放阈值内才进入下一项,防止同一 持续轴值误绑多个动作。草稿与正在使用的档案分离,仅保存成功后替换运行档案并按设备指纹持久化。 diff --git a/docs/build.md b/docs/build.md index f76a8c5..961e54f 100644 --- a/docs/build.md +++ b/docs/build.md @@ -1,6 +1,6 @@ # NESLite 可复现构建说明 -本说明对应 0.9.11 候选基线。命令使用系统默认 PowerShell 7.6.6(`pwsh`)从仓库根目录执行;不需要手工复制 `.so`、 +本说明对应 0.9.12 候选基线。命令使用系统默认 PowerShell 7.6.6(`pwsh`)从仓库根目录执行;不需要手工复制 `.so`、 FCEUmm 或 Oboe 文件。 ## 前置条件 @@ -50,7 +50,7 @@ pwsh -NoProfile -ExecutionPolicy Bypass -File .\tools\package-rc.ps1 脚本重跑 Stage 和 release lint,生成 `org.neslite.app` 的未签名 release APK、完整原生符号、应用及 三个固定第三方依赖的源码包、许可证/说明、静态原生审计、候选清单和 SHA-256。输出位于 -`.build/rc-0.9.11/`。静态审计逐个检查 APK 内 `.so` 的 ELF LOAD 段和 APK 16 KB 对齐,并拒绝非 +`.build/rc-0.9.12/`。静态审计逐个检查 APK 内 `.so` 的 ELF LOAD 段和 APK 16 KB 对齐,并拒绝非 arm64-v8a 库。 默认 APK 刻意保持未签名;发布私钥和口令不得传入仓库或写入脚本。获得受保护的发布密钥后,在隔离 diff --git a/docs/controller-x5lite.md b/docs/controller-x5lite.md index 5b70ee7..b194d46 100644 --- a/docs/controller-x5lite.md +++ b/docs/controller-x5lite.md @@ -5,7 +5,7 @@ ABXY、视图/菜单键及左右肩键。随后在荣耀 Magic8 页面取得了 Android 设备身份和静态轴范围; 实际 KeyEvent、动态轴采样、手柄模式及拔出重连仍待诊断 JSON 回填。 -在 0.9.11-debug 中可从“设置 → 手动设置手柄按键、摇杆与功能键”进入编辑页。可选择“开始逐项手动 +在 0.9.12-debug 中可从“设置 → 手动设置手柄按键、摇杆与功能键”进入编辑页。可选择“开始逐项手动 设置全部按键”,按页面顺序操作 X5 Lite;也可点击任一动作单独修改或清除。轴方向捕获后先松回中位, 冲突时确认是否替换,最后点击“保存”。配置按下表设备指纹保存,不依赖临时 deviceId。 diff --git a/docs/identity.md b/docs/identity.md index 819c315..27e362d 100644 --- a/docs/identity.md +++ b/docs/identity.md @@ -6,7 +6,7 @@ | --- | --- | | 显示名称 | `NESLite` | | 正式 application ID/namespace | `org.neslite.app` | -| 当前候选版本 | `0.9.11`,`versionCode = 9011` | +| 当前候选版本 | `0.9.12`,`versionCode = 9012` | | 调试 application ID | `org.neslite.app.debug` | | 发布 ABI | `arm64-v8a` | | min/target SDK | 28/36 | diff --git a/docs/known-issues.md b/docs/known-issues.md index bbaa2ab..b4853e8 100644 --- a/docs/known-issues.md +++ b/docs/known-issues.md @@ -1,6 +1,6 @@ # 已知问题与候选版限制 -本清单对应 0.9.11 候选源码。优先级含义:阻断表示 G8 不可通过;高表示发布前必须处理;中/低需有 +本清单对应 0.9.12 候选源码。优先级含义:阻断表示 G8 不可通过;高表示发布前必须处理;中/低需有 明确接受或修复结论。 | 编号 | 优先级 | 状态 | 问题与处理条件 | diff --git a/docs/reports/m8-release-candidate.md b/docs/reports/m8-release-candidate.md index b4d9ba9..6a703e2 100644 --- a/docs/reports/m8-release-candidate.md +++ b/docs/reports/m8-release-candidate.md @@ -1,7 +1,7 @@ # M8 0.9.4 发布候选记录 -> 此文件保留 0.9.4 的历史候选证据。0.9.11 改动了主界面、触屏与手柄输入路径和页面/会话交接,不能 -> 直接继承本记录作为最终 G8 结论;完成 Magic8 实机复核后需生成新的 0.9.11 候选记录。 +> 此文件保留 0.9.4 的历史候选证据。0.9.12 改动了主界面、触屏与手柄输入路径和页面/会话交接,不能 +> 直接继承本记录作为最终 G8 结论;完成 Magic8 实机复核后需生成新的 0.9.12 候选记录。 日期:2026-09-12 diff --git a/docs/usage.md b/docs/usage.md index 8374d32..5b5cde0 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -3,11 +3,12 @@ 1. 应用会自动进入沉浸式横屏,中央 4:3 游戏区使用完整屏幕高度,只在左右避开挖孔和返回手势区域。左侧是加大的十字方向键,右侧是 加大的 A/B/X/Y;Select/Start 分别位于游戏画面底部两侧。布局会利用左侧空余安全区将方向键、 Select、游戏画面、Start、暂停和重置整体左移,并用扩大的右侧空间拉开 ABXY。X/Y 分别是 A/B 连发。左上角横排的 - “列表”“导入”“设置”图标会打开独立页面,并临时恢复系统栏及完整四边安全区。 + “列表”“导入”“设置”图标会打开独立页面,并临时恢复系统栏;管理页面不再保留左右防误触边距。 2. 点左上角“导入”图标,选择你合法持有的 `.nes` 文件。应用按完整 SHA-256 建库;同名不同内容独立, 相同内容不会重复。可按名称/哈希搜索、收藏或从列表隐藏。隐藏不删除 ROM 和存档,重新导入相同 内容会恢复关联。 -3. 点左上角“列表”图标,再点游戏条目;加载完成后会自动开始。连接外接手柄后仍可按设置选择是否显示 +3. 点左上角“列表”图标,在两列或三列网格中点游戏名;加载完成后会自动开始。游戏名可完整换行显示, + 长按游戏名可查看详情、收藏或从列表移除。连接外接手柄后仍可按设置选择是否显示 屏幕按键。多点触控支持方向与动作同时按住,滑出、取消、失焦或暂停都会释放输入。 4. 点左上角“设置”图标可切换 4:3/整数缩放、最近邻/线性过滤、音量、静音、软件连发和 RB 快进。进入 “手动设置手柄按键、摇杆与功能键”后,可启动逐项向导,也可单独点击动作修改或清除;按下物理键 diff --git a/tools/package-rc.ps1 b/tools/package-rc.ps1 index 6c4d9d4..14f724d 100644 --- a/tools/package-rc.ps1 +++ b/tools/package-rc.ps1 @@ -14,8 +14,8 @@ $env:JAVA_HOME = if ($env:JAVA_HOME -and (Test-Path (Join-Path $env:JAVA_HOME 'b } $env:ANDROID_HOME = $sdkRoot $env:ANDROID_SDK_ROOT = $sdkRoot -$versionName = '0.9.11' -$versionCode = 9011 +$versionName = '0.9.12' +$versionCode = 9012 $gitStatus = @(& git -C $root status --porcelain) if ($LASTEXITCODE -ne 0) { throw 'Cannot inspect the Git worktree.' } if ($gitStatus.Count -ne 0) { throw 'RC packaging requires a clean committed worktree.' }