mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 06:15:58 +00:00
Address review: glasses output after installs and session end, VR revert retry, display fallback, presenter swapchain retry, agent hex checks, drawer bumpers, glasses translations, docs
This commit is contained in:
1 parent
697c75337f
commit
4e75d53a71
36 files changed
+1106
-21
No files matched your search
@@ -1175,7 +1175,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
}
|
||||
loading.percent = -1
|
||||
loading.say(getString(R.string.session_starting_session), LoadingState.Topic.SESSION, readable = false)
|
||||
if (surfaceView.holder.surface?.isValid == true) surfaceCreated(surfaceView.holder)
|
||||
outputHolder().let { if (it.surface?.isValid == true) surfaceCreated(it) }
|
||||
}
|
||||
}, "runtime-install").start()
|
||||
}
|
||||
@@ -1473,6 +1473,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
return
|
||||
}
|
||||
closeSecondScreen(reset = true)
|
||||
updateGlassesScreen()
|
||||
updateHeadTracker()
|
||||
if (status == 0) {
|
||||
runOnUiThread {
|
||||
if (isFinishing || isDestroyed) return@runOnUiThread
|
||||
@@ -1586,7 +1588,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
if (drawerOpen) {
|
||||
if (fromController && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) {
|
||||
if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) {
|
||||
drawerPage = sessionDrawerPages(SessionState.mode == SessionService.MODE_STEAM && secondScreenDisplays.isNotEmpty())
|
||||
drawerPage = sessionDrawerPages(SessionState.mode == SessionService.MODE_STEAM && secondScreenDisplays.isNotEmpty(), glasses.present)
|
||||
.step(drawerPage, if (event.keyCode == KeyEvent.KEYCODE_BUTTON_R1) 1 else -1)
|
||||
releaseDrawerDirection()
|
||||
}
|
||||
@@ -2481,7 +2483,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
private fun updateHeadTracker() {
|
||||
val onGlasses = glassesScreen != null
|
||||
val c = activeCardboard
|
||||
val want = (resumed || (onGlasses && started)) && c.enabled && c.headTracking
|
||||
val want = !ended && (resumed || (onGlasses && started)) && c.enabled && c.headTracking
|
||||
val current = headTracker
|
||||
if (current != null && (!want || current.usesGlasses != onGlasses)) {
|
||||
current.stop()
|
||||
|
||||
@@ -134,12 +134,19 @@ class AgentBridgeProvider : ContentProvider() {
|
||||
}
|
||||
"stop-simulate" -> g.stopSimulation()
|
||||
"query" -> { g.query(); Thread.sleep(600) }
|
||||
"mode" -> { g.sendMode(request.optString("mode").removePrefix("0x").toInt(16)); Thread.sleep(600) }
|
||||
"mode" -> {
|
||||
val mode = hex(request.optString("mode"), 0xFF) ?: return error("INVALID_VALUE", "mode must be one hex byte, e.g. 0x31")
|
||||
g.sendMode(mode)
|
||||
Thread.sleep(600)
|
||||
}
|
||||
"imu" -> return g.sampleImu(request.optLong("ms", 2000).coerceIn(200, 20_000)).put("ok", true).put("command", "glasses")
|
||||
"raw" -> {
|
||||
AgentAccess.requireCommands(context)
|
||||
val payload = request.optString("payload").chunked(2).filter { it.length == 2 }.map { it.toInt(16).toByte() }.toByteArray()
|
||||
if (!g.sendRaw(request.optString("msgId").removePrefix("0x").toInt(16), payload)) return error("NOT_CONNECTED", "The glasses' control link is not open")
|
||||
val msgId = hex(request.optString("msgId"), 0xFFFF) ?: return error("INVALID_VALUE", "msgId must be a hex number up to 0xFFFF")
|
||||
val digits = request.optString("payload").removePrefix("0x")
|
||||
if (digits.length % 2 != 0 || digits.any { Character.digit(it, 16) < 0 }) return error("INVALID_VALUE", "payload must be whole hex bytes")
|
||||
val payload = digits.chunked(2).map { it.toInt(16).toByte() }.toByteArray()
|
||||
if (!g.sendRaw(msgId, payload)) return error("NOT_CONNECTED", "The glasses' control link is not open")
|
||||
Thread.sleep(300)
|
||||
}
|
||||
else -> return error("INVALID_OP", "Unknown glasses op")
|
||||
@@ -148,6 +155,9 @@ class AgentBridgeProvider : ContentProvider() {
|
||||
return g.status().put("ok", true).put("command", "glasses").put("frames", g.recentFrames())
|
||||
}
|
||||
|
||||
private fun hex(text: String, max: Int): Int? =
|
||||
text.removePrefix("0x").removePrefix("0X").takeIf { it.isNotEmpty() }?.toIntOrNull(16)?.takeIf { it in 0..max }
|
||||
|
||||
private fun state(context: Context): JSONObject {
|
||||
val runtimeVersion = LinuxRuntimeInstaller.installedVersion(context)
|
||||
val dir = SessionState.logDirectory ?: SessionState.logFile?.parentFile ?: SessionPaths.sessionFolders(context).lastOrNull()
|
||||
|
||||
@@ -117,6 +117,7 @@ object Glasses {
|
||||
private var glassesMode = 0
|
||||
private var autoModeSent = false
|
||||
private var vr3d = false
|
||||
private var vr3dRevert = false
|
||||
|
||||
@Volatile private var sink: PoseSink? = null
|
||||
@Volatile private var probe: ((ByteArray) -> Unit)? = null
|
||||
@@ -176,6 +177,7 @@ object Glasses {
|
||||
|
||||
fun set3d(on: Boolean) = post {
|
||||
vr3d = false
|
||||
vr3dRevert = false
|
||||
val s = _state.value
|
||||
if (if (on) s.can3d else s.canControl) sendMode(on)
|
||||
}
|
||||
@@ -183,12 +185,16 @@ object Glasses {
|
||||
fun set3dForVr(on: Boolean) = post {
|
||||
val s = _state.value
|
||||
if (on) {
|
||||
vr3dRevert = false
|
||||
if (!s.can3d || s.sbs) return@post
|
||||
vr3d = true
|
||||
sendMode(true)
|
||||
} else if (vr3d) {
|
||||
vr3d = false
|
||||
if (s.sbs && s.canControl) sendMode(false)
|
||||
when {
|
||||
!s.canControl -> vr3dRevert = true
|
||||
s.sbs -> sendMode(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -390,7 +396,13 @@ object Glasses {
|
||||
val candidates = displays.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION)
|
||||
.filter { it.displayId != Display.DEFAULT_DISPLAY && it.flags and Display.FLAG_PRESENTATION != 0 }
|
||||
return candidates.firstOrNull { displayName(it)?.contains("VITURE", ignoreCase = true) == true }
|
||||
?: candidates.singleOrNull()?.takeIf { usbPresent }
|
||||
?: candidates.singleOrNull()?.takeIf { usbPresent && unnamedPanel(it) }
|
||||
}
|
||||
|
||||
private fun unnamedPanel(d: Display): Boolean {
|
||||
if (Build.VERSION.SDK_INT < 31) return true
|
||||
val info = d.deviceProductInfo ?: return false
|
||||
return info.name.isNullOrBlank()
|
||||
}
|
||||
|
||||
private fun displayName(d: Display): String? {
|
||||
@@ -447,7 +459,15 @@ object Glasses {
|
||||
private fun applyMode(force: Boolean) {
|
||||
val s = _state.value
|
||||
val m = model ?: return
|
||||
if (!s.canControl || !s.usable || s.sbs) return
|
||||
if (!s.canControl || !s.usable) return
|
||||
if (vr3dRevert) {
|
||||
vr3dRevert = false
|
||||
if (s.sbs) {
|
||||
sendMode(false)
|
||||
return
|
||||
}
|
||||
}
|
||||
if (s.sbs) return
|
||||
val hz = _settings.value.refreshHz
|
||||
if (glassesMode == m.mode(hz, false)) return
|
||||
if (!force) {
|
||||
|
||||
Reference in new issue
Block a user