Case battery: stop showing stale charging; read after the layout

Review fixes for the charging-case battery:

- The case reports whether the glasses are docked. An empty caseInfo
  (the reply out of the case) now parses as "not docked, no level"
  instead of nothing, and undocking is reported even when the level and
  charge state are unchanged. TS keeps the last level but clears
  caseCharging while the glasses are out of the case.
- The phone line shows the charging mark only while it is live: G2 and
  Case only with a link to the glasses (connected or charging), and Case
  only while docked. Levels stay as the last known ones.
- The session-start case read waits until the layout is up, so a
  firmware that ignored it could no longer hold up the first frame. When
  the glasses are already charging at connect, the charging-mode read is
  the only one; the old duplicate read and its "late ACK" log are gone.
- Case dedup state resets on every connect, as wearState does, so each
  session's read reaches TS.
- caseCharging uses > 0 like the headset, and is normalized to 0/1.
- iOS now feeds the reading into the shell battery state, and the
  assistant's describeState includes the case level.
- The batteryLine accessors move above connectionStatusLabel's doc
  comment.
This commit is contained in:
Om Alve committed 2026-11-02 12:01:12 +05:30
1 parent 9c0535014a
commit fa7f33bfe8
15 files changed
+199 -61

No files matched your search

+15 -11
View File
@@ -34,13 +34,17 @@ type LayoutOrientation = "portrait" | "landscape";
/**
* The line under the mirror: each device whose level is known, e.g.
* "G2 100% · Case 98% ⚡ · R1 72%" (⚡ = charging). The case level is the last
* one the glasses relayed; it only reports while they are docked.
* "G2 100% · Case 98% ⚡ · R1 72%" (⚡ = charging). Levels are the last known
* ones (the case only reports while the glasses are docked), so ⚡ appears only
* while it is live: with a link to the glasses, and for the case only while
* they are docked (caseCharging is null otherwise).
*/
function formatBatteryLine(levels: DashboardSnapshot["batteries"]): string {
function formatBatteryLine(snapshot: Pick<DashboardSnapshot, "batteries" | "phase">): string {
const levels = snapshot.batteries;
const live = snapshot.phase === "connected" || snapshot.phase === "charging";
const devices: Array<[string, number | null, boolean | null]> = [
["G2", levels.headset, levels.headsetCharging],
["Case", levels.case, levels.caseCharging],
["G2", levels.headset, live && levels.headsetCharging],
["Case", levels.case, live && levels.caseCharging],
["R1", levels.ring, levels.ringCharging],
];
return devices
@@ -108,7 +112,7 @@ export class MainViewModel extends RemoteControlsViewModel {
this.displayPreview = snapshot.displayPreview;
this.displayPreviewMessage = snapshot.displayPreviewMessage;
this.phase = snapshot.phase;
this.batteryLine = formatBatteryLine(snapshot.batteries);
this.batteryLine = formatBatteryLine(snapshot);
this.activeTextSettingId = snapshot.activeTextSettingId;
this.activeTextEditorTitle = snapshot.activeTextEditorTitle;
this.activeTextSettingTitle = snapshot.activeTextSettingTitle;
@@ -163,11 +167,6 @@ export class MainViewModel extends RemoteControlsViewModel {
}
}
/**
* Short connection indicator for the action bar. The full status string
* (which can be a sentence, e.g. a failure reason) stays available by
* tapping the indicator.
*/
get batteryLine(): string {
return this._batteryLine;
}
@@ -183,6 +182,11 @@ export class MainViewModel extends RemoteControlsViewModel {
return this._batteryLine ? "visible" : "collapse";
}
/**
* Short connection indicator for the action bar. The full status string
* (which can be a sentence, e.g. a failure reason) stays available by
* tapping the indicator.
*/
get connectionStatusLabel(): string {
switch (this._phase) {
case "connected":