forked from Blendman974/faceclaw
Correctness: - Pair-glasses flows no longer strand the app in the manual-disconnected state: the pre-scan disconnect is followed by resumeAutoReconnect(), and the config page's scan hand-off drops the live link too. - The mixed-arms serial warning is reachable now: pairs() groups by the canonical serial key, and a lone left + lone right with different serials get the mismatch warning on both rows (it previously required two different serials inside one serial-keyed group, which cannot happen). - A selected pair that degrades to one arm (prune while the page is open) is deselected, and Save never pads a missing arm from stored addresses. - DiscoveryAggregator.ingest no longer lets a bonded re-emit or split advertisement overwrite the note/name/flag learned from a full advertisement, and reclassifies split reports using remembered fields so a nameless half doesn't drop the arm. - estimateProximity ignores the advertised TX Power Level (radiated power, not measured-power-at-1m); the calibration table is the only reference. - Saving a ring without a glasses pair updates the stored identity's ring name/address instead of leaving the previous ring on record. - Ring detection requires the stock "EVEN R1" name prefix in both the TS classifier and the Java pre-filter; a bare "R1" substring matched unrelated devices, and ring rows are always selectable. - One-shot scans keep every sample (buildAddressSet merges them through DiscoveryAggregator), and flash-flow address resolution takes left/right from one serial-joined complete pair instead of latest-per-role. Lifecycle: - The pairing scan and its refresh timer pause on app suspend and resume with the app, and the model's app-event hooks are detached when the page is left for good. Cleanup: - One MAC normalizer (even-advertisement.normalizeMacAddress, re-exported by device-addresses), used for the ring "Yours" comparison too. - One serial-equality definition (serialKey/serialsMatch); the containment fallback in isPreviouslyPaired is gone. - Shared formatErrorMessage replaces five per-view-model copies; shared hex-util replaces the duplicate TS hex codecs; one Java bytesToHex in FaceclawFirmwareUtil replaces three hand-rolled encoders. - glassesRow/ringRow share a presentation-base helper; dead row address fields, the constant glassesSectionVisibility, the identical-branch status ternary, and zoneRank/ZONE_ORDER are removed. - .gitignore now actually covers .test-build/ as tests/README claims. UI: - Dark-mode styles for the pairing page: readable instructions, dark-gray cards with consistent light text; light mode keeps its current look. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_016ZqzwmRQ3HQxasBz5rYyZV
33 lines
1.1 KiB
TypeScript
33 lines
1.1 KiB
TypeScript
import { NavigatedData, Page } from "@nativescript/core";
|
|
|
|
import { PairingViewModel } from "./pairing-view-model";
|
|
|
|
type PairingContext = { onboarding?: boolean } | undefined;
|
|
|
|
export function navigatingTo(args: NavigatedData): void {
|
|
const page = args.object as Page;
|
|
// Preserve the model across back-navigation (returning from the unpair or
|
|
// manual-entry pages) so the selection isn't lost; the model restarts its
|
|
// scan on re-entry.
|
|
let model = page.bindingContext as PairingViewModel | undefined;
|
|
if (!model) {
|
|
const context = args.context as PairingContext;
|
|
model = new PairingViewModel({ onboarding: context?.onboarding ?? false });
|
|
page.bindingContext = model;
|
|
}
|
|
void model.start();
|
|
}
|
|
|
|
export function navigatingFrom(args: NavigatedData): void {
|
|
const page = args.object as Page;
|
|
const model = page.bindingContext as PairingViewModel | undefined;
|
|
// Backing out destroys the page; a forward navigation (manual entry) keeps
|
|
// it on the stack, so only pause the scan and keep the model's app-lifecycle
|
|
// hooks for the return trip.
|
|
if (args.isBackNavigation) {
|
|
model?.dispose();
|
|
} else {
|
|
model?.stop();
|
|
}
|
|
}
|