diff --git a/README.md b/README.md index 8022eb5..896f07d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # NESLite NESLite 是一个面向 Android 的轻量 NES/FC 模拟器前端。它使用固定版本的 -FCEUmm libretro 内核;当前仓库处于 M0 工程基线阶段。 +FCEUmm libretro 内核;当前仓库已完成 M1 诊断版实现,等待目标手机和 X5 Lite 实机验收。 ## 快速构建 @@ -13,6 +13,9 @@ pwsh -NoProfile -File .\tools\check.ps1 -Scope Build 该命令默认只生成 arm64-v8a 调试 APK,不会运行耐久或实机验收。 +连接并授权目标手机后,可用 `tools/check-m1-device.ps1` 安装和启动 0.1.3 诊断 APK;实测步骤见 +[X5 Lite 键位表](docs/controller-x5lite.md)。 + ## 许可证 项目在与 FCEUmm 静态链接后须按 GPL-2.0-only 的要求分发。当前许可证和第三方 diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 61c1a2f..f62911c 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -22,3 +22,6 @@ 测试依赖 JUnit 4.13.2(EPL-1.0)和 AndroidX Test/Espresso(Apache-2.0)不打入生产 APK, 但随测试源码分发时仍需保留其各自的许可证信息。 + +`org.json:json:20240303` 仅用于 JVM 单元测试,以 Public Domain 条款发布;Android 运行时使用 +系统自带的 `org.json` 实现,不把该测试依赖打入生产 APK。 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a4dca0b..a19afe9 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 = 1 - versionName = "0.0.1-dev" + versionCode = 1003 + versionName = "0.1.3" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" ndk { @@ -73,6 +73,7 @@ dependencies { implementation(libs.androidx.activity.ktx) testImplementation(libs.junit) + testImplementation(libs.json) androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.espresso.core) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 483cd16..63efdba 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,13 +2,15 @@ + android:exported="true"> diff --git a/app/src/main/cpp/jni_bridge.cpp b/app/src/main/cpp/jni_bridge.cpp index 1a30ba0..6b04cb9 100644 --- a/app/src/main/cpp/jni_bridge.cpp +++ b/app/src/main/cpp/jni_bridge.cpp @@ -1,5 +1,7 @@ #include +#include + #include #include "native_smoke.h" @@ -9,3 +11,9 @@ Java_org_neslite_app_NativeBridge_buildInfo(JNIEnv* env, jclass) { const std::string info = "native protocol v" + std::to_string(neslite::native_protocol_version()); return env->NewStringUTF(info.c_str()); } + +extern "C" JNIEXPORT jlong JNICALL +Java_org_neslite_app_NativeBridge_pageSizeBytes(JNIEnv*, jclass) { + const long page_size = sysconf(_SC_PAGESIZE); + return page_size > 0 ? static_cast(page_size) : 0; +} diff --git a/app/src/main/java/org/neslite/app/MainActivity.kt b/app/src/main/java/org/neslite/app/MainActivity.kt index 6bf20ec..b61376b 100644 --- a/app/src/main/java/org/neslite/app/MainActivity.kt +++ b/app/src/main/java/org/neslite/app/MainActivity.kt @@ -1,30 +1,351 @@ package org.neslite.app +import android.content.Context +import android.hardware.input.InputManager +import android.net.Uri import android.os.Bundle -import android.view.Gravity +import android.os.SystemClock +import android.text.method.ScrollingMovementMethod +import android.view.InputDevice +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.ViewGroup +import android.widget.Button import android.widget.LinearLayout +import android.widget.ScrollView import android.widget.TextView +import android.widget.Toast import androidx.activity.ComponentActivity +import androidx.activity.result.contract.ActivityResultContracts +import org.json.JSONArray +import org.json.JSONObject +import org.neslite.app.diagnostics.ControllerSnapshot +import org.neslite.app.diagnostics.DeviceBaseline +import org.neslite.app.diagnostics.DeviceDiagnostics +import org.neslite.app.diagnostics.DiagnosticEventJson +import org.neslite.app.diagnostics.InputDiagnostics +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + +class MainActivity : ComponentActivity(), InputManager.InputDeviceListener { + private val inputDiagnostics = InputDiagnostics() + private lateinit var inputManager: InputManager + private lateinit var baseline: DeviceBaseline + private lateinit var nativeProbe: NativeProbe + private lateinit var deviceText: TextView + private lateinit var controllerText: TextView + private lateinit var stateText: TextView + private lateinit var eventText: TextView + private var controllers: List = emptyList() + + private val createDocument = registerForActivityResult( + ActivityResultContracts.CreateDocument("application/json"), + ) { uri -> + if (uri != null) exportDiagnostics(uri) + } -/** M0 骨架页:证明 Kotlin/View 与 JNI 已连通。M1 会将它替换为诊断页面。 */ -class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + inputManager = getSystemService(Context.INPUT_SERVICE) as InputManager + nativeProbe = probeNative() + baseline = DeviceDiagnostics.collectBaseline(this, nativeProbe.pageSizeBytes) + setContentView(createContentView()) + refreshControllers() + } - val nativeInfo = runCatching { NativeBridge.buildInfo() } - .getOrElse { "JNI unavailable: ${it.javaClass.simpleName}" } + override fun onStart() { + super.onStart() + inputManager.registerInputDeviceListener(this, null) + refreshControllers() + } - setContentView( - LinearLayout(this).apply { - gravity = Gravity.CENTER + override fun onStop() { + inputDiagnostics.clearAll("activity_stopped", SystemClock.uptimeMillis()) + inputManager.unregisterInputDeviceListener(this) + super.onStop() + } + + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + if (!hasFocus && ::stateText.isInitialized) { + inputDiagnostics.clearAll("focus_lost", SystemClock.uptimeMillis()) + renderInputState() + } + } + + override fun onInputDeviceAdded(deviceId: Int) { + InputDevice.getDevice(deviceId) + ?.takeIf(DeviceDiagnostics::isController) + ?.let { inputDiagnostics.attach(deviceId) } + refreshControllers() + } + + override fun onInputDeviceChanged(deviceId: Int) { + refreshControllers() + } + + override fun onInputDeviceRemoved(deviceId: Int) { + inputDiagnostics.clearDevice( + deviceId, + "device_removed", + removeSession = true, + eventTimeMs = SystemClock.uptimeMillis(), + ) + refreshControllers() + } + + private fun handleKeyEvent(event: KeyEvent): Boolean { + if (event.keyCode != KeyEvent.KEYCODE_BACK && DeviceDiagnostics.isControllerSource(event.source)) { + val action = when (event.action) { + KeyEvent.ACTION_DOWN -> if (event.repeatCount > 0) "repeat" else "down" + KeyEvent.ACTION_UP -> "up" + else -> "action_${event.action}" + } + inputDiagnostics.recordKey( + deviceId = event.deviceId, + eventTimeMs = event.eventTime, + source = event.source, + action = action, + keyCode = event.keyCode, + keyName = KeyEvent.keyCodeToString(event.keyCode), + repeatCount = event.repeatCount, + ) + renderInputState() + return true + } + return false + } + + private fun handleMotionEvent(event: MotionEvent): Boolean { + val device = event.device + if (device != null && DeviceDiagnostics.isControllerSource(event.source)) { + device.motionRanges + .filter { range -> range.source and event.source == range.source } + .forEach { range -> + inputDiagnostics.recordAxis( + deviceId = event.deviceId, + eventTimeMs = event.eventTime, + source = event.source, + axis = range.axis, + axisName = MotionEvent.axisToString(range.axis) ?: "AXIS_${range.axis}", + value = event.getAxisValue(range.axis), + ) + } + renderInputState() + return true + } + return false + } + + private fun createContentView(): ScrollView = DiagnosticScrollView( + context = this, + keyHandler = ::handleKeyEvent, + motionHandler = ::handleMotionEvent, + ).apply { + isFillViewport = true + addView( + LinearLayout(context).apply { + orientation = LinearLayout.VERTICAL + setPadding(32, 32, 32, 48) + addView(title(getString(R.string.diagnostics_title))) + addView(body(getString(R.string.diagnostics_instructions))) + addView(section(getString(R.string.section_native))) + addView(body(nativeProbe.render())) + addView(section(getString(R.string.section_device))) + deviceText = body(this@MainActivity.baseline.render()) + addView(deviceText) + addView(section(getString(R.string.section_controllers))) + controllerText = body("") + addView(controllerText) + addView(section(getString(R.string.section_input_state))) + stateText = body("") + addView(stateText) + addView(section(getString(R.string.section_events))) + eventText = body("").apply { + movementMethod = ScrollingMovementMethod() + setTextIsSelectable(true) + } + addView(eventText) addView( - TextView(context).apply { - text = getString(R.string.bootstrap_status, nativeInfo) - textSize = 18f - setPadding(48, 48, 48, 48) + Button(context).apply { + text = getString(R.string.export_diagnostics) + setOnClickListener { createDocument.launch(defaultExportName()) } }, + LinearLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + ).apply { topMargin = 24 }, ) }, ) } + + private fun refreshControllers() { + val connectedIds = DeviceDiagnostics.controllerDeviceIds() + inputDiagnostics.attachedDeviceIds() + .filterNot(connectedIds::contains) + .forEach { deviceId -> + inputDiagnostics.clearDevice( + deviceId, + "device_missing", + removeSession = true, + eventTimeMs = SystemClock.uptimeMillis(), + ) + } + controllers = DeviceDiagnostics.controllers(inputDiagnostics) + if (::controllerText.isInitialized) { + controllerText.text = if (controllers.isEmpty()) { + getString(R.string.no_controller) + } else { + controllers.joinToString("\n\n") { it.render() } + } + renderInputState() + } + } + + private fun renderInputState() { + if (!::stateText.isInitialized) return + stateText.text = if (controllers.isEmpty()) { + getString(R.string.no_input_state) + } else { + controllers.joinToString("\n\n") { controller -> + val snapshot = inputDiagnostics.snapshot(controller.deviceId) + val keys = snapshot?.pressedKeys + ?.sorted() + ?.joinToString { KeyEvent.keyCodeToString(it) } + .orEmpty() + .ifEmpty { "无" } + val axes = snapshot?.axes + ?.toSortedMap() + ?.entries + ?.joinToString { (axis, value) -> + "${MotionEvent.axisToString(axis) ?: "AXIS_$axis"}=${String.format(Locale.ROOT, "%.3f", value)}" + } + .orEmpty() + .ifEmpty { "未采样" } + "会话 ${controller.sessionId}:按键 [$keys]\n轴 [$axes]" + } + } + + val events = inputDiagnostics.recordedEvents().takeLast(EVENT_LINES) + eventText.text = if (events.isEmpty()) { + getString(R.string.no_events) + } else { + events.joinToString("\n") { event -> + "#${event.sequence} s${event.sessionId} d${event.deviceId} ${event.kind}/${event.action} ${event.name}=${String.format(Locale.ROOT, "%.3f", event.value)} t=${event.eventTimeMs} src=0x${event.source.toUInt().toString(16)} repeat=${event.repeatCount}" + } + } + } + + private fun exportDiagnostics(uri: Uri) { + val json = buildDiagnosticReport().toString(2) + runCatching { + contentResolver.openOutputStream(uri, "wt")?.bufferedWriter(Charsets.UTF_8).use { writer -> + requireNotNull(writer) { "系统未提供可写输出流" } + writer.write(json) + } + }.onSuccess { + Toast.makeText(this, R.string.export_success, Toast.LENGTH_LONG).show() + }.onFailure { error -> + Toast.makeText( + this, + getString(R.string.export_failed, error.javaClass.simpleName, error.message ?: "未知错误"), + Toast.LENGTH_LONG, + ).show() + } + } + + private fun buildDiagnosticReport(): JSONObject = JSONObject() + .put("formatVersion", 1) + .put("exportedAtEpochMs", System.currentTimeMillis()) + .put("elapsedRealtimeMs", SystemClock.elapsedRealtime()) + .put( + "application", + JSONObject() + .put("applicationId", BuildConfig.APPLICATION_ID) + .put("versionName", BuildConfig.VERSION_NAME) + .put("versionCode", BuildConfig.VERSION_CODE), + ) + .put( + "native", + JSONObject() + .put("loaded", nativeProbe.loaded) + .put("buildInfo", nativeProbe.buildInfo ?: JSONObject.NULL) + .put("pageSizeBytes", nativeProbe.pageSizeBytes ?: JSONObject.NULL) + .put("error", nativeProbe.error ?: JSONObject.NULL), + ) + .put("device", baseline.toJson()) + .put("controllers", JSONArray().apply { controllers.forEach { put(it.toJson()) } }) + .put("eventCapacity", InputDiagnostics.DEFAULT_CAPACITY) + .put("events", DiagnosticEventJson.toJsonArray(inputDiagnostics.recordedEvents())) + + private fun probeNative(): NativeProbe = runCatching { + NativeProbe( + loaded = true, + buildInfo = NativeBridge.buildInfo(), + pageSizeBytes = NativeBridge.pageSizeBytes(), + error = null, + ) + }.getOrElse { error -> + NativeProbe( + loaded = false, + buildInfo = null, + pageSizeBytes = null, + error = "${error.javaClass.name}: ${error.message ?: "无详细消息"}", + ) + } + + private fun title(text: String) = TextView(this).apply { + this.text = text + textSize = 26f + setTextIsSelectable(true) + } + + private fun section(text: String) = TextView(this).apply { + this.text = text + textSize = 20f + setPadding(0, 28, 0, 8) + setTextIsSelectable(true) + } + + private fun body(text: String) = TextView(this).apply { + this.text = text + textSize = 14f + setTextIsSelectable(true) + } + + private fun defaultExportName(): String { + val timestamp = SimpleDateFormat("yyyyMMdd-HHmmss", Locale.ROOT).format(Date()) + return "neslite-diagnostics-$timestamp.json" + } + + private data class NativeProbe( + val loaded: Boolean, + val buildInfo: String?, + val pageSizeBytes: Long?, + val error: String?, + ) { + fun render(): String = if (loaded) { + "状态:成功\n入口:$buildInfo\n页大小:${pageSizeBytes ?: "未知"} bytes" + } else { + "状态:失败\n错误:$error" + } + } + + private class DiagnosticScrollView( + context: Context, + private val keyHandler: (KeyEvent) -> Boolean, + private val motionHandler: (MotionEvent) -> Boolean, + ) : ScrollView(context) { + override fun dispatchKeyEvent(event: KeyEvent): Boolean = + keyHandler(event) || super.dispatchKeyEvent(event) + + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean = + motionHandler(event) || super.dispatchGenericMotionEvent(event) + } + + companion object { + private const val EVENT_LINES = 30 + } } diff --git a/app/src/main/java/org/neslite/app/NativeBridge.kt b/app/src/main/java/org/neslite/app/NativeBridge.kt index 5a4f36f..063f2dd 100644 --- a/app/src/main/java/org/neslite/app/NativeBridge.kt +++ b/app/src/main/java/org/neslite/app/NativeBridge.kt @@ -7,4 +7,6 @@ object NativeBridge { } external fun buildInfo(): String + + external fun pageSizeBytes(): Long } diff --git a/app/src/main/java/org/neslite/app/diagnostics/DeviceDiagnostics.kt b/app/src/main/java/org/neslite/app/diagnostics/DeviceDiagnostics.kt new file mode 100644 index 0000000..ac76cbd --- /dev/null +++ b/app/src/main/java/org/neslite/app/diagnostics/DeviceDiagnostics.kt @@ -0,0 +1,176 @@ +package org.neslite.app.diagnostics + +import android.content.Context +import android.hardware.display.DisplayManager +import android.os.Build +import android.view.Display +import android.view.InputDevice +import android.view.MotionEvent +import org.json.JSONArray +import org.json.JSONObject +import java.util.Locale + +data class DeviceBaseline( + val manufacturer: String, + val model: String, + val apiLevel: Int, + val release: String, + val supportedAbis: List, + val pageSizeBytes: Long?, + val displayWidthPx: Int?, + val displayHeightPx: Int?, + val currentRefreshRateHz: Float?, + val availableRefreshRatesHz: List, +) { + fun toJson(): JSONObject = JSONObject() + .put("manufacturer", manufacturer) + .put("model", model) + .put("apiLevel", apiLevel) + .put("release", release) + .put("supportedAbis", JSONArray(supportedAbis)) + .put("pageSizeBytes", pageSizeBytes ?: JSONObject.NULL) + .put("displayWidthPx", displayWidthPx ?: JSONObject.NULL) + .put("displayHeightPx", displayHeightPx ?: JSONObject.NULL) + .put("currentRefreshRateHz", currentRefreshRateHz ?: JSONObject.NULL) + .put("availableRefreshRatesHz", JSONArray(availableRefreshRatesHz)) + + fun render(): String = buildString { + appendLine("设备:$manufacturer $model") + appendLine("Android:$release (API $apiLevel)") + appendLine("ABI:${supportedAbis.ifEmpty { listOf("未知") }.joinToString()}") + appendLine("页大小:${pageSizeBytes?.let { "$it bytes" } ?: "未知"}") + appendLine( + "屏幕:${if (displayWidthPx != null && displayHeightPx != null) "${displayWidthPx}×$displayHeightPx px" else "未知"}", + ) + append("刷新率:${currentRefreshRateHz?.formatHz() ?: "未知"};可用 ${availableRefreshRatesHz.joinToString { it.formatHz() }.ifEmpty { "未知" }}") + } +} + +data class MotionRangeSnapshot( + val axis: Int, + val axisName: String, + val source: Int, + val min: Float, + val max: Float, + val flat: Float, + val fuzz: Float, + val resolution: Float, +) { + fun toJson(): JSONObject = JSONObject() + .put("axis", axis) + .put("axisName", axisName) + .put("source", source) + .put("sourceHex", "0x${source.toUInt().toString(16)}") + .put("min", min.toDouble()) + .put("max", max.toDouble()) + .put("flat", flat.toDouble()) + .put("fuzz", fuzz.toDouble()) + .put("resolution", resolution.toDouble()) +} + +data class ControllerSnapshot( + val deviceId: Int, + val sessionId: Long, + val name: String, + val descriptor: String, + val vendorId: Int, + val productId: Int, + val sources: Int, + val ranges: List, +) { + fun toJson(): JSONObject = JSONObject() + .put("deviceId", deviceId) + .put("sessionId", sessionId) + .put("name", name) + .put("descriptor", descriptor) + .put("vendorId", vendorId) + .put("productId", productId) + .put("sources", sources) + .put("sourcesHex", "0x${sources.toUInt().toString(16)}") + .put("motionRanges", JSONArray().apply { ranges.forEach { put(it.toJson()) } }) + + fun render(): String = buildString { + appendLine("$name [本次会话 $sessionId / 临时 ID $deviceId]") + appendLine("descriptor:$descriptor") + appendLine("VID/PID:${vendorId.hex4()}/${productId.hex4()};sources=0x${sources.toUInt().toString(16)}") + if (ranges.isEmpty()) { + append("轴:未上报") + } else { + append( + ranges.joinToString(separator = "\n") { + "${it.axisName}: ${it.min.format()}..${it.max.format()} flat=${it.flat.format()} source=0x${it.source.toUInt().toString(16)}" + }, + ) + } + } +} + +object DeviceDiagnostics { + fun collectBaseline(context: Context, pageSizeBytes: Long?): DeviceBaseline { + val displayManager = context.getSystemService(DisplayManager::class.java) + val display = displayManager?.getDisplay(Display.DEFAULT_DISPLAY) + val mode = display?.mode + val rates = display?.supportedModes + ?.map { it.refreshRate } + ?.distinctBy { (it * 100f).toInt() } + ?.sorted() + .orEmpty() + return DeviceBaseline( + manufacturer = Build.MANUFACTURER.orUnknown(), + model = Build.MODEL.orUnknown(), + apiLevel = Build.VERSION.SDK_INT, + release = Build.VERSION.RELEASE.orUnknown(), + supportedAbis = Build.SUPPORTED_ABIS?.toList().orEmpty(), + pageSizeBytes = pageSizeBytes?.takeIf { it > 0L }, + displayWidthPx = mode?.physicalWidth, + displayHeightPx = mode?.physicalHeight, + currentRefreshRateHz = mode?.refreshRate, + availableRefreshRatesHz = rates, + ) + } + + fun controllerDeviceIds(): Set = InputDevice.getDeviceIds().toList() + .mapNotNull(InputDevice::getDevice) + .filter(::isController) + .mapTo(linkedSetOf()) { it.id } + + fun controllers(inputDiagnostics: InputDiagnostics): List = InputDevice.getDeviceIds().toList() + .mapNotNull(InputDevice::getDevice) + .filter(::isController) + .sortedBy { it.name.lowercase(Locale.ROOT) } + .map { device -> + ControllerSnapshot( + deviceId = device.id, + sessionId = inputDiagnostics.attach(device.id), + name = device.name.orUnknown(), + descriptor = device.descriptor.orUnknown(), + vendorId = device.vendorId, + productId = device.productId, + sources = device.sources, + ranges = device.motionRanges.map { range -> + MotionRangeSnapshot( + axis = range.axis, + axisName = MotionEvent.axisToString(range.axis) ?: "AXIS_${range.axis}", + source = range.source, + min = range.min, + max = range.max, + flat = range.flat, + fuzz = range.fuzz, + resolution = range.resolution, + ) + }, + ) + } + + fun isController(device: InputDevice): Boolean = isControllerSource(device.sources) + + fun isControllerSource(source: Int): Boolean = + source and InputDevice.SOURCE_GAMEPAD == InputDevice.SOURCE_GAMEPAD || + source and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK || + source and InputDevice.SOURCE_DPAD == InputDevice.SOURCE_DPAD +} + +private fun String?.orUnknown(): String = this?.takeIf { it.isNotBlank() } ?: "未知" +private fun Float.format(): String = String.format(Locale.ROOT, "%.3f", this) +private fun Float.formatHz(): String = String.format(Locale.ROOT, "%.2f Hz", this) +private fun Int.hex4(): String = "0x${toString(16).padStart(4, '0')}" diff --git a/app/src/main/java/org/neslite/app/diagnostics/DiagnosticEvent.kt b/app/src/main/java/org/neslite/app/diagnostics/DiagnosticEvent.kt new file mode 100644 index 0000000..47fd397 --- /dev/null +++ b/app/src/main/java/org/neslite/app/diagnostics/DiagnosticEvent.kt @@ -0,0 +1,21 @@ +package org.neslite.app.diagnostics + +data class DiagnosticEvent( + val sequence: Long, + val sessionId: Long, + val deviceId: Int, + val eventTimeMs: Long, + val source: Int, + val kind: String, + val action: String, + val code: Int, + val name: String, + val value: Float, + val repeatCount: Int, +) + +data class InputSnapshot( + val sessionId: Long, + val pressedKeys: Set, + val axes: Map, +) diff --git a/app/src/main/java/org/neslite/app/diagnostics/DiagnosticEventJson.kt b/app/src/main/java/org/neslite/app/diagnostics/DiagnosticEventJson.kt new file mode 100644 index 0000000..e74537c --- /dev/null +++ b/app/src/main/java/org/neslite/app/diagnostics/DiagnosticEventJson.kt @@ -0,0 +1,58 @@ +package org.neslite.app.diagnostics + +import org.json.JSONArray +import org.json.JSONObject + +object DiagnosticEventJson { + const val FORMAT_VERSION = 1 + + fun encode(events: List): String = JSONObject() + .put("formatVersion", FORMAT_VERSION) + .put("events", toJsonArray(events)) + .toString(2) + + fun decode(json: String): List { + val root = JSONObject(json) + require(root.getInt("formatVersion") == FORMAT_VERSION) { "Unsupported diagnostic format" } + val array = root.getJSONArray("events") + return buildList(array.length()) { + for (index in 0 until array.length()) { + val item = array.getJSONObject(index) + add( + DiagnosticEvent( + sequence = item.getLong("sequence"), + sessionId = item.getLong("sessionId"), + deviceId = item.getInt("deviceId"), + eventTimeMs = item.getLong("eventTimeMs"), + source = item.getInt("source"), + kind = item.getString("kind"), + action = item.getString("action"), + code = item.getInt("code"), + name = item.getString("name"), + value = item.getDouble("value").toFloat(), + repeatCount = item.getInt("repeatCount"), + ), + ) + } + } + } + + fun toJsonArray(events: List): JSONArray = JSONArray().apply { + events.forEach { event -> + put( + JSONObject() + .put("sequence", event.sequence) + .put("sessionId", event.sessionId) + .put("deviceId", event.deviceId) + .put("eventTimeMs", event.eventTimeMs) + .put("source", event.source) + .put("kind", event.kind) + .put("action", event.action) + .put("code", event.code) + .put("name", event.name) + .put("value", event.value.toDouble()) + .put("repeatCount", event.repeatCount), + ) + } + } +} diff --git a/app/src/main/java/org/neslite/app/diagnostics/InputDiagnostics.kt b/app/src/main/java/org/neslite/app/diagnostics/InputDiagnostics.kt new file mode 100644 index 0000000..7d516fe --- /dev/null +++ b/app/src/main/java/org/neslite/app/diagnostics/InputDiagnostics.kt @@ -0,0 +1,129 @@ +package org.neslite.app.diagnostics + +import java.util.ArrayDeque + +class InputDiagnostics(private val capacity: Int = DEFAULT_CAPACITY) { + private val events = ArrayDeque(capacity) + private val sessions = mutableMapOf() + private val pressedKeys = mutableMapOf>() + private val axes = mutableMapOf>() + private var nextSessionId = 1L + private var nextSequence = 1L + + init { + require(capacity > 0) { "capacity must be positive" } + } + + fun attach(deviceId: Int): Long = sessions.getOrPut(deviceId) { nextSessionId++ } + + fun sessionId(deviceId: Int): Long? = sessions[deviceId] + + fun attachedDeviceIds(): Set = sessions.keys.toSet() + + fun recordKey( + deviceId: Int, + eventTimeMs: Long, + source: Int, + action: String, + keyCode: Int, + keyName: String, + repeatCount: Int, + ) { + val sessionId = attach(deviceId) + val keys = pressedKeys.getOrPut(deviceId) { linkedSetOf() } + when (action) { + "down", "repeat" -> keys += keyCode + "up" -> keys -= keyCode + } + append( + DiagnosticEvent( + sequence = nextSequence++, + sessionId = sessionId, + deviceId = deviceId, + eventTimeMs = eventTimeMs, + source = source, + kind = "key", + action = action, + code = keyCode, + name = keyName, + value = if (action == "up") 0f else 1f, + repeatCount = repeatCount, + ), + ) + } + + fun recordAxis( + deviceId: Int, + eventTimeMs: Long, + source: Int, + axis: Int, + axisName: String, + value: Float, + ) { + val sessionId = attach(deviceId) + axes.getOrPut(deviceId) { linkedMapOf() }[axis] = value + append( + DiagnosticEvent( + sequence = nextSequence++, + sessionId = sessionId, + deviceId = deviceId, + eventTimeMs = eventTimeMs, + source = source, + kind = "axis", + action = "sample", + code = axis, + name = axisName, + value = value, + repeatCount = 0, + ), + ) + } + + fun clearDevice(deviceId: Int, reason: String, removeSession: Boolean, eventTimeMs: Long = 0L) { + val sessionId = sessions[deviceId] ?: return + pressedKeys.remove(deviceId) + axes.remove(deviceId) + append( + DiagnosticEvent( + sequence = nextSequence++, + sessionId = sessionId, + deviceId = deviceId, + eventTimeMs = eventTimeMs, + source = 0, + kind = "state", + action = reason, + code = 0, + name = reason, + value = 0f, + repeatCount = 0, + ), + ) + if (removeSession) sessions.remove(deviceId) + } + + fun clearAll(reason: String, eventTimeMs: Long = 0L) { + sessions.keys.toList().forEach { + clearDevice(it, reason, removeSession = false, eventTimeMs = eventTimeMs) + } + } + + fun snapshot(deviceId: Int): InputSnapshot? { + val sessionId = sessions[deviceId] ?: return null + return InputSnapshot( + sessionId = sessionId, + pressedKeys = pressedKeys[deviceId]?.toSet().orEmpty(), + axes = axes[deviceId]?.toMap().orEmpty(), + ) + } + + fun recordedEvents(): List = events.toList() + + private fun append(event: DiagnosticEvent) { + if (events.size == capacity) events.removeFirst() + events.addLast(event) + } + + companion object { + const val DEFAULT_CAPACITY = 512 + } +} diff --git a/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml new file mode 100644 index 0000000..a8d4770 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4823208..a678401 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,16 @@ NESLite - NESLite M0 baseline\n%s + NESLite 0.1.x 设备诊断 + 请使用 X5 Lite 原生安卓模式并关闭硬件连发。依次测试方向与 A/B 组合、全部松开、按住时拔出及重新连接;真实键码以页面和导出 JSON 为准。 + JNI 自检 + 手机与显示 + 已连接控制器 + 实时输入状态 + 最近 30 条事件(最多保留 512 条) + 未检测到手柄。连接后此页会自动更新。 + 连接手柄并操作后显示组合按键与轴值。 + 尚无输入事件。 + 导出诊断 JSON + 诊断 JSON 已导出 + 导出失败:%1$s — %2$s diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..92f2b38 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..defff21 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/app/src/test/java/org/neslite/app/BuildIdentityTest.kt b/app/src/test/java/org/neslite/app/BuildIdentityTest.kt index df1f17f..ccfe004 100644 --- a/app/src/test/java/org/neslite/app/BuildIdentityTest.kt +++ b/app/src/test/java/org/neslite/app/BuildIdentityTest.kt @@ -7,6 +7,7 @@ class BuildIdentityTest { @Test fun debugBuildUsesTheDocumentedIdentity() { assertEquals("org.neslite.app.debug", BuildConfig.APPLICATION_ID) - assertEquals("0.0.1-dev-debug", BuildConfig.VERSION_NAME) + assertEquals("0.1.3-debug", BuildConfig.VERSION_NAME) + assertEquals(1003, BuildConfig.VERSION_CODE) } } diff --git a/app/src/test/java/org/neslite/app/diagnostics/InputDiagnosticsTest.kt b/app/src/test/java/org/neslite/app/diagnostics/InputDiagnosticsTest.kt new file mode 100644 index 0000000..bd26e81 --- /dev/null +++ b/app/src/test/java/org/neslite/app/diagnostics/InputDiagnosticsTest.kt @@ -0,0 +1,65 @@ +package org.neslite.app.diagnostics + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class InputDiagnosticsTest { + @Test + fun combinationReleaseAndFocusLossClearState() { + val diagnostics = InputDiagnostics() + + diagnostics.recordKey(7, 10, 0x401, "down", 19, "KEYCODE_DPAD_UP", 0) + diagnostics.recordKey(7, 11, 0x401, "down", 96, "KEYCODE_BUTTON_A", 0) + assertEquals(setOf(19, 96), diagnostics.snapshot(7)?.pressedKeys) + + diagnostics.recordKey(7, 12, 0x401, "up", 19, "KEYCODE_DPAD_UP", 0) + assertEquals(setOf(96), diagnostics.snapshot(7)?.pressedKeys) + + diagnostics.clearAll("focus_lost") + assertTrue(diagnostics.snapshot(7)?.pressedKeys.orEmpty().isEmpty()) + assertEquals("focus_lost", diagnostics.recordedEvents().last().action) + } + + @Test + fun removalClearsStateAndReconnectCreatesNewSession() { + val diagnostics = InputDiagnostics() + val firstSession = diagnostics.attach(4) + diagnostics.recordAxis(4, 20, 0x1000010, 15, "AXIS_HAT_X", -1f) + + diagnostics.clearDevice(4, "device_removed", removeSession = true) + assertEquals(null, diagnostics.snapshot(4)) + + val secondSession = diagnostics.attach(4) + assertNotEquals(firstSession, secondSession) + assertTrue(diagnostics.snapshot(4)?.axes.orEmpty().isEmpty()) + } + + @Test + fun recorderIsBoundedAndPreservesNewestOrder() { + val diagnostics = InputDiagnostics(capacity = 3) + repeat(5) { index -> + diagnostics.recordAxis(1, index.toLong(), 0x1000010, index, "AXIS_$index", index.toFloat()) + } + + val events = diagnostics.recordedEvents() + assertEquals(3, events.size) + assertEquals(listOf(3L, 4L, 5L), events.map { it.sequence }) + assertFalse(events.any { it.code < 2 }) + } + + @Test + fun exportedEventsRoundTripWithoutChangingOrderOrValues() { + val original = listOf( + DiagnosticEvent(1, 8, 3, 100, 0x401, "key", "down", 96, "KEYCODE_BUTTON_A", 1f, 0), + DiagnosticEvent(2, 8, 3, 101, 0x1000010, "axis", "sample", 15, "AXIS_HAT_X", -0.75f, 0), + DiagnosticEvent(3, 8, 3, 102, 0x401, "key", "up", 96, "KEYCODE_BUTTON_A", 0f, 0), + ) + + val decoded = DiagnosticEventJson.decode(DiagnosticEventJson.encode(original)) + + assertEquals(original, decoded) + } +} diff --git a/docs/build.md b/docs/build.md index cacacd7..52c0874 100644 --- a/docs/build.md +++ b/docs/build.md @@ -40,6 +40,17 @@ pwsh -NoProfile -File .\tools\check.ps1 -Scope Build `Stage` 是 M0 的阶段入口,不是未来 G1~G9 的替代。实机、ROM、存档、插拔和耐久验收必须在 相应里程碑按 [acceptance.md](acceptance.md) 执行和记录。 +## M1 诊断版安装 + +连接并授权一台目标手机后执行: + +```powershell +pwsh -NoProfile -File .\tools\check-m1-device.ps1 +``` + +脚本安装并启动 `0.1.3-debug` 诊断版;手柄操作和导出步骤见 +[controller-x5lite.md](controller-x5lite.md)。连接多台设备时传入 `-Serial `。 + ## 清理 只清理本工程生成物时删除 `build/`、`app/build/` 和 `.build/`;不要删除 SDK、NDK、 diff --git a/docs/controller-x5lite.md b/docs/controller-x5lite.md new file mode 100644 index 0000000..cd605aa --- /dev/null +++ b/docs/controller-x5lite.md @@ -0,0 +1,47 @@ +# X5 Lite 实测键位与模式 + +本文档只登记真实设备结果,不根据按钮字母或网络资料推断 Android 键码。当前尚未连接目标手机和 +X5 Lite,因此表格保持“待实测”;完成下述流程并导出诊断 JSON 后回填。 + +## 固定测试条件 + +- 手柄模式:原生安卓模式,实际切换方法待随设备说明和实测确认。 +- 硬件连发:测试前关闭;实际指示状态待实测记录。 +- 厂商保留组合:待实测;不得占用“视图+菜单长按”。 +- 应用版本:`0.1.3-debug`。 +- 事件上限:最近 512 条;页面显示最近 30 条。 + +## 连贯验收步骤 + +1. 连接目标手机,启用 USB 调试,运行 `pwsh -NoProfile -File tools/check-m1-device.ps1`。 +2. 连接 X5 Lite,确认页面出现名称、descriptor、VID/PID、sources 和轴范围。 +3. 分别操作十字键、左右摇杆、扳机和所有正面/肩键,观察按下、重复、松开与轴值。 +4. 同时按住一个方向和 A/B,确认组合状态同时存在;全部松开后确认状态为“无”。 +5. 按住方向及 A/B 时拔出手柄,确认出现 `device_removed` 且状态清空。 +6. 重新连接,确认分配新的会话编号并可继续记录。 +7. 点击“导出诊断 JSON”,保存文件并在本报告登记文件名和 SHA-256。 + +## 设备身份 + +| 项目 | 实测值 | +| --- | --- | +| 手机型号/系统 | 待实测 | +| API/ABI/页大小 | 待实测 | +| 屏幕/当前及可用刷新率 | 待实测 | +| 手柄名称/descriptor | 待实测 | +| VID/PID/sources | 待实测 | +| 安卓模式切换方法 | 待实测 | +| 硬件连发关闭方式/状态 | 待实测 | +| 厂商保留组合 | 待实测 | +| 诊断 JSON/SHA-256 | 待实测 | + +## 键位与轴 + +| 物理控件 | Android KeyEvent/MotionEvent | sources/范围 | 重复上报 | 备注 | +| --- | --- | --- | --- | --- | +| 十字键上/下/左/右 | 待实测 | 待实测 | 待实测 | 记录按键与 HAT 是否同时上报 | +| A/B/X/Y | 待实测 | 待实测 | 待实测 | 不按字母推断 NES 映射 | +| LB/RB/LT/RT | 待实测 | 待实测 | 待实测 | 记录扳机按键/轴双重上报 | +| 左摇杆/按下 | 待实测 | 待实测 | 待实测 | 记录 X/Y、flat 与范围 | +| 右摇杆/按下 | 待实测 | 待实测 | 待实测 | 记录 Z/RZ、flat 与范围 | +| 视图/菜单 | 待实测 | 待实测 | 待实测 | 保留厂商组合说明 | diff --git a/docs/dependencies.md b/docs/dependencies.md index be88870..23e568a 100644 --- a/docs/dependencies.md +++ b/docs/dependencies.md @@ -10,6 +10,7 @@ Gradle 版本锁见 [gradle/libs.versions.toml](../gradle/libs.versions.toml)。 | Kotlin Gradle plugin | 2.3.0 | Gradle Plugin Portal | Apache-2.0;发布材料列出坐标 | M0 使用 | | AndroidX Core/Activity | 1.17.0/1.12.0 | Google Maven | Apache-2.0;保留 notices | M0 使用 | | JUnit | 4.13.2 | Maven Central | EPL-1.0;测试依赖,不打入生产 APK | M0 使用 | +| JSON-java | 20240303 | Maven Central | Public Domain;仅用于 JVM 测试,不打入生产 APK | M1 使用 | | AndroidX test/Espresso | 1.3.0/3.7.0 | Google Maven | Apache-2.0;测试依赖,不打入生产 APK | M0 使用 | | Room | 2.7.2 | Google Maven | Apache-2.0;后续 APK notices | M2 预锁定 | | DataStore | 1.1.7 | Google Maven | Apache-2.0;后续 APK notices | M4/M6 预锁定 | diff --git a/docs/identity.md b/docs/identity.md index 7890742..21f01e4 100644 --- a/docs/identity.md +++ b/docs/identity.md @@ -6,7 +6,7 @@ | --- | --- | | 显示名称 | `NESLite` | | 正式 application ID/namespace | `org.neslite.app` | -| 当前开发版本 | `0.0.1-dev`,`versionCode = 1` | +| 当前开发版本 | `0.1.3`,`versionCode = 1003` | | 调试 application ID | `org.neslite.app.debug` | | 发布 ABI | `arm64-v8a` | | min/target SDK | 28/36 | diff --git a/docs/reports/m1-diagnostics.md b/docs/reports/m1-diagnostics.md new file mode 100644 index 0000000..96f20c8 --- /dev/null +++ b/docs/reports/m1-diagnostics.md @@ -0,0 +1,42 @@ +# M1 设备与 X5 Lite 诊断报告 + +- 日期:2026-09-12 +- 应用版本:`0.1.3-debug`(versionCode 1003) +- 源码提交:待本阶段实现提交 +- 基线提交:`f043131` +- 验收目标:G1 诊断门槛 +- 当前结论:实现和自动验证已完成,等待真实目标手机与 X5 Lite 实测 + +## 自动验证 + +| 检查 | 结果 | 证据 | +| --- | --- | --- | +| APK 编译与 arm64 JNI | 通过 | `app-debug.apk`;`lib/arm64-v8a/libneslite_jni.so` | +| 构建身份 | 通过 | `org.neslite.app.debug`、`0.1.3-debug`、versionCode 1003 | +| Android Lint | 通过 | 0 errors;10 项提示均为已锁定版本有更新或仅发布 arm64 的已知范围提示 | +| 输入组合、松开和失焦清理 | 通过 | `InputDiagnosticsTest` | +| 拔出清理与重连新会话 | 通过 | `InputDiagnosticsTest` | +| 512 条有界记录 | 通过 | 容量边界测试使用 3 条窗口验证只保留最新事件 | +| JSON 顺序和值往返 | 通过 | key/axis/key-up 代表序列解码后完全一致 | +| 原生 smoke | 通过 | CTest `neslite_native_smoke_test` | + +最终 APK 为 7,386,298 bytes,SHA-256 为 +`39DE483F3255020A83C93A48B10FEB5EA4645F80DA6FF032D5EE01DA5641048B`。本地单元测试共 5 项, +failures/errors/skipped 均为 0。 + +## 实机验收 + +ADB 检查时没有已授权设备,因此以下项目不得记为通过: + +| 路径 | 状态 | 待取得证据 | +| --- | --- | --- | +| 安装、启动和 JNI 自检 | 未验证 | 目标手机页面或诊断 JSON | +| 手机 API/ABI/页大小/屏幕/刷新率 | 未验证 | 诊断 JSON 与设备系统信息核对 | +| X5 Lite 枚举和插拔更新 | 未验证 | 连接、移除、重连记录 | +| 方向+A/B、松开归零 | 未验证 | 实际 KeyEvent/MotionEvent 序列 | +| HAT/摇杆/扳机及重复上报 | 未验证 | 轴范围和实际采样 | +| 失焦、按住拔出和重连 | 未验证 | `focus_lost`、`device_removed` 与新 sessionId | +| 系统选择器导出 | 未验证 | 可读 JSON 文件及 SHA-256 | + +实机步骤和待回填表位于 `docs/controller-x5lite.md`。G1 通过后,根据真实键位复杂度重新确认 M2 +工作量;在没有实测数据前暂不改变计划中的 7~9 人日估算。 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2b9d01f..ad70174 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,6 +4,7 @@ kotlin = "2.3.0" androidxCore = "1.17.0" androidxActivity = "1.12.0" junit = "4.13.2" +json = "20240303" androidxJunit = "1.3.0" espresso = "3.7.0" room = "2.7.2" @@ -17,6 +18,7 @@ androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = " androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" } junit = { module = "junit:junit", version.ref = "junit" } +json = { module = "org.json:json", version.ref = "json" } androidx-junit = { module = "androidx.test.ext:junit", version.ref = "androidxJunit" } androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" } diff --git a/todo.md b/todo.md index ff0cd27..c2d40dc 100644 --- a/todo.md +++ b/todo.md @@ -105,16 +105,16 @@ G1~G8 的共同交付物为对应阶段 APK、源码提交、构建说明、 ### M1/0.1.x:设备与手柄诊断 -- [ ] **M1-01a 完成安装和 JNI 自检**。前置:无。完成:诊断页展示原生调用结果与库加载错误;应用可在目标手机启动。验收:L2,一次安装启动和一次 JNI 调用成功,错误可定位。 -- [ ] **M1-01b 展示真实设备基线**。前置:M1-01a。完成:读取机型、系统 API、ABI、页大小、屏幕尺寸和可用刷新率;未知值明确标记。验收:L2,与设备可读取信息核对,不按 MagicOS 名称推断硬件。 -- [ ] **M1-02a 枚举控制器能力**。前置:M1-01a。完成:展示名称、描述符、厂商/产品标识、输入源和轴范围;连接/移除时更新列表。验收:L2,一次接入和移除可观察,设备临时编号不作持久身份。 -- [ ] **M1-03a 建立实时按钮状态页**。前置:M1-02a。完成:显示 KeyEvent 按下/松开及组合状态,保留事件时间与来源。验收:L2,方向和 A/B 可同时按下,全部松开后状态清零。 -- [ ] **M1-03b 展示轴与重复上报**。前置:M1-03a。完成:展示 HAT、摇杆、扳机值,能辨认同一操作的按键/轴两种上报。验收:L2,各实际可用轴的往返变化可观察,未上报的能力不伪造。 -- [ ] **M1-03c 记录可回放输入序列**。前置:M1-03b。完成:按统一事件结构保存来源、时间、动作和值,记录有界;提供供后续逻辑测试读取的格式。验收:L1,一段组合输入记录读取后事件顺序和数值一致。 -- [ ] **M1-04a 清理异常输入状态**。前置:M1-03b。完成:失焦、设备移除时清空相应状态;重连创建新的会话关联。验收:L2,按住后拔出、失焦、重连各一条代表路径无残留;此时不做 20 轮插拔。 -- [ ] **M1-04b 导出诊断和实测键位表**。前置:M1-01b、M1-03c、M1-04a。完成:通过系统选择器导出设备与事件 JSON,写入 docs/controller-x5lite.md,记录安卓模式、硬件连发状态和厂商保留组合。验收:L2,导出可读且键位表对应实测事件。 +- [ ] **M1-01a 完成安装和 JNI 自检**。前置:无。完成:诊断页展示原生调用结果与库加载错误;应用可在目标手机启动。验收:L2,一次安装启动和一次 JNI 调用成功,错误可定位。状态:诊断页和 JNI 页大小入口已实现、APK 已构建;ADB 无已授权设备,待目标手机安装启动验证。 +- [ ] **M1-01b 展示真实设备基线**。前置:M1-01a。完成:读取机型、系统 API、ABI、页大小、屏幕尺寸和可用刷新率;未知值明确标记。验收:L2,与设备可读取信息核对,不按 MagicOS 名称推断硬件。状态:读取与 JSON 字段已实现,待目标手机实值核对。 +- [ ] **M1-02a 枚举控制器能力**。前置:M1-01a。完成:展示名称、描述符、厂商/产品标识、输入源和轴范围;连接/移除时更新列表。验收:L2,一次接入和移除可观察,设备临时编号不作持久身份。状态:监听和展示已实现,以独立 sessionId 区分重连;待 X5 Lite 接入/移除验证。 +- [ ] **M1-03a 建立实时按钮状态页**。前置:M1-02a。完成:显示 KeyEvent 按下/松开及组合状态,保留事件时间与来源。验收:L2,方向和 A/B 可同时按下,全部松开后状态清零。状态:组合状态与事件字段已实现并通过逻辑测试,待真实方向+A/B 路径。 +- [ ] **M1-03b 展示轴与重复上报**。前置:M1-03a。完成:展示 HAT、摇杆、扳机值,能辨认同一操作的按键/轴两种上报。验收:L2,各实际可用轴的往返变化可观察,未上报的能力不伪造。状态:按设备实际 motionRanges 展示和采样已实现,待真实轴往返验证。 +- [x] **M1-03c 记录可回放输入序列**。前置:M1-03b。完成:按统一事件结构保存来源、时间、动作和值,记录有界;提供供后续逻辑测试读取的格式。验收:L1,一段组合输入记录读取后事件顺序和数值一致。证据:`InputDiagnosticsTest` 验证 512 条上限策略,以及 key/axis/key-up 序列 JSON 往返后顺序和值完全一致;详见 `docs/reports/m1-diagnostics.md`。 +- [ ] **M1-04a 清理异常输入状态**。前置:M1-03b。完成:失焦、设备移除时清空相应状态;重连创建新的会话关联。验收:L2,按住后拔出、失焦、重连各一条代表路径无残留;此时不做 20 轮插拔。状态:清理与新会话逻辑已实现并通过自动测试,待真实拔出/失焦/重连路径。 +- [ ] **M1-04b 导出诊断和实测键位表**。前置:M1-01b、M1-03c、M1-04a。完成:通过系统选择器导出设备与事件 JSON,写入 docs/controller-x5lite.md,记录安卓模式、硬件连发状态和厂商保留组合。验收:L2,导出可读且键位表对应实测事件。状态:系统选择器导出和待填键位表已完成,待真实 JSON 与键位回填。 -- [ ] **G1 诊断门槛**。前置:本阶段全部实现项。验收:L3;在真实目标手机和 X5 Lite 完成“连接 → 组合输入 → 松开 → 按住拔出 → 重连”一次连贯检查,可复用本阶段有效实机记录。交付 0.1.x APK、源码提交、构建说明、设备 JSON、键位表和未覆盖项;重估后续工期。 +- [ ] **G1 诊断门槛**。前置:本阶段全部实现项。验收:L3;在真实目标手机和 X5 Lite 完成“连接 → 组合输入 → 松开 → 按住拔出 → 重连”一次连贯检查,可复用本阶段有效实机记录。交付 0.1.x APK、源码提交、构建说明、设备 JSON、键位表和未覆盖项;重估后续工期。状态:0.1.3 诊断 APK 与自动测试已完成;ADB 未检测到设备,等待目标手机和 X5 Lite 实机验收,详见 `docs/reports/m1-diagnostics.md`。 ### M2/0.2.x:内核、画面与基础操作 diff --git a/tools/check-m1-device.ps1 b/tools/check-m1-device.ps1 new file mode 100644 index 0000000..6c0ce14 --- /dev/null +++ b/tools/check-m1-device.ps1 @@ -0,0 +1,38 @@ +[CmdletBinding()] +param( + [string]$Serial +) + +$ErrorActionPreference = 'Stop' +$root = Split-Path -Parent $PSScriptRoot +$sdkRoot = if ($env:ANDROID_HOME) { $env:ANDROID_HOME } else { 'C:\Users\shenw_o246oq4\AppData\Local\Android\Sdk' } +$adb = Join-Path $sdkRoot 'platform-tools\adb.exe' +$apk = Join-Path $root 'app\build\outputs\apk\debug\app-debug.apk' + +if (-not (Test-Path $adb)) { throw "adb not found: $adb" } +if (-not (Test-Path $apk)) { throw "M1 APK not found: $apk. Run tools/check.ps1 -Scope Build first." } + +$devices = @(& $adb devices | Select-Object -Skip 1 | ForEach-Object { + if ($_ -match '^([^\s]+)\s+device$') { $Matches[1] } +}) +if ($Serial) { + if ($Serial -notin $devices) { throw "Requested device is not connected and authorized: $Serial" } + $selected = $Serial +} elseif ($devices.Count -eq 1) { + $selected = $devices[0] +} elseif ($devices.Count -eq 0) { + throw 'No authorized Android device found. Connect the target phone and enable USB debugging.' +} else { + throw "More than one device is connected. Re-run with -Serial; choices: $($devices -join ', ')" +} + +& $adb -s $selected install -r $apk +if ($LASTEXITCODE -ne 0) { throw 'M1 APK installation failed.' } +& $adb -s $selected shell am force-stop org.neslite.app.debug +& $adb -s $selected shell am start -W -n org.neslite.app.debug/org.neslite.app.MainActivity +if ($LASTEXITCODE -ne 0) { throw 'M1 diagnostic activity did not start.' } +$appPid = (& $adb -s $selected shell pidof org.neslite.app.debug).Trim() +if (-not $appPid) { throw 'M1 process is not running after launch.' } + +Write-Output "M1 diagnostic app is running on $selected (pid $appPid)." +Write-Output 'Complete the on-screen X5 Lite flow, then use “导出诊断 JSON”.'