From 77ab5b1702d566fc7b0927fa8a1c6e12827139d2 Mon Sep 17 00:00:00 2001 From: umarz317 <61620968+umarz317@users.noreply.github.com> Date: Thu, 1 Oct 2026 15:14:26 +0500 Subject: [PATCH 1/2] Remove BYD-specific features Remove the windshield HUD and instrument-cluster navigation, the dashboard map and its ADB map pause, ADB battery, wheel-speed and parked-video reporting, the BYD steering-wheel keycodes, the BYD HUD icons and the BYD docs. The parked-video player is removed with them because only BYD's ADB parked state allowed it; the dormant AirPlay video-in-car protocol support stays off by default. Generic wired and wireless CarPlay, location reporting and the standard Android media and voice keys are unchanged. Unit tests, lint and the debug build pass; not tested on a head unit. --- common/src/main/AndroidManifest.xml | 6 - .../shilapi/xcertplay/AirPlayPersistence.kt | 50 ---- .../shilapi/xcertplay/CarPlayHostActivity.kt | 190 +------------ .../com/shilapi/xcertplay/CarPlayMediaKeys.kt | 8 +- .../com/shilapi/xcertplay/CarPlayVideo.kt | 188 ------------- .../shilapi/xcertplay/CarPlayVideoActivity.kt | 168 ------------ .../shilapi/xcertplay/ClusterActivityState.kt | 48 ---- .../xcertplay/ClusterMapPresentation.kt | 190 ------------- .../xcertplay/DiLink51ClusterLayout.kt | 79 ------ .../xcertplay/DiLink51ClusterMonitor.kt | 85 ------ .../com/shilapi/xcertplay/DiPlayActivity.kt | 231 ---------------- .../shilapi/xcertplay/DiPlaySessionService.kt | 2 - .../com/shilapi/xcertplay/LocalizedOptions.kt | 27 -- common/src/main/res/values-ar/strings.xml | 94 ------- common/src/main/res/values-es/strings.xml | 94 ------- common/src/main/res/values-ru/strings.xml | 94 ------- common/src/main/res/values-zh-rCN/strings.xml | 94 ------- common/src/main/res/values/strings.xml | 94 ------- .../xcertplay/CarPlayMediaCallbackTest.kt | 2 +- .../xcertplay/ClusterActivityStateTest.kt | 76 ----- .../xcertplay/ClusterMapPresentationTest.kt | 59 ---- .../xcertplay/DiLink51ClusterLayoutTest.kt | 68 ----- docs/BYD_NAVIGATION.md | 102 ------- docs/PR3_REVIEW.md | 20 -- mobile/src/debug/AndroidManifest.xml | 7 - .../hud/StandaloneHudDemoActivity.kt | 146 ---------- .../xcertplay/hud/StandaloneHudPackets.kt | 19 -- .../xcertplay/hud/StarterBridgeReceiver.kt | 18 -- shared/BYD_HUD_ICONS_NOTICE.md | 5 - shared/src/main/assets/byd-hud-icons/0x0.png | Bin 86 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x1.png | Bin 1271 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x10.png | Bin 1410 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x11.png | Bin 1782 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x12.png | Bin 1389 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x13.png | Bin 1548 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x14.png | Bin 1385 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x15.png | Bin 1698 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x16.png | Bin 1721 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x17.png | Bin 1423 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x18.png | Bin 1472 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x19.png | Bin 2005 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x1a.png | Bin 2110 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x1b.png | Bin 2113 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x1c.png | Bin 2078 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x1d.png | Bin 2088 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x1e.png | Bin 2105 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x1f.png | Bin 2032 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x2.png | Bin 1244 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x20.png | Bin 2132 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x21.png | Bin 2110 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x22.png | Bin 2086 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x23.png | Bin 1958 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x24.png | Bin 2101 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x25.png | Bin 2127 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x26.png | Bin 2053 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x27.png | Bin 2103 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x28.png | Bin 2102 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x29.png | Bin 2010 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x2a.png | Bin 2081 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x2b.png | Bin 2092 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x2c.png | Bin 2060 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x2d.png | Bin 1404 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x2e.png | Bin 1502 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x2f.png | Bin 1340 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x3.png | Bin 1183 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x30.png | Bin 1622 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x31.png | Bin 1868 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x4.png | Bin 1108 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x7.png | Bin 1190 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x8.png | Bin 1116 -> 0 bytes shared/src/main/assets/byd-hud-icons/0x9.png | Bin 1322 -> 0 bytes shared/src/main/assets/byd-hud-icons/0xa.png | Bin 1294 -> 0 bytes shared/src/main/assets/byd-hud-icons/0xb.png | Bin 953 -> 0 bytes shared/src/main/assets/byd-hud-icons/0xc.png | Bin 1007 -> 0 bytes shared/src/main/assets/byd-hud-icons/0xd.png | Bin 1420 -> 0 bytes shared/src/main/assets/byd-hud-icons/0xe.png | Bin 1391 -> 0 bytes shared/src/main/assets/byd-hud-icons/0xf.png | Bin 1815 -> 0 bytes .../assets/byd-hud-icons/LICENSE-BYDMate.txt | 81 ------ .../src/main/assets/byd-hud-icons/NOTICE.txt | 5 - .../java/com/shilapi/xcertplay/adb/AdbKeys.kt | 85 ------ .../com/shilapi/xcertplay/adb/AdbPacket.kt | 60 ---- .../com/shilapi/xcertplay/adb/LocalAdb.kt | 133 --------- .../xcertplay/airplay/AirPlayConfig.kt | 1 - .../xcertplay/airplay/AirPlayInfoPlist.kt | 1 - .../xcertplay/airplay/AirPlaySession.kt | 20 -- .../airplay/CarPlayClusterDisplay.kt | 102 ------- .../xcertplay/airplay/CarPlayMediaButton.kt | 22 +- .../com/shilapi/xcertplay/hud/BydAdbAccess.kt | 40 --- .../com/shilapi/xcertplay/hud/BydAdbShell.kt | 62 ----- .../com/shilapi/xcertplay/hud/BydBattery.kt | 151 ---------- .../shilapi/xcertplay/hud/BydClusterBridge.kt | 156 ----------- .../shilapi/xcertplay/hud/BydClusterFrame.kt | 57 ---- .../xcertplay/hud/BydClusterMapPause.kt | 67 ----- .../xcertplay/hud/BydClusterNaviMode.kt | 29 -- .../hud/BydFactoryNavigationOutput.kt | 65 ----- .../xcertplay/hud/BydFactoryTurnCode.kt | 14 - .../com/shilapi/xcertplay/hud/BydHudBridge.kt | 259 ------------------ .../shilapi/xcertplay/hud/BydHudPayload.kt | 73 ----- .../shilapi/xcertplay/hud/BydHudProtocol.kt | 10 - .../shilapi/xcertplay/hud/BydHudRouteState.kt | 207 -------------- .../shilapi/xcertplay/hud/BydManeuverCodes.kt | 68 ----- .../xcertplay/hud/BydNavigationOutputs.kt | 67 ----- .../xcertplay/hud/BydOutputSettings.kt | 72 ----- .../shilapi/xcertplay/hud/BydParkedState.kt | 19 -- .../xcertplay/hud/BydStandaloneHudOutput.kt | 67 ----- .../hud/BydStandaloneNavigationBridge.kt | 49 ---- .../xcertplay/hud/BydStandalonePackets.kt | 64 ----- .../xcertplay/hud/BydStandaloneSession.kt | 51 ---- .../shilapi/xcertplay/hud/BydStarterBridge.kt | 120 -------- .../shilapi/xcertplay/hud/BydWheelSpeed.kt | 105 ------- .../xcertplay/hud/NavigationOutputWorker.kt | 36 --- .../orchestration/CarPlayController.kt | 52 ---- .../orchestration/CarPlayVideoListener.kt | 62 ----- .../com/shilapi/xcertplay/adb/LocalAdbTest.kt | 130 --------- .../airplay/CarPlayClusterDisplayTest.kt | 108 -------- .../airplay/CarPlayMediaButtonTest.kt | 8 +- .../xcertplay/hud/BydBatteryReadinessTest.kt | 80 ------ .../shilapi/xcertplay/hud/BydBatteryTest.kt | 65 ----- .../xcertplay/hud/BydClusterFrameTest.kt | 41 --- .../xcertplay/hud/BydClusterMapPauseTest.kt | 47 ---- .../xcertplay/hud/BydClusterNaviModeTest.kt | 30 -- .../xcertplay/hud/BydFactoryTurnCodeTest.kt | 27 -- .../xcertplay/hud/BydHudPayloadTest.kt | 35 --- .../xcertplay/hud/BydHudProtocolTest.kt | 19 -- .../xcertplay/hud/BydHudRouteStateTest.kt | 173 ------------ .../xcertplay/hud/BydParkedStateTest.kt | 21 -- .../xcertplay/hud/BydStandaloneSessionTest.kt | 119 -------- .../xcertplay/hud/BydStandaloneStreetTest.kt | 65 ----- .../xcertplay/hud/BydWheelSpeedTest.kt | 32 --- .../hud/NavigationOutputWorkerTest.kt | 70 ----- .../orchestration/VideoInCarGateTest.kt | 40 --- 131 files changed, 16 insertions(+), 5890 deletions(-) delete mode 100644 common/src/main/java/com/shilapi/xcertplay/CarPlayVideo.kt delete mode 100644 common/src/main/java/com/shilapi/xcertplay/CarPlayVideoActivity.kt delete mode 100644 common/src/main/java/com/shilapi/xcertplay/ClusterActivityState.kt delete mode 100644 common/src/main/java/com/shilapi/xcertplay/ClusterMapPresentation.kt delete mode 100644 common/src/main/java/com/shilapi/xcertplay/DiLink51ClusterLayout.kt delete mode 100644 common/src/main/java/com/shilapi/xcertplay/DiLink51ClusterMonitor.kt delete mode 100644 common/src/test/java/com/shilapi/xcertplay/ClusterActivityStateTest.kt delete mode 100644 common/src/test/java/com/shilapi/xcertplay/ClusterMapPresentationTest.kt delete mode 100644 common/src/test/java/com/shilapi/xcertplay/DiLink51ClusterLayoutTest.kt delete mode 100644 docs/BYD_NAVIGATION.md delete mode 100644 docs/PR3_REVIEW.md delete mode 100644 mobile/src/debug/AndroidManifest.xml delete mode 100644 mobile/src/debug/java/com/shilapi/xcertplay/hud/StandaloneHudDemoActivity.kt delete mode 100644 mobile/src/debug/java/com/shilapi/xcertplay/hud/StandaloneHudPackets.kt delete mode 100644 mobile/src/debug/java/com/shilapi/xcertplay/hud/StarterBridgeReceiver.kt delete mode 100644 shared/BYD_HUD_ICONS_NOTICE.md delete mode 100644 shared/src/main/assets/byd-hud-icons/0x0.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x1.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x10.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x11.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x12.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x13.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x14.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x15.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x16.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x17.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x18.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x19.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x1a.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x1b.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x1c.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x1d.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x1e.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x1f.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x2.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x20.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x21.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x22.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x23.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x24.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x25.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x26.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x27.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x28.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x29.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x2a.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x2b.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x2c.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x2d.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x2e.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x2f.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x3.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x30.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x31.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x4.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x7.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x8.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0x9.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0xa.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0xb.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0xc.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0xd.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0xe.png delete mode 100644 shared/src/main/assets/byd-hud-icons/0xf.png delete mode 100644 shared/src/main/assets/byd-hud-icons/LICENSE-BYDMate.txt delete mode 100644 shared/src/main/assets/byd-hud-icons/NOTICE.txt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/adb/AdbKeys.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/adb/AdbPacket.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/adb/LocalAdb.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/airplay/CarPlayClusterDisplay.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydAdbAccess.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydAdbShell.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydBattery.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterBridge.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterFrame.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterMapPause.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterNaviMode.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydFactoryNavigationOutput.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydFactoryTurnCode.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydHudBridge.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydHudPayload.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydHudProtocol.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydHudRouteState.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydManeuverCodes.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydNavigationOutputs.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydOutputSettings.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydParkedState.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneHudOutput.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneNavigationBridge.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydStandalonePackets.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneSession.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydStarterBridge.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/BydWheelSpeed.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/hud/NavigationOutputWorker.kt delete mode 100644 shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayVideoListener.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/adb/LocalAdbTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/airplay/CarPlayClusterDisplayTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydBatteryReadinessTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydBatteryTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterFrameTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterMapPauseTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterNaviModeTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydFactoryTurnCodeTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydHudPayloadTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydHudProtocolTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydHudRouteStateTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydParkedStateTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydStandaloneSessionTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydStandaloneStreetTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/BydWheelSpeedTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/hud/NavigationOutputWorkerTest.kt delete mode 100644 shared/src/test/java/com/shilapi/xcertplay/orchestration/VideoInCarGateTest.kt diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml index 3c8d997c86..d2fd885e44 100644 --- a/common/src/main/AndroidManifest.xml +++ b/common/src/main/AndroidManifest.xml @@ -40,12 +40,6 @@ android:resource="@xml/usb_device_filter" /> - - CarPlayClusterDisplay.Content.entries.firstOrNull { it.name == name } } - ?: CarPlayClusterDisplay.Content.MAP - - fun saveClusterContent(context: Context, content: CarPlayClusterDisplay.Content) { - context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY_CLUSTER_CONTENT, content.name).apply() - } - - fun loadClusterMapScalePercent(context: Context): Int = CarPlayClusterDisplay.STREAM_SCALE_PERCENT.let { default -> - context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getInt(KEY_CLUSTER_MAP_SCALE, default) - .takeIf { it in CarPlayClusterDisplay.scalePresets } ?: default - } - - fun saveClusterMapScalePercent(context: Context, percent: Int) { - if (percent !in CarPlayClusterDisplay.scalePresets) return - context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putInt(KEY_CLUSTER_MAP_SCALE, percent).apply() - } - - fun loadClusterMarkerHorizontalStep(context: Context): Int = - context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getInt(KEY_CLUSTER_MARKER_X, 0) - .coerceIn(CarPlayClusterDisplay.horizontalSteps) - - fun saveClusterMarkerHorizontalStep(context: Context, step: Int) { - context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() - .putInt(KEY_CLUSTER_MARKER_X, step.coerceIn(CarPlayClusterDisplay.horizontalSteps)).apply() - } - - fun loadClusterMarkerVerticalStep(context: Context): Int = - context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getInt(KEY_CLUSTER_MARKER_Y, 0) - .coerceIn(CarPlayClusterDisplay.verticalSteps) - - fun saveClusterMarkerVerticalStep(context: Context, step: Int) { - context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit() - .putInt(KEY_CLUSTER_MARKER_Y, step.coerceIn(CarPlayClusterDisplay.verticalSteps)).apply() - } - fun loadRightHandDrive(context: Context): Boolean = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE) .getBoolean(KEY_RIGHT_HAND_DRIVE, false) diff --git a/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt b/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt index bbb964a50d..d3fc6bdb33 100644 --- a/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt +++ b/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt @@ -58,7 +58,6 @@ import com.shilapi.xcertplay.airplay.CarPlayUiScale import com.shilapi.xcertplay.airplay.AirPlayDisplayConfig import com.shilapi.xcertplay.airplay.AirPlayIdentity import com.shilapi.xcertplay.airplay.AirPlayIcon -import com.shilapi.xcertplay.airplay.CarPlayClusterDisplay import com.shilapi.xcertplay.airplay.AirPlaySafeArea import com.shilapi.xcertplay.airplay.AirPlaySession import com.shilapi.xcertplay.airplay.AirPlaySessionListener @@ -81,7 +80,6 @@ import com.shilapi.xcertplay.orchestration.isManualHotspotChannelCompatible import com.shilapi.xcertplay.transport.Iap2IdentificationConfig import com.shilapi.xcertplay.transport.Iap2LocationProvider import com.shilapi.xcertplay.transport.UsbDeviceId -import com.shilapi.xcertplay.transport.VehicleSpeedLocationProvider import java.io.File import java.text.SimpleDateFormat import java.util.ArrayDeque @@ -133,20 +131,17 @@ class CarPlayHostActivity : ComponentActivity() { remoteMfiServer = remoteMfiServer.trim().takeIf { it.isNotEmpty() }, remoteMfiToken = remoteMfiToken.takeIf { it.isNotEmpty() }, identification = Iap2IdentificationConfig( - name = "DiPlay", + name = "LoopLink", modelIdentifier = normalizedModel(), manufacturer = normalizedManufacturer(), - serialNumber = "DIPLAY-" + DiPlayBootstrap.deviceId(airPlayIdentity).replace(":", ""), + serialNumber = "LOOPLINK-" + DiPlayBootstrap.deviceId(airPlayIdentity).replace(":", ""), firmwareVersion = "0.1.0", hardwareVersion = "1.0", carPlayUsbInterfaceNumber = 3, locationInformationEnabled = locationReportingEnabled, - vehicleStatusEnabled = com.shilapi.xcertplay.hud.BydOutputSettings.batteryToIphone(this), - chargingConnectors = com.shilapi.xcertplay.hud.BydOutputSettings.chargingConnectors(this), - vehicleSpeedEnabled = locationReportingEnabled && com.shilapi.xcertplay.hud.BydOutputSettings.wheelSpeedToIphone(this), ), - label = "DiPlay", - hostName = "diplay-" + DiPlayBootstrap.deviceId(airPlayIdentity).replace(":", "").lowercase(), + label = "LoopLink", + hostName = "looplink-" + DiPlayBootstrap.deviceId(airPlayIdentity).replace(":", "").lowercase(), hostMac = DiPlayBootstrap.deviceId(airPlayIdentity).split(":").map { it.toInt(16).toByte() }.toByteArray(), wirelessBluetoothDeviceAddress = DiPlayPreferences.phoneAddress(this), transport = if (wirelessEnabled) CarPlayTransport.WIRELESS else CarPlayTransport.WIRED, @@ -272,12 +267,6 @@ class CarPlayHostActivity : ComponentActivity() { private var controller: CarPlayController? = null private var currentSurface: Surface? = null private var currentSurfaceTexture: SurfaceTexture? = null - private var clusterPresentation: ClusterMapPresentation? = null - private var clusterSurface: Surface? = null - private var clusterMonitor: DiLink51ClusterMonitor? = null - private var detectedCluster = ClusterActivityState.Snapshot(null, false) - // Keep one surface per layer alive, including while its map card is hidden. - private val clusterLayers = mutableMapOf() private var activeDisplaySize: DisplaySize? = null private var pendingDisplaySize: DisplaySize? = null private var displayScaleTenths = CarPlayDisplayScale.DEFAULT_TENTHS @@ -585,148 +574,10 @@ class CarPlayHostActivity : ComponentActivity() { advancedAudioChannelMapping = advancedAudioChannelMappingSupported && AirPlayPersistence.loadAdvancedAudioChannelMapping(this) - if (DiLink51ClusterLayout.automatic(this) && clusterMonitor == null) { - clusterMonitor = DiLink51ClusterMonitor(this, ::onClusterActivityState).also { it.start() } - } else if (!DiLink51ClusterLayout.automatic(this)) { - clusterMonitor?.stop() - clusterMonitor = null - } - ensureClusterPresentation() maybeStartCarPlay() applyFullscreenMode() } - // Experimental: the CarPlay instrument-cluster stream on the BYD cluster projection display. - private fun effectiveClusterTheme(): DiLink51ClusterLayout.Theme = - if (DiLink51ClusterLayout.automatic(this)) detectedCluster.theme ?: DiLink51ClusterLayout.theme(this) - else DiLink51ClusterLayout.theme(this) - - private fun onClusterActivityState(state: ClusterActivityState.Snapshot) { - if (state != detectedCluster) appendLog("Cluster map: detected theme=${state.theme} mapVisible=${state.mapVisible}") - detectedCluster = state - if (!AirPlayPersistence.loadClusterMapEnabled(this)) { dismissClusterPresentation(); return } - ensureClusterPresentation() - } - - private fun ensureClusterPresentation() { - if (!AirPlayPersistence.loadClusterMapEnabled(this)) { - dismissClusterPresentation() - return - } - val theme = effectiveClusterTheme() - if (DiLink51ClusterLayout.supported()) { - ensureDiLink51ClusterPresentation(theme) - return - } - if (clusterPresentation != null) return - val display = ClusterMapPresentation.findDisplay(this, theme) ?: run { - appendLog("Cluster map: no cluster projection display among ${ClusterMapPresentation.describeDisplays(this)}") - return - } - val presentation = ClusterMapPresentation(this, display, theme) { surface -> runOnUiThread { onClusterSurface(surface) } } - // The system dismisses a presentation when its display goes away; allow a new one on resume. - presentation.setOnDismissListener { - if (clusterPresentation === presentation) { - clusterPresentation = null - com.shilapi.xcertplay.hud.BydNavigationOutputs.setClusterMapShown(false) - } - } - try { - presentation.show() - clusterPresentation = presentation - com.shilapi.xcertplay.hud.BydNavigationOutputs.setClusterMapShown(true) - presentation.setStreamActive(SCREEN_TYPE_ALT in activeScreenStreamTypes) - Log.i(ClusterMapPresentation.TAG, "cluster presentation shown display=${display.displayId} name=${display.name}") - appendLog("Cluster map: presentation shown display=${display.displayId}") - } catch (error: RuntimeException) { - Log.w(ClusterMapPresentation.TAG, "cluster presentation failed", error) - appendLog("Cluster map: presentation failed ${error.javaClass.simpleName}") - } - } - - private fun ensureDiLink51ClusterPresentation(theme: DiLink51ClusterLayout.Theme) { - val fullMap = theme == DiLink51ClusterLayout.Theme.MAP - val visible = !DiLink51ClusterLayout.automatic(this) || detectedCluster.mapVisible - clusterLayers.filterKeys { it != fullMap }.values.forEach { it.setMapVisible(false) } - var target = clusterLayers[fullMap] - if (target == null) { - val display = ClusterMapPresentation.findDisplay(this, theme) ?: return - lateinit var presentation: ClusterMapPresentation - presentation = ClusterMapPresentation(this, display, theme) { surface -> - runOnUiThread { - if (clusterPresentation === presentation) onClusterSurface(surface) - } - } - presentation.setOnDismissListener { - if (clusterLayers[fullMap] === presentation) clusterLayers.remove(fullMap) - if (clusterPresentation === presentation) clusterPresentation = null - } - try { - presentation.setMapVisible(false) - clusterPresentation = presentation - clusterLayers[fullMap] = presentation - presentation.show() - appendLog("Cluster map: retained layer display=${display.displayId} fullMap=$fullMap") - target = presentation - } catch (error: RuntimeException) { - clusterLayers.remove(fullMap) - clusterPresentation = null - appendLog("Cluster map: presentation failed ${error.javaClass.simpleName}") - return - } - } - clusterPresentation = target - target.outputSurface?.let(::onClusterSurface) - target.setStreamActive(SCREEN_TYPE_ALT in activeScreenStreamTypes) - target.setMapVisible(visible) - } - - private fun dismissClusterPresentation() { - val presentations = (clusterLayers.values + listOfNotNull(clusterPresentation)).distinct() - clusterLayers.clear() - clusterPresentation = null - clusterSurface?.let { sink?.clearSurface(SCREEN_TYPE_ALT, it) } - clusterSurface = null - presentations.forEach { runCatching { it.dismiss() } } - com.shilapi.xcertplay.hud.BydNavigationOutputs.setClusterMapShown(false) - } - - private fun onClusterSurface(surface: Surface?) { - if (clusterSurface === surface) return - // A direct handoff lets MediaCodec.setOutputSurface preserve its reference frames. - // Clearing first would destroy the decoder and can leave stream 111 waiting for an IDR. - if (!DiLink51ClusterLayout.supported() || surface == null) { - clusterSurface?.let { old -> sink?.clearSurface(SCREEN_TYPE_ALT, old) } - } - clusterSurface = surface - // Never fall back to the main surface: two decoders must not draw into one Surface. - if (surface != null) sink?.setSurface(SCREEN_TYPE_ALT, surface) - } - - private fun clusterDisplayConfig(): AirPlayDisplayConfig? { - if (!AirPlayPersistence.loadClusterMapEnabled(this)) return null - val theme = effectiveClusterTheme() - val display = ClusterMapPresentation.findDisplay(this, theme) ?: return null - val size = ClusterMapPresentation.sizeOf(display) - if (size.x <= 0 || size.y <= 0) return null - if (DiLink51ClusterLayout.supported()) { - val plan = DiLink51ClusterLayout.plan(size.x, size.y, theme) ?: return null - return DiLink51ClusterLayout.streamConfig().also { - appendLog("Cluster map: fixed 1920x720 stream; layout=$theme viewport=$plan") - } - } - return CarPlayClusterDisplay.config( - size.x, - size.y, - AirPlayPersistence.loadClusterMapScalePercent(this), - AirPlayPersistence.loadClusterMarkerHorizontalStep(this), - AirPlayPersistence.loadClusterMarkerVerticalStep(this), - AirPlayPersistence.loadClusterContent(this), - ).also { - appendLog("Cluster map: requesting ${it.widthPixels}x${it.heightPixels} on ${size.x}x${size.y} safeArea=${it.safeArea} url=${it.initialUrl}") - } - } - // The steering-wheel voice key reaches the focused window; while CarPlay is on screen it opens Siri. override fun dispatchKeyEvent(event: KeyEvent): Boolean { if (!CarPlayMediaButton.opensSiri(event.keyCode)) return super.dispatchKeyEvent(event) @@ -764,8 +615,6 @@ class CarPlayHostActivity : ComponentActivity() { } override fun onDestroy() { - clusterMonitor?.stop() - dismissClusterPresentation() mainHandler.removeCallbacks(applyDisplaySize) mainHandler.removeCallbacks(expireOldLogLines) currentSurface?.let { surface -> @@ -2782,12 +2631,11 @@ class CarPlayHostActivity : ComponentActivity() { appendLog(support.details) appendLog(effectiveSummary) return AirPlayConfig( - deviceName = "DiPlay", + deviceName = "LoopLink", deviceId = DiPlayBootstrap.deviceId(airPlayIdentity), btMac = DiPlayBluetooth.localAddress(this) ?: DiPlayBootstrap.deviceId(airPlayIdentity), sourceVersion = "950.7.1", main = display, - cluster = clusterDisplayConfig(), rightHandDrive = rightHandDrive, hevc = hevcEnabled, microphone = microphoneAvailable, @@ -2795,7 +2643,6 @@ class CarPlayHostActivity : ComponentActivity() { model = normalizedModel(), oemLabel = oemLabel, icons = listOf(loadAirPlayIcon()), - videoInCar = com.shilapi.xcertplay.hud.BydOutputSettings.videoWhileParked(this), ) } @@ -3112,14 +2959,7 @@ class CarPlayHostActivity : ComponentActivity() { val config = createRuntimeConfig() val airPlayConfig = createAirPlayConfig(size) val locationProvider: Iap2LocationProvider? = - when { - !config.locationReportingEnabled -> null - config.identification.vehicleSpeedEnabled -> VehicleSpeedLocationProvider( - AndroidCarPlayLocationProvider(this), - com.shilapi.xcertplay.hud.BydNavigationOutputs.wheelSpeed(applicationContext), - ) - else -> AndroidCarPlayLocationProvider(this) - } + if (config.locationReportingEnabled) AndroidCarPlayLocationProvider(this) else null appendLog( "Starting CarPlay controller at ${size.width}x${size.height} -> " + "${airPlayConfig.main.widthPixels}x${airPlayConfig.main.heightPixels} " + @@ -3151,7 +2991,6 @@ class CarPlayHostActivity : ComponentActivity() { ) sink = renderer currentSurface?.let(::attachSurface) - clusterSurface?.let { renderer.setSurface(SCREEN_TYPE_ALT, it) } val media = createMediaEngine(renderer) val pairings = AirPlayPersistence.loadPairings(this) { id, key -> AirPlayPersistence.savePairing(this, id, key) @@ -3169,15 +3008,9 @@ class CarPlayHostActivity : ComponentActivity() { savePairRecord = { record -> AirPlayPersistence.saveLockdownRecord(this, record) }, clearPairRecord = { AirPlayPersistence.clearLockdownRecord(this) }, locationProvider = locationProvider, - vehicleStatusProvider = if (com.shilapi.xcertplay.hud.BydOutputSettings.batteryToIphone(this)) { - com.shilapi.xcertplay.hud.BydNavigationOutputs.batteryStatus(applicationContext) - } else { - null - }, ) controller = next CarPlayMediaKeys.attach(this, next) - if (airPlayConfig.videoInCar) CarPlayVideo.attach(this, next) CarPlayBackgroundSession.store(next, renderer, size.width, size.height, this) { completion -> runOnUiThread { shutdown(terminateProcess = false, reason = "DiPlay disconnect", completion = completion) @@ -3418,11 +3251,7 @@ class CarPlayHostActivity : ComponentActivity() { private fun attachSurface(surface: Surface) { sink?.setSurface(SCREEN_TYPE_MAIN, surface) - if (AirPlayPersistence.loadClusterMapEnabled(this)) { - clusterSurface?.let { sink?.setSurface(SCREEN_TYPE_ALT, it) } - } else { - sink?.setSurface(SCREEN_TYPE_ALT, surface) - } + sink?.setSurface(SCREEN_TYPE_ALT, surface) } private fun onHostTouch(view: View, event: MotionEvent): Boolean { @@ -3506,11 +3335,6 @@ class CarPlayHostActivity : ComponentActivity() { } else { activeScreenStreamTypes.remove(type) } - if (type == SCREEN_TYPE_ALT) { - Log.i(ClusterMapPresentation.TAG, "cluster stream active=$active") - appendLog("Cluster map: stream active=$active") - clusterPresentation?.setStreamActive(active) - } updateDebugOverlays() } } diff --git a/common/src/main/java/com/shilapi/xcertplay/CarPlayMediaKeys.kt b/common/src/main/java/com/shilapi/xcertplay/CarPlayMediaKeys.kt index f15c9b8143..410e446f27 100644 --- a/common/src/main/java/com/shilapi/xcertplay/CarPlayMediaKeys.kt +++ b/common/src/main/java/com/shilapi/xcertplay/CarPlayMediaKeys.kt @@ -17,7 +17,7 @@ import com.shilapi.xcertplay.orchestration.CarPlayController /** * Steering-wheel and other hardware media buttons for CarPlay. * - * Android delivers media keys to a media session; BYD picks the session of the audio-focus + * Android delivers media keys to a media session; the head unit picks the session of the audio-focus * owner. Once CarPlay plays music, DiPlay holds audio focus and an active session until the * CarPlay session ends, so play also works after a pause. Keys go to the iPhone as CarPlay media * HID presses ([CarPlayMediaButton]). @@ -121,12 +121,6 @@ internal object CarPlayMediaKeys { } private fun send(index: Int, source: String) { - // While the car's video player is on screen the wheel drives it: a CarPlay play/pause would - // make the iPhone end the video session. - if (CarPlayVideo.onMediaKey(index)) { - Log.i(TAG, "media key $source -> car video player $index") - return - } val sent = synchronized(this) { controller }?.sendMediaButton(index) ?: false Log.i(TAG, "media key $source -> CarPlay $index sent=$sent") } diff --git a/common/src/main/java/com/shilapi/xcertplay/CarPlayVideo.kt b/common/src/main/java/com/shilapi/xcertplay/CarPlayVideo.kt deleted file mode 100644 index 6e46cc5f38..0000000000 --- a/common/src/main/java/com/shilapi/xcertplay/CarPlayVideo.kt +++ /dev/null @@ -1,188 +0,0 @@ -package com.shilapi.xcertplay - -import android.content.Context -import android.content.Intent -import android.os.Handler -import android.os.Looper -import android.util.Log -import android.widget.Toast -import com.shilapi.xcertplay.airplay.CarPlayMediaButton -import com.shilapi.xcertplay.airplay.VideoInCar -import com.shilapi.xcertplay.host.R -import com.shilapi.xcertplay.hud.BydNavigationOutputs -import com.shilapi.xcertplay.orchestration.CarPlayController -import com.shilapi.xcertplay.orchestration.CarPlayVideoListener -import java.util.concurrent.Executors - -/** - * iOS 27 video in car (see [VideoInCar]). The iPhone hands the car a media URL (insertPlayQueueItem) - * and drives it (setRate, seek, stop); the car plays it in [CarPlayVideoActivity], which opens when the - * iPhone sends requestUI "videoplayback:" and only while the car is in P. - */ -internal object CarPlayVideo : CarPlayVideoListener { - private const val TAG = "DiPlay-Video" - private const val SKIP_MILLIS = 10_000 - - private val main = Handler(Looper.getMainLooper()) - private val sender = Executors.newSingleThreadExecutor { Thread(it, "diplay-video-reply").apply { isDaemon = true } } - @Volatile private var appContext: Context? = null - @Volatile private var controller: CarPlayController? = null - - // Main-thread state; CarPlayVideoActivity applies it. - private var streamId: Long? = null - private var itemUuid: Any? = null - var url: String? = null - private set - var startMillis = 0 - private set - var playing = false - private set - var pendingSeekMillis: Int? = null - var activity: CarPlayVideoActivity? = null - - fun attach(context: Context, next: CarPlayController) { - appContext = context.applicationContext - controller = next - next.videoListener = this - } - - override fun readParked(): Boolean? = appContext?.let(BydNavigationOutputs::parked) - - override fun onVideoAllowedChanged(allowed: Boolean) { - if (!allowed) main.post { closePlayer("the car left P") } - } - - override fun onVideoSessionEnded() { - main.post { - stop() - streamId = null - } - } - - override fun onVideoUiRequested() { - main.post { show() } - } - - override fun onVideoMessage(streamId: Long, message: Map) { - main.post { handle(streamId, message) } - } - - /** - * A steering-wheel media key (CarPlayMediaButton index) while the player is on screen: play and pause - * toggle it, next and previous skip 10 s. The iPhone is not asked: a CarPlay play/pause makes it end - * the video session. Returns false when no player is open. Main thread. - */ - fun onMediaKey(index: Int): Boolean { - val player = activity ?: return false - when (index) { - CarPlayMediaButton.NEXT -> player.skip(SKIP_MILLIS) - CarPlayMediaButton.PREVIOUS -> player.skip(-SKIP_MILLIS) - else -> setPlaying(!playing) - } - return true - } - - /** Play or pause from the car (wheel or on-screen button); tells the iPhone at once. Main thread. */ - fun setPlaying(next: Boolean) { - playing = next - activity?.applyRate() - streamId?.let { reply(it, VideoInCar.playbackStateNotification(next, itemUuid)) } - } - - /** - * The car's player cannot play the item, for example protected video: tell the iPhone as Apple's - * receiver does, say so on the car screen and go back to CarPlay instead of showing black. Main thread. - */ - fun onPlayerFailed(code: Int) { - Log.w(TAG, "item cannot play here code=$code") - streamId?.let { reply(it, VideoInCar.errorNotification(itemUuid, code)) } - appContext?.let { Toast.makeText(it, R.string.video_cannot_play, Toast.LENGTH_LONG).show() } - stop() - } - - /** The player closed on the car (Back, or the car left P): pause, so the iPhone shows it paused. */ - fun onPlayerClosed(positionMillis: Int?) { - positionMillis?.let { startMillis = it } - if (playing) setPlaying(false) - } - - private fun handle(streamId: Long, message: Map) { - this.streamId = streamId - val request = message["kind"] == "request" - when (val type = message["type"] as? String) { - "insertPlayQueueItem" -> { - val item = VideoInCar.parseItem(message) - if (item == null) { - Log.w(TAG, "queue item this player cannot play") - return - } - Log.i(TAG, "queue item app=${(message["item"] as? Map<*, *>)?.get("clientBundleID")}") - url = item.url - itemUuid = item.uuid - startMillis = item.startMillis - activity?.load() - } - "setRate" -> { - playing = ((message["rate"] as? Number)?.toDouble() ?: 0.0) > 0.0 - activity?.applyRate() - } - "seek" -> { - VideoInCar.seekMillis(message)?.let { - pendingSeekMillis = it - activity?.applySeek() - } - if (request) reply(streamId, VideoInCar.seekResponse(message["messageID"])) - } - "playbackInfo" -> if (request) { - reply(streamId, VideoInCar.playbackInfoResponse(message["messageID"], itemUuid, playerState())) - } - "property" -> if (request) { - reply(streamId, VideoInCar.propertyResponse(message["messageID"], message["property"], playerState())) - } - "stop", "removePlayQueueItem" -> stop() - "setProperty" -> Unit - else -> Log.i(TAG, "video message $type") - } - } - - // While the player is closed the item stays paused where it was, so the iPhone keeps its position. - private fun playerState(): VideoInCar.PlayerState? = - activity?.state() ?: url?.let { VideoInCar.PlayerState(false, false, startMillis / 1000.0, 0.0, 0.0) } - - private fun reply(streamId: Long, message: Map) { - val target = controller ?: return - sender.execute { - // A reply that cannot be sent must never take CarPlay down with it. - val sent = runCatching { target.sendVideoMessage(streamId, message) } - .onFailure { Log.w(TAG, "reply ${message["type"]} failed: ${it.javaClass.simpleName}") } - .getOrDefault(false) - if (!sent) Log.w(TAG, "reply ${message["type"]} not sent") - } - } - - private fun show() { - val context = appContext ?: return - when { - url == null -> Log.w(TAG, "video player requested without a playable item") - !VideoInCar.allowed -> Log.w(TAG, "video player requested while not parked") - activity != null -> Unit - else -> context.startActivity( - Intent(context, CarPlayVideoActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), - ) - } - } - - private fun closePlayer(reason: String) { - val player = activity ?: return - Log.i(TAG, "closing the video player: $reason") - player.finish() - } - - private fun stop() { - url = null - itemUuid = null - playing = false - pendingSeekMillis = null - activity?.finish() - } -} diff --git a/common/src/main/java/com/shilapi/xcertplay/CarPlayVideoActivity.kt b/common/src/main/java/com/shilapi/xcertplay/CarPlayVideoActivity.kt deleted file mode 100644 index b57d19093d..0000000000 --- a/common/src/main/java/com/shilapi/xcertplay/CarPlayVideoActivity.kt +++ /dev/null @@ -1,168 +0,0 @@ -package com.shilapi.xcertplay - -import android.app.Activity -import android.graphics.Color -import android.graphics.drawable.GradientDrawable -import android.media.MediaPlayer -import android.net.Uri -import android.os.Bundle -import android.os.Handler -import android.os.Looper -import android.util.Log -import android.util.TypedValue -import android.view.Gravity -import android.view.View -import android.view.ViewGroup -import android.widget.FrameLayout -import android.widget.LinearLayout -import android.widget.TextView -import android.widget.VideoView -import androidx.core.view.WindowCompat -import androidx.core.view.WindowInsetsCompat -import androidx.core.view.WindowInsetsControllerCompat -import com.shilapi.xcertplay.airplay.VideoInCar -import com.shilapi.xcertplay.host.R - -/** - * The car's own player for iOS 27 video in car (see [CarPlayVideo]). Full screen over CarPlay, which - * stays connected underneath; a tap shows Back to CarPlay and play/pause for a few seconds. - */ -class CarPlayVideoActivity : Activity() { - private val main = Handler(Looper.getMainLooper()) - private lateinit var video: VideoView - private lateinit var controls: View - private lateinit var playPause: TextView - private var loadedUrl: String? = null - private var prepared = false - private var player: MediaPlayer? = null - private val hideControls = Runnable { controls.visibility = View.GONE } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - WindowCompat.setDecorFitsSystemWindows(window, false) - WindowInsetsControllerCompat(window, window.decorView).apply { - hide(WindowInsetsCompat.Type.systemBars()) - systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE - } - video = VideoView(this) - controls = controlBar() - setContentView(FrameLayout(this).apply { - setBackgroundColor(Color.BLACK) - addView(video, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, Gravity.CENTER)) - addView(controls, FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP or Gravity.START) - .apply { setMargins(dp(24), dp(24), dp(24), dp(24)) }) - setOnClickListener { showControls() } - }) - video.setOnPreparedListener { prepared -> - player = prepared - this.prepared = true - CarPlayVideo.pendingSeekMillis?.let { seekExactly(it); CarPlayVideo.pendingSeekMillis = null } - applyRate() - } - video.setOnErrorListener { _, what, extra -> - Log.w(TAG, "player error what=$what extra=$extra") - CarPlayVideo.onPlayerFailed( - when (extra) { - MediaPlayer.MEDIA_ERROR_IO, MediaPlayer.MEDIA_ERROR_TIMED_OUT -> VideoInCar.ERROR_NETWORK - MediaPlayer.MEDIA_ERROR_MALFORMED, MediaPlayer.MEDIA_ERROR_UNSUPPORTED -> VideoInCar.ERROR_INCOMPATIBLE_ASSET - else -> VideoInCar.ERROR_DECODER - }, - ) - true - } - CarPlayVideo.activity = this - load() - showControls() - } - - private fun controlBar(): View { - fun pill(text: String, onClick: () -> Unit) = TextView(this).apply { - this.text = text - setTextColor(Color.WHITE) - setTextSize(TypedValue.COMPLEX_UNIT_SP, 20f) - gravity = Gravity.CENTER - minHeight = dp(64) - minWidth = dp(64) - setPadding(dp(24), 0, dp(24), 0) - background = GradientDrawable().apply { cornerRadius = dp(32).toFloat(); setColor(0xB3000000.toInt()) } - setOnClickListener { onClick(); showControls() } - } - playPause = pill("") { CarPlayVideo.setPlaying(!CarPlayVideo.playing) } - return LinearLayout(this).apply { - orientation = LinearLayout.HORIZONTAL - addView(pill("‹ " + getString(R.string.video_back_to_carplay)) { finish() }) - addView(playPause, LinearLayout.LayoutParams(-2, -2).apply { marginStart = dp(16) }) - } - } - - private fun showControls() { - updatePlayPause() - controls.visibility = View.VISIBLE - main.removeCallbacks(hideControls) - main.postDelayed(hideControls, CONTROLS_MILLIS) - } - - private fun updatePlayPause() { - val playing = CarPlayVideo.playing - playPause.text = if (playing) "❚❚" else "▶" - playPause.contentDescription = getString(if (playing) R.string.video_pause else R.string.video_play) - } - - fun state() = VideoInCar.PlayerState( - prepared = prepared, - playing = video.isPlaying, - positionSeconds = video.currentPosition / 1000.0, - durationSeconds = if (prepared) video.duration.coerceAtLeast(0) / 1000.0 else 0.0, - bufferedSeconds = if (prepared) video.duration.coerceAtLeast(0) / 1000.0 * video.bufferPercentage / 100.0 else 0.0, - ) - - fun load() { - val url = CarPlayVideo.url ?: return - if (url == loadedUrl) return - loadedUrl = url - prepared = false - player = null - video.setVideoURI(Uri.parse(url)) - if (CarPlayVideo.startMillis > 0) CarPlayVideo.pendingSeekMillis = CarPlayVideo.startMillis - } - - fun applyRate() { - if (CarPlayVideo.playing) video.start() else video.pause() - if (controls.visibility == View.VISIBLE) updatePlayPause() - } - - /** Moves the playback position by [deltaMillis], within the video. */ - fun skip(deltaMillis: Int) { - if (!prepared) return - seekExactly((video.currentPosition + deltaMillis).coerceIn(0, video.duration.coerceAtLeast(0))) - } - - fun applySeek() { - val target = CarPlayVideo.pendingSeekMillis ?: return - if (!prepared) return // applied once the player is prepared - seekExactly(target) - CarPlayVideo.pendingSeekMillis = null - } - - // The exact position, not the previous key frame, so a 10 s skip really moves 10 s. - private fun seekExactly(millis: Int) { - player?.seekTo(millis.toLong(), MediaPlayer.SEEK_CLOSEST) ?: video.seekTo(millis) - } - - override fun onDestroy() { - main.removeCallbacks(hideControls) - if (CarPlayVideo.activity === this) { - CarPlayVideo.activity = null - CarPlayVideo.onPlayerClosed(if (prepared) video.currentPosition else null) - } - video.stopPlayback() - super.onDestroy() - } - - private fun dp(value: Int) = (value * resources.displayMetrics.density).toInt() - - private companion object { - const val TAG = "DiPlay-Video" - const val CONTROLS_MILLIS = 4_000L - } -} diff --git a/common/src/main/java/com/shilapi/xcertplay/ClusterActivityState.kt b/common/src/main/java/com/shilapi/xcertplay/ClusterActivityState.kt deleted file mode 100644 index 26386ee37f..0000000000 --- a/common/src/main/java/com/shilapi/xcertplay/ClusterActivityState.kt +++ /dev/null @@ -1,48 +0,0 @@ -package com.shilapi.xcertplay - -/** Only these stock cluster activities affect our overlay; head-unit apps are irrelevant. */ -internal class ClusterActivityState { - data class Snapshot(val theme: DiLink51ClusterLayout.Theme?, val mapVisible: Boolean) - private data class Activity(val name: String, val instance: Int) - private val visible = mutableMapOf() - - fun event(pkg: String?, name: String?, instance: Int, type: Int, time: Long) { - if (type == 26 || type == 27) { // UsageEvents DEVICE_SHUTDOWN / DEVICE_STARTUP - visible.clear() - return - } - if (!accepted(pkg, name)) return - val key = Activity(name!!, instance) - when (type) { - 1 -> visible[key] = time // ACTIVITY_RESUMED - 23 -> visible.remove(key) // ACTIVITY_STOPPED; paused activities can still be visible. - } - } - - fun snapshot(): Snapshot { - val theme = visible.entries.filter { themeOf(it.key.name) != null } - .maxByOrNull { it.value }?.key?.name?.let(::themeOf) - val miniMap = visible.keys.any { it.name == MINI_MAP } - return Snapshot(theme, theme != null && (theme == DiLink51ClusterLayout.Theme.MAP || miniMap)) - } - - private fun themeOf(name: String) = when (name) { - FULL_MAP -> DiLink51ClusterLayout.Theme.MAP - SCENARIO -> DiLink51ClusterLayout.Theme.SCENARIO - SIMPLE -> DiLink51ClusterLayout.Theme.SIMPLE - else -> null - } - - companion object { - const val FULL_MAP = "com.byd.automap.meter.MeterActivity" - const val MINI_MAP = "com.byd.automap.meter.MeterSmallScreenActivity" - const val SCENARIO = "com.byd.sr.cluster.ClusterActivity" - const val SIMPLE = "com.byd.cluster.SimpleClusterDynastyActivity" - fun accepted(pkg: String?, name: String?): Boolean = when (pkg) { - "com.byd.launchermap" -> name == FULL_MAP || name == MINI_MAP - "com.byd.sr" -> name == SCENARIO - "com.byd.cluster" -> name == SIMPLE - else -> false - } - } -} diff --git a/common/src/main/java/com/shilapi/xcertplay/ClusterMapPresentation.kt b/common/src/main/java/com/shilapi/xcertplay/ClusterMapPresentation.kt deleted file mode 100644 index 31aa53ed63..0000000000 --- a/common/src/main/java/com/shilapi/xcertplay/ClusterMapPresentation.kt +++ /dev/null @@ -1,190 +0,0 @@ -package com.shilapi.xcertplay - -import android.app.Presentation -import android.content.Context -import android.graphics.Color -import android.graphics.Canvas -import android.graphics.Paint -import android.graphics.LinearGradient -import android.graphics.Shader -import android.graphics.Matrix -import android.graphics.SurfaceTexture -import android.graphics.drawable.ColorDrawable -import android.view.WindowManager -import android.graphics.Point -import android.hardware.display.DisplayManager -import android.os.Bundle -import android.util.Log -import android.view.Display -import android.view.Gravity -import android.view.Surface -import android.view.SurfaceHolder -import android.view.SurfaceView -import android.view.View -import android.view.TextureView -import android.widget.FrameLayout -import android.widget.TextView -import com.shilapi.xcertplay.host.R - -/** - * Shows CarPlay's instrument-cluster stream on a BYD cluster projection display. - * - * BYD exposes the cluster's projection area as public presentation displays owned by - * com.byd.containerservice; the stock map (com.byd.launchermap) draws there the same way. The - * cluster only shows this display while its projection mode is on, which DiPlay cannot switch. - */ -internal class ClusterMapPresentation( - context: Context, - display: Display, - private val theme: DiLink51ClusterLayout.Theme = DiLink51ClusterLayout.theme(context), - private val onSurface: (Surface?) -> Unit, -) : Presentation(context, display) { - private var waitingLabel: TextView? = null - var outputSurface: Surface? = null - private set - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - val size = sizeOf(display) - val adaptive = DiLink51ClusterLayout.supported() - val plan = if (adaptive) DiLink51ClusterLayout.plan(size.x, size.y, theme) else null - val dark = DiLink51ClusterLayout.dark(context, theme) - val backdrop = if (dark) Color.rgb(15, 22, 30) else Color.rgb(207, 218, 229) - val root = FrameLayout(context).apply { - setBackgroundColor(if (plan == null) Color.BLACK else if (plan.fullMap) backdrop else Color.TRANSPARENT) - } - if (plan != null) { - window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window?.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) - } - val videoParams = if (plan == null) FrameLayout.LayoutParams(-1, -1) else - FrameLayout.LayoutParams(plan.width, plan.height, Gravity.TOP or Gravity.LEFT).apply { - leftMargin = plan.left; topMargin = plan.top - } - if (plan != null) { - val textureView = TextureView(context) - fun transform() { - textureView.setTransform(Matrix().apply { - setScale(DiLink51ClusterLayout.STREAM_WIDTH.toFloat() / plan.width, - DiLink51ClusterLayout.STREAM_HEIGHT.toFloat() / plan.height) - postTranslate(-plan.sourceLeft.toFloat(), -plan.sourceTop.toFloat()) - }) - } - textureView.surfaceTextureListener = object : TextureView.SurfaceTextureListener { - override fun onSurfaceTextureAvailable(texture: SurfaceTexture, width: Int, height: Int) { - texture.setDefaultBufferSize(DiLink51ClusterLayout.STREAM_WIDTH, DiLink51ClusterLayout.STREAM_HEIGHT) - transform() - outputSurface = Surface(texture).also(onSurface) - } - override fun onSurfaceTextureSizeChanged(texture: SurfaceTexture, width: Int, height: Int) = transform() - override fun onSurfaceTextureUpdated(texture: SurfaceTexture) = Unit - override fun onSurfaceTextureDestroyed(texture: SurfaceTexture): Boolean { - onSurface(null) - outputSurface?.release() - outputSurface = null - return true - } - } - root.addView(textureView, videoParams) - if (plan.fullMap) root.addView(InstrumentContrastView(context, plan, backdrop), FrameLayout.LayoutParams(-1, -1)) - Log.i(TAG, "layout=$theme viewport=$plan source=${plan.sourceLeft},${plan.sourceTop} dark=$dark") - } else { - // Preserve the original PR renderer for DiLink 5 and unverified firmware. - val surfaceView = SurfaceView(context) - surfaceView.holder.addCallback(object : SurfaceHolder.Callback { - override fun surfaceCreated(holder: SurfaceHolder) { - Log.i(TAG, "cluster surface created") - onSurface(holder.surface) - } - - override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) { - Log.i(TAG, "cluster surface ${width}x$height") - } - - override fun surfaceDestroyed(holder: SurfaceHolder) { - Log.i(TAG, "cluster surface destroyed") - onSurface(null) - } - }) - root.addView(surfaceView, videoParams) - } - waitingLabel = TextView(context).apply { - text = context.getString(R.string.cluster_waiting_for_map) - setTextColor(if (plan != null && !dark) Color.DKGRAY else Color.WHITE) - textSize = 26f - gravity = Gravity.CENTER - } - root.addView(waitingLabel, FrameLayout.LayoutParams(videoParams)) - setContentView(root) - } - - /** Hides the placeholder once the phone streams the cluster screen. */ - fun setStreamActive(active: Boolean) { - waitingLabel?.visibility = if (active) View.GONE else View.VISIBLE - } - - /** Window alpha hides the pixels without destroying the TextureView/decoder surface. */ - fun setMapVisible(visible: Boolean) { - window?.let { window -> - val alpha = if (visible) 1f else 0f - if (window.attributes.alpha != alpha) window.attributes = window.attributes.apply { this.alpha = alpha } - } - } - - companion object { - const val TAG = "DiPlay-Cluster" - - /** A verified 5.1 profile chooses its layer explicitly; other firmware keeps PR #5 behavior. */ - fun findDisplay(context: Context, theme: DiLink51ClusterLayout.Theme = DiLink51ClusterLayout.theme(context)): Display? { - val displays = context.getSystemService(DisplayManager::class.java) - ?.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION) ?: return null - val name = DiLink51ClusterLayout.displayName( - displays.map { it.name }, android.os.Build.FINGERPRINT, theme, - ) ?: return null - return displays.firstOrNull { it.name == name }?.takeIf { - if (!DiLink51ClusterLayout.supported()) true else { - val size = sizeOf(it) - DiLink51ClusterLayout.plan(size.x, size.y, theme) != null - } - } - } - - fun describeDisplays(context: Context): String = - context.getSystemService(DisplayManager::class.java)?.displays - ?.joinToString { "${it.displayId}:${it.name}" }.orEmpty() - - fun sizeOf(display: Display): Point = Point().also { - @Suppress("DEPRECATION") - display.getRealSize(it) - } - } -} - -/** Shading belongs to DiPlay's map only; no stock cluster window is changed or covered outside the side card. */ -private class InstrumentContrastView( - context: Context, - private val plan: DiLink51ClusterLayout.Plan, - private val background: Int, -) : View(context) { - private val paint = Paint() - override fun onDraw(canvas: Canvas) { - super.onDraw(canvas) - val left = plan.left.toFloat(); val top = plan.top.toFloat() - val right = left + plan.width; val bottom = top + plan.height - fun fade(x0: Float, y0: Float, x1: Float, y1: Float, start: Int, end: Int, - l: Float, t: Float, r: Float, b: Float) { - paint.shader = LinearGradient(x0, y0, x1, y1, start, end, Shader.TileMode.CLAMP) - canvas.drawRect(l, t, r, b, paint) - } - val clear = background and 0x00ffffff - val soft = (background and 0x00ffffff) or (210 shl 24) - if (plan.fullMap) { - fade(left, top, left, top + 64, background, clear, left, top, right, top + 64) - fade(left, bottom - 48, left, bottom, clear, background, left, bottom - 48, right, bottom) - // The trip/menu readouts occupy the outer panels; keep the route and marker in the clear center. - fade(left, top, left + 460, top, soft, clear, left, top, left + 460, bottom) - fade(right - 460, top, right, top, clear, soft, right - 460, top, right, bottom) - } - paint.shader = null - } -} diff --git a/common/src/main/java/com/shilapi/xcertplay/DiLink51ClusterLayout.kt b/common/src/main/java/com/shilapi/xcertplay/DiLink51ClusterLayout.kt deleted file mode 100644 index 30c31a6bf9..0000000000 --- a/common/src/main/java/com/shilapi/xcertplay/DiLink51ClusterLayout.kt +++ /dev/null @@ -1,79 +0,0 @@ -package com.shilapi.xcertplay - -import android.content.Context -import android.os.Build -import com.shilapi.xcertplay.airplay.AirPlayDisplayConfig -import com.shilapi.xcertplay.airplay.CarPlayClusterDisplay - -/** Geometry measured against the stock full-map and right-hand side-card layers on this firmware. */ -internal object DiLink51ClusterLayout { - const val FINGERPRINT = "BYD-AUTO/IVI/IVI:13/TP1A.220624.014/eng.build20260722.221155:user/release-keys" - const val BASE = "fission_bg_XDJAScreenProjection" - const val FULL = "shared_${BASE}_0" - const val SIDE = "shared_${BASE}_1" - private const val PREFS = "diplay_cluster_layout" - - enum class Theme(val label: String) { - SCENARIO("Scenario · side map"), MAP("Map · full map"), SIMPLE("Simple · side map") - } - enum class Contrast(val label: String) { - DEFAULT("Theme default"), LIGHT("Light background · dark instruments"), DARK("Dark background · light instruments") - } - data class Plan(val left: Int, val top: Int, val width: Int, val height: Int, val fullMap: Boolean) { - // Crop at native pixel scale around the centered car marker, retaining the bottom - // of the map. The iPhone's stream size never changes when the driver changes themes. - val sourceLeft: Int get() = (STREAM_WIDTH - width) / 2 - val sourceTop: Int get() = STREAM_HEIGHT - height - } - const val STREAM_WIDTH = 1920 - const val STREAM_HEIGHT = 720 - // DiLink 5.1 retains its measured native-size stream and bottom-centered crop. - // DiLink 5's marker safe area and scale controls must not alter this profile. - fun streamConfig(): AirPlayDisplayConfig = CarPlayClusterDisplay.config( - STREAM_WIDTH, STREAM_HEIGHT, scalePercent = 100, - ).copy(safeArea = null) - - fun supported(fingerprint: String = Build.FINGERPRINT): Boolean = fingerprint == FINGERPRINT - fun theme(context: Context): Theme = Theme.entries.firstOrNull { - it.name == context.getSharedPreferences(PREFS, 0).getString("theme", null) - } ?: Theme.SCENARIO - fun saveTheme(context: Context, theme: Theme) { - context.getSharedPreferences(PREFS, 0).edit().putString("theme", theme.name).apply() - } - fun automatic(context: Context): Boolean = supported() && context.getSharedPreferences(PREFS, 0).getBoolean("automatic", false) - fun saveAutomatic(context: Context, enabled: Boolean) { - context.getSharedPreferences(PREFS, 0).edit().putBoolean("automatic", enabled).apply() - } - fun contrast(context: Context): Contrast = Contrast.entries.firstOrNull { - it.name == context.getSharedPreferences(PREFS, 0).getString("contrast", null) - } ?: Contrast.DEFAULT - fun saveContrast(context: Context, contrast: Contrast) { - context.getSharedPreferences(PREFS, 0).edit().putString("contrast", contrast.name).apply() - } - fun dark(context: Context, theme: Theme = theme(context)): Boolean = when (contrast(context)) { - Contrast.DEFAULT -> theme == Theme.SIMPLE - Contrast.LIGHT -> false - Contrast.DARK -> true - } - - fun displayName(names: List, fingerprint: String, theme: Theme): String? { - if (supported(fingerprint)) { - // Never substitute the full layer for a missing side layer: that hides Scenario/Simple. - return (if (theme == Theme.MAP) FULL else SIDE).takeIf { it in names } - } - // Preserve PR #5's selection order on DiLink 5 and all unverified firmware. - return names.firstOrNull { it == BASE } - ?: names.firstOrNull { it.contains(BASE) && it.endsWith("_0") } - ?: names.firstOrNull { it.contains(BASE) } - } - - fun plan(width: Int, height: Int, theme: Theme): Plan? { - // The measured side-map bounds are x=1320..1920 on the 1920x720 cluster. - if (width != 1920 || height != 720) return null - return if (theme == Theme.MAP) { - // Protect speed/status and gear/range. Bottom-aligned cropping keeps the car marker - // inside this viewport even when the phone app ignores safe-area insets. - Plan(0, 144, width, 480, true) - } else Plan(1320, 0, 600, height, false) - } -} diff --git a/common/src/main/java/com/shilapi/xcertplay/DiLink51ClusterMonitor.kt b/common/src/main/java/com/shilapi/xcertplay/DiLink51ClusterMonitor.kt deleted file mode 100644 index 5770425c52..0000000000 --- a/common/src/main/java/com/shilapi/xcertplay/DiLink51ClusterMonitor.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.shilapi.xcertplay - -import android.app.AppOpsManager -import android.app.usage.UsageEvents -import android.app.usage.UsageStatsManager -import android.content.Context -import android.os.Handler -import android.os.Looper -import android.os.Process -import android.os.SystemClock -import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit - -/** Uses the owner's standard Android Usage Access grant, never the privileged BYD API. */ -internal class DiLink51ClusterMonitor(context: Context, private val onState: (ClusterActivityState.Snapshot) -> Unit) { - private val context = context.applicationContext - private val handler = Handler(Looper.getMainLooper()) - private val executor = Executors.newSingleThreadScheduledExecutor() - private var state = ClusterActivityState() - private var since = bootTime() - private val seen = linkedMapOf() - // This firmware includes the system getter. If Android hides it, single-instance stock - // activities still work, but an overlapping recreation conservatively hides the map. - private val instanceIdMethod = runCatching { UsageEvents.Event::class.java.getMethod("getInstanceId") }.getOrNull() - @Volatile private var stopped = false - private data class EventKey(val pkg: String?, val name: String?, val id: Int, val type: Int, val time: Long) - - fun start() { - executor.scheduleWithFixedDelay({ poll() }, 0, 500, TimeUnit.MILLISECONDS) - } - - fun stop() { - stopped = true - executor.shutdownNow() - handler.removeCallbacksAndMessages(null) - } - - private fun bootTime() = (System.currentTimeMillis() - SystemClock.elapsedRealtime()).coerceAtLeast(0) - - private fun poll() { - if (stopped) return - val now = System.currentTimeMillis() - val snapshot = try { - if (!hasAccess(context)) { - state = ClusterActivityState() - seen.clear() - since = bootTime() - } else { - if (now < since) { // A vehicle clock correction must not leave an old overlay visible. - state = ClusterActivityState() - seen.clear() - since = bootTime() - } - val events = context.getSystemService(UsageStatsManager::class.java).queryEvents(since, now) - ?: throw IllegalStateException("Usage events unavailable") - val event = UsageEvents.Event() - while (events.hasNextEvent()) { - events.getNextEvent(event) - val reset = event.eventType == UsageEvents.Event.DEVICE_SHUTDOWN || event.eventType == UsageEvents.Event.DEVICE_STARTUP - if (!reset && !ClusterActivityState.accepted(event.packageName, event.className)) continue - val instance = runCatching { instanceIdMethod?.invoke(event) as? Int }.getOrNull() ?: 0 - val key = EventKey(event.packageName, event.className, instance, event.eventType, event.timeStamp) - if (seen.put(key, event.timeStamp) == null) { - state.event(event.packageName, event.className, instance, event.eventType, event.timeStamp) - } - } - // Overlap handles asynchronously delivered events; deduplicate only the allowed cluster events. - since = (now - 2_000).coerceAtLeast(bootTime()) - seen.entries.removeAll { it.value < since } - } - state.snapshot() - } catch (_: RuntimeException) { - state = ClusterActivityState() - seen.clear() - since = bootTime() - state.snapshot() // No reliable signal means no overlay. - } - handler.post { if (!stopped) onState(snapshot) } - } - - companion object { - fun hasAccess(context: Context): Boolean = context.getSystemService(AppOpsManager::class.java) - .checkOpNoThrow(AppOpsManager.OPSTR_GET_USAGE_STATS, Process.myUid(), context.packageName) == AppOpsManager.MODE_ALLOWED - } -} diff --git a/common/src/main/java/com/shilapi/xcertplay/DiPlayActivity.kt b/common/src/main/java/com/shilapi/xcertplay/DiPlayActivity.kt index f0f8458fe1..6f07a70f49 100644 --- a/common/src/main/java/com/shilapi/xcertplay/DiPlayActivity.kt +++ b/common/src/main/java/com/shilapi/xcertplay/DiPlayActivity.kt @@ -32,17 +32,12 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat -import com.shilapi.xcertplay.airplay.CarPlayClusterDisplay -import com.shilapi.xcertplay.hud.BydAdbAccess -import com.shilapi.xcertplay.hud.BydOutputSettings import com.shilapi.xcertplay.host.R import com.shilapi.xcertplay.orchestration.WirelessHotspotMode -import com.shilapi.xcertplay.transport.EvChargingConnectors import java.io.File import java.text.SimpleDateFormat import java.util.Date import java.util.Locale -import kotlin.math.roundToInt /** DiAuto's visual language, with a connection flow for an independent CarPlay receiver. */ class DiPlayActivity : ComponentActivity() { @@ -62,8 +57,6 @@ class DiPlayActivity : ComponentActivity() { private var testToneTrack: AudioTrack? = null private var toneStop: Runnable? = null private var exportButton: Button? = null - private var adbStatus: TextView? = null - private var adbCheckGeneration = 0 private val notificationPermission = registerForActivityResult(ActivityResultContracts.RequestPermission()) { connect(notificationTransport) } @@ -92,7 +85,6 @@ class DiPlayActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) languagePreferenceAtCreate = AppLocale.preference(this) - com.shilapi.xcertplay.hud.BydNavigationOutputs.onAppOpened(applicationContext) WindowCompat.setDecorFitsSystemWindows(window, true) window.statusBarColor = BG; window.navigationBarColor = BG WindowInsetsControllerCompat(window, window.decorView).apply { @@ -298,136 +290,6 @@ class DiPlayActivity : ComponentActivity() { } } } - if (com.shilapi.xcertplay.hud.BydOutputSettings.available(this)) section(content, getString(R.string.byd_navigation), R.drawable.ic_dp_navigation) { card -> - toggle(card, getString(R.string.navigation_on_hud_and_instrument_cluster), - getString(R.string.show_phone_navigation_arrows_distance_and_street_names_on), - com.shilapi.xcertplay.hud.BydOutputSettings.enabled(this)) { com.shilapi.xcertplay.hud.BydOutputSettings.setEnabled(this, it) } - if (ClusterMapPresentation.findDisplay(this) != null) { - toggle(card, getString(R.string.carplay_map_on_instrument_cluster_experimental), - getString(R.string.shows_the_iphone_s_cluster_map_on_the_instrument_cluster_c), - AirPlayPersistence.loadClusterMapEnabled(this)) { - AirPlayPersistence.saveClusterMapEnabled(this, it) - reconnectForClusterMap() - } - if (DiLink51ClusterLayout.supported()) { - val automatic = DiLink51ClusterLayout.automatic(this) - toggle(card, getString(R.string.follow_instrument_theme_and_map_card), - getString(R.string.show_the_side_map_only_when_its_card_is_open_and_switch_to), automatic) { - DiLink51ClusterLayout.saveAutomatic(this, it) - render() - reconnectForClusterMap() - } - val allowed = DiLink51ClusterMonitor.hasAccess(this) - card.addView(label(if (allowed) getString(R.string.usage_access_enabled) - else getString(R.string.usage_access_setup_needed_for_automatic_mode), 14, if (allowed) MUTED else WARNING)) - card.addView(button(getString(R.string.automatic_map_setup_adb), false) { showClusterAccessSetup() }, matchButton(10, 56)) - if (!automatic) { - val themes = DiLink51ClusterLayout.Theme.entries - choice(card, getString(R.string.instrument_theme), themes.map { it.localizedLabel(this) }, themes.indexOf(DiLink51ClusterLayout.theme(this))) { - DiLink51ClusterLayout.saveTheme(this, themes[it]) - reconnectForClusterMap() - } - card.addView(label(getString(R.string.manual_mode_match_the_cluster_theme_here_the_map_cannot_fo), 14, MUTED)) - } - val contrasts = DiLink51ClusterLayout.Contrast.entries - choice(card, getString(R.string.instrument_contrast), contrasts.map { it.localizedLabel(this) }, contrasts.indexOf(DiLink51ClusterLayout.contrast(this))) { - DiLink51ClusterLayout.saveContrast(this, contrasts[it]) - reconnectForClusterMap() - } - } else { - val sizes = CarPlayClusterDisplay.scalePresets - val contents = CarPlayClusterDisplay.Content.entries - val content = AirPlayPersistence.loadClusterContent(this) - choice(card, getString(R.string.dashboard_shows), listOf( - getString(R.string.dashboard_content_map), - getString(R.string.dashboard_content_turn_card), - getString(R.string.dashboard_content_map_with_turn_card), - ), contents.indexOf(content)) { - AirPlayPersistence.saveClusterContent(this, contents[it]) - render() - } - // Both contents share the same safe area and position controls. - val turnCard = content == CarPlayClusterDisplay.Content.TURN_CARD - choice(card, getString(if (turnCard) R.string.turn_card_size else R.string.cluster_map_size), - listOf(getString(R.string.cluster_size_standard), getString(R.string.cluster_size_larger), getString(R.string.cluster_size_largest)), - sizes.indexOf(AirPlayPersistence.loadClusterMapScalePercent(this)).coerceAtLeast(0)) { - AirPlayPersistence.saveClusterMapScalePercent(this, sizes[it]) - } - val across = CarPlayClusterDisplay.horizontalSteps.toList() - choice(card, getString(if (turnCard) R.string.turn_card_horizontal else R.string.car_marker_horizontal), across.map { markerStepLabel(it, getString(R.string.marker_left), getString(R.string.marker_right)) }, - across.indexOf(AirPlayPersistence.loadClusterMarkerHorizontalStep(this)).coerceAtLeast(0)) { - AirPlayPersistence.saveClusterMarkerHorizontalStep(this, across[it]) - } - val upDown = CarPlayClusterDisplay.verticalSteps.toList() - choice(card, getString(if (turnCard) R.string.turn_card_vertical else R.string.car_marker_vertical), upDown.map { markerStepLabel(it, getString(R.string.marker_up), getString(R.string.marker_down)) }, - upDown.indexOf(AirPlayPersistence.loadClusterMarkerVerticalStep(this)).coerceAtLeast(0)) { - AirPlayPersistence.saveClusterMarkerVerticalStep(this, upDown[it]) - } - card.addView(button(getString(if (turnCard) R.string.reset_turn_card_to_centre else R.string.reset_car_marker_to_centre), false) { - AirPlayPersistence.saveClusterMarkerHorizontalStep(this, 0) - AirPlayPersistence.saveClusterMarkerVerticalStep(this, 0) - render() - reconnectForClusterMap() - }, matchButton(10, 56)) - toggle(card, getString(R.string.dashboard_map_only_in_small_and_full_navi), - getString(R.string.dashboard_map_only_in_small_and_full_navi_description), - BydOutputSettings.clusterStreamPause(this)) { - BydOutputSettings.setClusterStreamPause(this, it) - if (it) checkAdbAccess(mayAsk = true) - } - } - } - toggle(card, getString(R.string.car_battery_for_the_iphone), - getString(R.string.car_battery_for_the_iphone_description), - BydOutputSettings.batteryToIphone(this)) { - BydOutputSettings.setBatteryToIphone(this, it) - if (it) { - checkAdbAccess(mayAsk = true, reconnectWhenReady = CarPlayBackgroundSession.hasSession()) - } else if (CarPlayBackgroundSession.hasSession()) { - connect(AirPlayPersistence.loadWirelessEnabled(this)) - } - } - val connectors = EvChargingConnectors.entries - choice(card, getString(R.string.charging_connectors), connectors.map { it.localizedLabel(this) }, - connectors.indexOf(BydOutputSettings.chargingConnectors(this))) { - BydOutputSettings.setChargingConnectors(this, connectors[it]) - } - val lowCharge = BydOutputSettings.lowChargePresets - choice(card, getString(R.string.low_charge_warning), lowCharge.map { - getString(if (it == BydOutputSettings.DEFAULT_LOW_CHARGE_PERCENT) R.string.percent_default else R.string.percent_value, it) - }, - lowCharge.indexOf(BydOutputSettings.lowChargePercent(this)).coerceAtLeast(0), reconnects = false) { - BydOutputSettings.setLowChargePercent(this, lowCharge[it]) - } - toggle(card, getString(R.string.wheel_speed_for_tunnels), - getString(R.string.wheel_speed_for_tunnels_description), - BydOutputSettings.wheelSpeedToIphone(this)) { - BydOutputSettings.setWheelSpeedToIphone(this, it) - if (it) checkAdbAccess(mayAsk = true) - if (CarPlayBackgroundSession.hasSession()) connect(AirPlayPersistence.loadWirelessEnabled(this)) - } - toggle(card, getString(R.string.video_while_parked), - getString(R.string.video_while_parked_description), - BydOutputSettings.videoWhileParked(this)) { - BydOutputSettings.setVideoWhileParked(this, it) - if (it) checkAdbAccess(mayAsk = true) - if (CarPlayBackgroundSession.hasSession()) connect(AirPlayPersistence.loadWirelessEnabled(this)) - } - adbStatus = label("", 14, MUTED).also { status -> - card.addView(status) - } - if (BydOutputSettings.clusterStreamPause(this) || BydOutputSettings.batteryToIphone(this) || - BydOutputSettings.wheelSpeedToIphone(this) || BydOutputSettings.videoWhileParked(this)) - checkAdbAccess(mayAsk = false) - card.addView(button(getString(R.string.check_adb_access), false) { checkAdbAccess(mayAsk = true) }, matchButton(10, 56)) - card.addView(button(getString(R.string.apply_and_reconnect), false) { - if (BydOutputSettings.batteryToIphone(this)) { - checkAdbAccess(mayAsk = true, reconnectWhenReady = true) - } else { - connect(AirPlayPersistence.loadWirelessEnabled(this)) - } - }, matchButton(10, 56)) - } section(content, getString(R.string.permissions_and_connection_help), R.drawable.ic_dp_permissions) { card -> card.addView(label(getString(R.string.nearby_devices_connects_your_iphone_microphone_enables_sir), 16, MUTED)) card.addView(button(getString(R.string.app_permissions), false) { openSystem(Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse("package:$packageName"))) }, matchButton(16, 60)) @@ -692,93 +554,6 @@ class DiPlayActivity : ComponentActivity() { dialog.show() } - // "Left 20 %", "Centre · default", "Down 10 %": a signed step reads as a direction and a distance. - private fun markerStepLabel(step: Int, negative: String, positive: String): String = when { - step == 0 -> getString(R.string.marker_centre_default) - step < 0 -> "$negative ${-step * CarPlayClusterDisplay.MARKER_STEP_PERCENT} %" - else -> "$positive ${step * CarPlayClusterDisplay.MARKER_STEP_PERCENT} %" - } - - private fun showClusterAccessSetup() { - val command = "adb shell appops set $packageName GET_USAGE_STATS allow" - val body = column().apply { setPadding(dp(24), dp(12), dp(24), dp(12)) } - body.addView(label(getString(R.string.one_time_setup_on_this_car), 20, TEXT, true)) - body.addView(label(getString(R.string.usage_access_lets_diplay_follow_the_instrument_theme_and_m), 15, MUTED)) - body.addView(label(getString(R.string.s_1_connect_a_computer_with_adb_installed_to_the_car_using), 16, TEXT)) - body.addView(label(command, 16, TEXT).apply { - typeface = android.graphics.Typeface.MONOSPACE - setTextIsSelectable(true) - setPadding(0, dp(16), 0, dp(16)) - }) - body.addView(button(getString(R.string.copy_command), false) { - getSystemService(android.content.ClipboardManager::class.java).setPrimaryClip( - android.content.ClipData.newPlainText(getString(R.string.clipboard_usage_access), command)) - toast(getString(R.string.copied_to_the_car_clipboard_run_the_command_on_your_comput)) - }, matchButton(0, 56)) - body.addView(label(getString(R.string.cluster_adb_multi_device, packageName), 14, MUTED)) - body.addView(label(getString(R.string.s_3_tap_check_and_enable_below_this_enables_the_cluster_ma), 16, TEXT)) - val status = label(if (DiLink51ClusterMonitor.hasAccess(this)) getString(R.string.permission_enabled_ready) else getString(R.string.permission_not_enabled), 16, TEXT) - body.addView(status) - val dialog = AlertDialog.Builder(this).setTitle(getString(R.string.automatic_cluster_map_setup)) - .setView(ScrollView(this).apply { addView(body) }) - .setNegativeButton(getString(R.string.close), null) - .setPositiveButton(getString(R.string.check_and_enable), null).create() - dialog.setOnShowListener { - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { - if (DiLink51ClusterMonitor.hasAccess(this)) { - AirPlayPersistence.saveClusterMapEnabled(this, true) - DiLink51ClusterLayout.saveAutomatic(this, true) - dialog.dismiss() - render() - toast(getString(R.string.automatic_map_enabled_open_the_cluster_map_card_or_select)) - reconnectForClusterMap() - } else { - status.text = getString(R.string.still_waiting_for_usage_access_check_that_the_command_ran) - } - } - } - dialog.show() - } - - // The car's approval dialog for DiPlay's ADB key opens only from here, never while driving. - private fun checkAdbAccess(mayAsk: Boolean, reconnectWhenReady: Boolean = false) { - val status = adbStatus ?: return - val generation = ++adbCheckGeneration - status.setTextColor(MUTED) - status.text = getString(if (mayAsk) R.string.adb_checking_may_ask else R.string.adb_checking) - Thread({ - val result = runCatching { BydAdbAccess.check(applicationContext, mayAsk) }.getOrNull() - runOnUiThread { - if (adbStatus !== status || generation != adbCheckGeneration || isFinishing || isDestroyed) return@runOnUiThread - status.setTextColor(if (result?.state == BydAdbAccess.State.READY) MUTED else WARNING) - status.text = adbStatusText(result) - if (reconnectWhenReady && BydOutputSettings.batteryToIphone(this) && - result?.state == BydAdbAccess.State.READY && result.batteryPercent != null) { - connect(AirPlayPersistence.loadWirelessEnabled(this)) - } - } - }, "diplay-adb-check").start() - } - - private fun adbStatusText(result: BydAdbAccess.Status?): String = when (result?.state) { - null -> getString(R.string.adb_check_failed) - BydAdbAccess.State.READY -> listOfNotNull( - getString(R.string.adb_access_ready), - result.dashboardMode?.let { - getString(if (result.dashboardShowsMap) R.string.adb_dashboard_sends_map else R.string.adb_dashboard_does_not_send_map, - it.localizedLabel(this)) - }, - result.batteryPercent?.let { getString(R.string.adb_battery_reading, it.roundToInt(), result.rangeKm ?: 0) } - ?: getString(R.string.adb_battery_unreadable).takeIf { BydOutputSettings.batteryToIphone(this) }, - getString(R.string.adb_battery_reconnect).takeIf { - BydOutputSettings.batteryToIphone(this) && result.batteryPercent != null - }, - ).joinToString(" ") - BydAdbAccess.State.NOT_APPROVED -> getString(R.string.adb_not_approved) - BydAdbAccess.State.ADB_OFF -> getString(R.string.adb_off) - BydAdbAccess.State.PAIRING_ONLY -> getString(R.string.adb_pairing_only) - } - private fun hasPreciseLocation() = checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED @@ -787,12 +562,6 @@ class DiPlayActivity : ComponentActivity() { if (CarPlayBackgroundSession.hasSession()) connect(AirPlayPersistence.loadWirelessEnabled(this)) } - // The cluster screen is described at connection time, so a running session reconnects over - // its current link. The position choices need no call: getString(R.string.apply_and_reconnect) already does it. - private fun reconnectForClusterMap() { - if (CarPlayBackgroundSession.hasSession()) connect(AirPlayPersistence.loadWirelessEnabled(this)) - } - private fun applyWirelessLink(mode: WirelessHotspotMode) { AirPlayPersistence.saveWirelessHotspotMode(this, mode) render() diff --git a/common/src/main/java/com/shilapi/xcertplay/DiPlaySessionService.kt b/common/src/main/java/com/shilapi/xcertplay/DiPlaySessionService.kt index 706b3b89a3..6fa37bb52e 100644 --- a/common/src/main/java/com/shilapi/xcertplay/DiPlaySessionService.kt +++ b/common/src/main/java/com/shilapi/xcertplay/DiPlaySessionService.kt @@ -48,8 +48,6 @@ class DiPlaySessionService : Service() { return START_NOT_STICKY } override fun onTaskRemoved(rootIntent: Intent?) { - // BYD's recents force-stops the package ~10 ms after removing the task: end guidance first. - com.shilapi.xcertplay.hud.BydNavigationOutputs.endNow() CarPlayBackgroundSession.stop() stopSelf() } diff --git a/common/src/main/java/com/shilapi/xcertplay/LocalizedOptions.kt b/common/src/main/java/com/shilapi/xcertplay/LocalizedOptions.kt index 7800504d9f..e1b858420e 100644 --- a/common/src/main/java/com/shilapi/xcertplay/LocalizedOptions.kt +++ b/common/src/main/java/com/shilapi/xcertplay/LocalizedOptions.kt @@ -3,9 +3,7 @@ package com.shilapi.xcertplay import android.content.Context import com.shilapi.xcertplay.airplay.CarPlaySize import com.shilapi.xcertplay.host.R -import com.shilapi.xcertplay.hud.BydClusterNaviMode import com.shilapi.xcertplay.orchestration.ManualHotspotValidation -import com.shilapi.xcertplay.transport.EvChargingConnectors internal fun CarPlaySize.localizedLabel(context: Context): String = context.getString(when (this) { CarPlaySize.LARGE -> R.string.option_size_large @@ -13,31 +11,6 @@ internal fun CarPlaySize.localizedLabel(context: Context): String = context.getS CarPlaySize.SMALL -> R.string.option_size_small }) -internal fun DiLink51ClusterLayout.Theme.localizedLabel(context: Context): String = context.getString(when (this) { - DiLink51ClusterLayout.Theme.SCENARIO -> R.string.option_theme_scenario - DiLink51ClusterLayout.Theme.MAP -> R.string.option_theme_map - DiLink51ClusterLayout.Theme.SIMPLE -> R.string.option_theme_simple -}) - -internal fun DiLink51ClusterLayout.Contrast.localizedLabel(context: Context): String = context.getString(when (this) { - DiLink51ClusterLayout.Contrast.DEFAULT -> R.string.option_contrast_default - DiLink51ClusterLayout.Contrast.LIGHT -> R.string.option_contrast_light - DiLink51ClusterLayout.Contrast.DARK -> R.string.option_contrast_dark -}) - -internal fun BydClusterNaviMode.localizedLabel(context: Context): String = context.getString(when (this) { - BydClusterNaviMode.OFF -> R.string.navi_mode_off - BydClusterNaviMode.TURN_ON_BY_NAVI -> R.string.navi_mode_turn_on_by_navi - BydClusterNaviMode.SMALL -> R.string.navi_mode_small - BydClusterNaviMode.FULL -> R.string.navi_mode_full -}) - -internal fun EvChargingConnectors.localizedLabel(context: Context): String = context.getString(when (this) { - EvChargingConnectors.CCS2_TYPE2 -> R.string.connectors_ccs2_type2 - EvChargingConnectors.GB_T -> R.string.connectors_gb_t - EvChargingConnectors.CCS1_J1772 -> R.string.connectors_ccs1_j1772 -}) - internal fun ManualHotspotValidation.Error.messageResource(): Int = when (this) { ManualHotspotValidation.Error.EMPTY_NAME -> R.string.hotspot_error_empty_name ManualHotspotValidation.Error.LONG_NAME -> R.string.hotspot_error_long_name diff --git a/common/src/main/res/values-ar/strings.xml b/common/src/main/res/values-ar/strings.xml index 0104f95005..0828c08bfd 100644 --- a/common/src/main/res/values-ar/strings.xml +++ b/common/src/main/res/values-ar/strings.xml @@ -4,21 +4,10 @@ نقطة اتصال السيارة المدمجة · أبقِ نقطة الاتصال والبلوتوث وواي فاي iPhone مُفعّلة. افتح إعداد الاتصال لحفظ بيانات نقطة اتصال السيارة المدمجة. Wi-Fi Direct · أبقِ مفتاح واي فاي السيارة والبلوتوث وواي فاي iPhone مُفعّلة. - قياسي · أوضح صورة - أكبر · الافتراضي - الأكبر - يسار - يمين - أعلى - أسفل - الوسط · الافتراضي استخدم نقطة اتصال السيارة نفسها. اختر 5 GHz في إعدادات السيارة إن توفر. إعداد بديل. يتطلب تشغيل مفتاح واي فاي السيارة؛ وقد يتقطّع الاتصال على 2.4 GHz. نقطة الاتصال مُغلقة · شغّلها في إعدادات السيارة. تم حفظ البيانات · تأكد من تشغيل نقطة اتصال السيارة قبل الاتصال. - الإذن مُفعّل · جاهز للاستخدام - الإذن غير مُفعّل بعد - وصول استخدام DiPlay تقرير التشخيص مشاركة تقرير التشخيص تعذّر تحميل مصادقة CarPlay. ثبّت نسخة DiPlay الكاملة فوق هذا التطبيق. لا حاجة لإلغاء التثبيت أو تغيير إعدادات نقطة الاتصال. @@ -62,11 +51,9 @@ نقطة اتصال السيارة «%1$s» مُغلقة. شغّلها في إعدادات السيارة قبل الاتصال. معاينة عامة ·\u0020\u0020 اختر iPhone ·\u0020 - تم الحفظ: %1$d معاينة عامة ·\u0020 يتصل DiPlay عبر نقطة اتصال السيارة «%1$s». شغّلها في إعدادات السيارة ثم اتصل. تعديل نقطة الاتصال المحفوظة ·\u0020 - إذا عرض ADB عدة أجهزة، استخدم adb -s <car-device-ID> shell appops set %1$s GET_USAGE_STATS allow. اعثر على المعرّف عبر adb devices. جاهز لـ\u0020 نوع البث %1$d غير متاح هنا (الحالة=%2$s) دقة المصافحة:\u0020 @@ -103,28 +90,21 @@ توجيه الصوت تلقائي التشغيل التلقائي عند الإقلاع - إعداد خريطة المجموعة التلقائي اتصال تلقائي - تم تفعيل الخريطة التلقائية. افتح بطاقة خريطة المجموعة أو اختر سمة الخريطة. - إعداد الخريطة التلقائي · ADB تعتمد التوفر على إعدادات بدء وحدة القيادة. رجوع العودة إلى DiPlay النطاق إعدادات بلوتوث - ملاحة BYD إلغاء الرئيسية داخل السيارة بيانات نقطة اتصال السيارة نقطة اتصال السيارة مُغلقة - علامة السيارة · أفقية - علامة السيارة · رأسية CarPlay، في مكانه داخل سيارتك. تم الاتصال بـ CarPlay التحكم في CarPlay قيد التشغيل انتهت نافذة التحكم في CarPlay أيقونة CarPlay - خريطة CarPlay على لوحة العدادات · تجريبي خدمة CarPlay قيد التشغيل بالفعل جلسة CarPlay قيد التشغيل بالفعل انتهت جلسة CarPlay؛ إعادة الاتصال @@ -134,7 +114,6 @@ القناة (0 = تلقائي) القناة غير صالحة للنطاق المحدد يجب أن تكون القناة 0 أو من 1 إلى 196 - تحقق وفعّل تحقق من توفر التخزين، أو اختر موضع حفظ آخر. اختر طريقة الاتصال، واتبع خطوات الإعداد، واحفظ بيانات نقطة اتصال سيارتك. اختر صورة @@ -144,7 +123,6 @@ اختر أين تحفظ تقريرك.\u0020 اختر iPhone الخاص بك إغلاق - حجم خريطة لوحة العدادات اتصال اتصال بالهاتف الاتصال عند فتح DiPlay @@ -156,8 +134,6 @@ الاتصال انقطع الاتصال. إعادة المحاولة… إعداد الاتصال - تم النسخ إلى حافظة السيارة. نفّذ الأمر على حاسوبك. - نسخ الأمر انسخ هذه من إعدادات نقطة اتصال السيارة. استخدم 5 GHz إن توفر. الحفظ هنا لا يغيّر نقطة اتصال السيارة. تعذّر فك ترميز الصورة تعذّر ترميز الصورة @@ -185,7 +161,6 @@ خطأ إنهاء التطبيق إنهاء الإعداد · احفظ بيانات نقطة الاتصال لاستخدام هذا الوضع. - اتبع سمة لوحة العدادات وبطاقة الخريطة معدل الإطارات ملء الشاشة ملء الشاشة @@ -215,8 +190,6 @@ الهوية والمظهر الصورة غير جاهزة في CarPlay، اسحب لأسفل بثلاثة أصابع لفتح إعدادات DiPlay. - تباين لوحة العدادات - سمة لوحة العدادات أبقِ البلوتوث وواي فاي مُفعّلين على iPhone. اقرن الهاتف مع بلوتوث السيارة، ثم اختر iPhone هنا. اسمح بـ«الأجهزة القريبة» عند الطلب. أبقِ iPhone قريبًا مع تشغيل البلوتوث وواي فاي.\nاسمح بـ CarPlay إن طلب iPhone ذلك. لاحقاً @@ -230,21 +203,17 @@ ممكن بفضل المصدر المفتوح اجعل DiPlay مناسبًا لسيارتك. نقطة اتصال يدوية - الوضع اليدوي: طابق سمة لوحة العدادات هنا. لا تستطيع الخريطة اتباع مرئيات البطاقة دون إذن الوصول للاستخدام. الشركة المصنّعة مصادقة MFi جاهزة شهادة MFi وهدف التوقيع الطراز ذاكرة الموسيقى أصلي - الملاحة على شاشة العرض الأمامية ولوحة العدادات - نوع بث الملاحة الأجهزة القريبة «الأجهزة القريبة» تربط iPhone. الميكروفون يمكّن Siri والمكالمات. تتطلب إصدارات Android الأقدم أيضًا الموقع للإعداد اللاسلكي. قد يطلب وضع USB اتصال VPN محلي. لا يُرسل شيء تلقائياً. تُستبعد حمولات البروتوكول وبيانات الاعتماد. وسم OEM على iPhone، افتح الإعدادات ← البلوتوث واقترن بالسيارة. ثم عد إلى DiPlay واختر «اتصال بالهاتف». - إعداد لمرة واحدة على هذه السيارة فتح الفتح بعد تشغيل السيارة فتح البلوتوث @@ -286,7 +255,6 @@ جارٍ طلب إذن USB لـ MFi إعادة ضبط إعادة ضبط واتصال - إعادة علامة السيارة إلى الوسط إعادة ضبط واي فاي CarPlay إعادة ضبط واي فاي CarPlay؟ الدقة @@ -296,13 +264,11 @@ قيد التشغيل 1000 مللي ثانية · الأكثر استقراراً 1 · اختر اتصالك - 1. صِل حاسوباً عليه ADB مثبّت بالسيارة عبر اتصال USB أو التنقيط اللاسلكي الحالي. وافق على التنقيط في السيارة إن طُلب.\n\n2. نفّذ هذا الأمر في طرفية الحاسوب: 1. افتح إعدادات نقطة اتصال السيارة، وشغّل نقطة الاتصال واختر 5 GHz إن توفر.\n2. انسخ الاسم وكلمة المرور أدناه كما هما تماماً.\n3. أبقِ نقطة اتصال السيارة مُشغّلة عند الاتصال. يرسل DiPlay البيانات عبر البلوتوث؛ وينضم iPhone تلقائياً. 2 · اقرن iPhone الخاص بك 300 مللي ثانية · الافتراضي 30 إطاراً/ث · حمل أخف 3 · اتصل - 3. اضغط «تحقق وفعّل» أدناه. يفعّل ذلك خريطة المجموعة واتباع السمة تلقائياً. ستعيد جلسة CarPlay النشطة الاتصال مرة واحدة. يمكنك بعد ذلك فصل الحاسوب. 500 مللي ثانية 60 إطاراً/ث · حركة أكثر سلاسة 60% · أخف حمل @@ -330,16 +296,11 @@ مشاركة إظهار سجلات التصحيح على الشاشة إظهار كلمة المرور - إظهار أسهم الملاحة والمسافة وأسماء الشوارع من الهاتف على شاشات BYD المدعومة. تختلف توافقية المركبة. - إظهار الخريطة الجانبية فقط عند فتح بطاقتها، والتبديل إلى الخريطة الكاملة في سمة الخريطة. تغييرات السمة والبطاقة تُبقي CarPlay متصلاً. - يعرض خريطة iPhone على لوحة العدادات. اختر عرض الملاحة المصغّر أو الكامل من قائمة لوحة العدادات باستخدام أزرار المقود. بدء CarPlay تلقائياً بعد إقلاع الجهاز جارٍ البدء جارٍ بدء خدمة AirPlay جارٍ بدء نقطة الاتصال اللاسلكية البدء - ما زال بانتظار إذن الوصول للاستخدام. تحقق من نجاح تنفيذ الأمر لهذه السيارة ثم حاول مجدداً. - اضغط رقماً للاختبار. 14 = مكبر صوت السائق في BYD. تعذّر على وحدة القيادة بدء واي فاي CarPlay. تحقق من واي فاي وأغلق تطبيقات العرض الأخرى. إعادة المحاولة… ينهي هذا اتصال Wi-Fi Direct القائم، بما في ذلك ما تركه إعادة التثبيت. أغلق تطبيقات العرض الأخرى أولاً. يبقى واي فاي الإنترنت لسيارتك مُفعّلاً. لا تستطيع وحدة القيادة هذه استخدام الحجم الأصغر عند هذه الدقة. سيُستخدم الافتراضي. @@ -352,9 +313,6 @@ تشغيل البلوتوث شغّل واي فاي في إعدادات وحدة القيادة للاتصال. شغّل مفتاح واي فاي السيارة. اسمح بالموقع/«الأجهزة القريبة» عند الطلب وفعّل الموقع عندما يطلبه Android. إذا اتقطّع التشغيل، جرّب نقطة اتصال السيارة المدمجة على 5 GHz. - الوصول للاستخدام: مُفعّل - يتيح إذن الوصول للاستخدام لـ DiPlay اتباع سمة لوحة العدادات وبطاقة الخريطة. تتم معالجة أحداث نشاط لوحة BYD محلياً فقط. لا توفر هذه السيارة صفحة إعدادات أذونات عاملة. - الوصول للاستخدام: الإعداد مطلوب للوضع التلقائي USB/CH341 استخدم كابل بيانات USB ومنفذ بيانات USB في السيارة. افتح قفل iPhone واسمح بـ CarPlay. لا حاجة لأي إعداد نقطة اتصال. استخدم كابل بيانات USB وافتح قفل iPhone.\nاسمح بالثقة وCarPlay إن طلب iPhone ذلك. @@ -386,63 +344,11 @@ خرائطك وموسيقاك ومحادثاتك.\nCarPlay، هنا على شاشة سيارتك. هاتفك. رحلتك. تم حفظ تقريرك في الموقع المحدد. - DiPlay · بانتظار خريطة CarPlay كبير متوسط صغير - المشهد · خريطة جانبية - الخريطة · خريطة كاملة - بسيط · خريطة جانبية - إعداد المظهر الافتراضي - خلفية فاتحة · عدادات داكنة - خلفية داكنة · عدادات فاتحة أدخل اسم نقطة اتصال السيارة يجب ألا يتجاوز اسم نقطة الاتصال 32 بايت يحتوي الاسم أو كلمة المرور على محرف غير صالح يجب أن تتكون كلمة مرور نقطة الاتصال من 8 إلى 63 محرفًا - محتوى لوحة العدادات - الخريطة · الافتراضي - بطاقة الانعطاف - خريطة مع بطاقة الانعطاف - حجم بطاقة الانعطاف - بطاقة الانعطاف · أفقيًا - بطاقة الانعطاف · عموديًا - إعادة بطاقة الانعطاف إلى الوسط - خريطة لوحة العدادات فقط في عرض الملاحة المصغّر والكامل · يتطلب ADB - يقرأ DiPlay وضع الملاحة الذي تختاره من أزرار المقود. في وضعي «إيقاف» و«التشغيل عند الملاحة» تعرض لوحة العدادات الأسهم فقط، لذا لا يرسل iPhone الخريطة؛ أما في عرض الملاحة المصغّر والكامل فيرسلها خلال ثانية أو ثانيتين من التبديل. يتطلب ADB عبر الشبكة على وحدة القيادة. - التحقق من الوصول عبر ADB - جارٍ التحقق من الوصول عبر ADB… - جارٍ التحقق من الوصول عبر ADB… إذا طلبت السيارة، فاسمح لـ DiPlay وحدّد «السماح دائمًا». - فشل التحقق من ADB. حاول مرة أخرى. - الوصول عبر ADB جاهز. - لوحة العدادات: %1$s، لذا يرسل iPhone الخريطة. - لوحة العدادات: %1$s، لذا لا يرسل iPhone الخريطة. - لم تتم الموافقة على DiPlay بعد. اضغط «التحقق من الوصول عبر ADB» ثم اسمح لـ DiPlay على شاشة السيارة. - ADB عبر الشبكة متوقف. شغّله من خيارات المطوّر في وحدة القيادة. - توفر وحدة القيادة هذه تصحيح الأخطاء اللاسلكي مع الإقران فقط، وهو ما لا يدعمه DiPlay بعد. - إيقاف - التشغيل عند الملاحة - عرض الملاحة المصغّر - عرض الملاحة الكامل - وضع غير معروف - بطارية السيارة لـ iPhone · يتطلب ADB - يُخبر DiPlay جهاز iPhone بشحن السيارة ومداها، فتنبّه «خرائط Apple» عند انخفاض الشحن وتقترح محطات شحن على الطريق. لا يُبلَّغ iPhone بأن السيارة كهربائية إلا عندما يستطيع DiPlay قراءة البطارية. يعيد الاتصال بـ CarPlay. يتطلب ADB عبر الشبكة على وحدة القيادة. - منافذ الشحن - CCS2 وType 2 · أوروبا - GB/T · الصين - CCS1 وJ1772 · أمريكا الشمالية - تنبيه انخفاض الشحن - %1$d٪ - %1$d٪ · الافتراضي - البطارية: %1$d٪، %2$d كم. - تعذّرت قراءة البطارية في هذه السيارة، لذا لا يُبلَّغ iPhone بأنها سيارة كهربائية. - إذا اتصل CarPlay قبل أن تصبح بيانات البطارية جاهزة، استخدم «تطبيق وإعادة الاتصال» لتفعيل إرسال بيانات البطارية. - سرعة العجلات في الأنفاق · يتطلب ADB - عند تشغيل «إرسال الموقع إلى iPhone»، يرسل DiPlay أيضًا سرعة عجلات السيارة وناقل الحركة، لتواصل «خرائط Apple» تحريك موقعك في الأنفاق ومواقف السيارات. يعيد الاتصال بـ CarPlay. يتطلب ADB عبر الشبكة على وحدة القيادة. - الفيديو أثناء التوقف · يتطلب ADB - iOS 27: يُعرض الفيديو الذي ترسله إلى CarPlay من iPhone على شاشة السيارة ما دامت السيارة على وضع P. يُغلق المشغل عند الخروج من P؛ وبدون ADB يبقى الفيديو متوقفًا ويشغّل iPhone الصوت فقط. يعمل فيديو HTTPS العادي (مثل Safari)؛ أما الفيديو المحمي بـ FairPlay مثل Apple TV+ فيحتاج إلى مستقبل مرخّص ولا يعمل هنا. يعيد الاتصال بـ CarPlay. يتطلب ADB عبر الشبكة على وحدة القيادة. - العودة إلى CarPlay - تشغيل - إيقاف مؤقت - لا يمكن تشغيل هذا الفيديو على شاشة السيارة. الفيديو المحمي، مثل Apple TV+، يحتاج إلى مستقبل مرخّص. diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml index df11300b64..0b9ae5b1f1 100644 --- a/common/src/main/res/values-es/strings.xml +++ b/common/src/main/res/values-es/strings.xml @@ -4,21 +4,10 @@ Punto de acceso integrado · Mantén activos el punto de acceso, el Bluetooth y el Wi‑Fi del iPhone. Abre la configuración de conexión para guardar los datos del punto de acceso integrado. Wi-Fi Direct · Mantén activos el interruptor Wi‑Fi del coche, el Bluetooth y el Wi‑Fi del iPhone. - Estándar · máxima nitidez - Más grande · predeterminado - El más grande - Izquierda - Derecha - Arriba - Abajo - Centro · predeterminado Usa el punto de acceso propio del coche. Selecciona 5 GHz en la configuración del coche si está disponible. Configuración alternativa. Requiere el interruptor Wi‑Fi del coche; en 2,4 GHz la conexión puede trabarse. El punto de acceso está apagado · Actívalo en la configuración del coche. Datos guardados · Comprueba que el punto de acceso del coche esté activado antes de conectarte. - Permiso activado · listo para usar - El permiso aún no está activado - Acceso al uso de DiPlay Informe de diagnóstico Compartir informe de diagnóstico No se pudo cargar la autenticación de CarPlay. Instala la compilación completa de DiPlay sobre esta aplicación. No es necesario desinstalar ni cambiar la configuración del punto de acceso. @@ -62,11 +51,9 @@ El punto de acceso del coche «%1$s» está apagado. Actívalo en la configuración del coche antes de conectarte. VISTA PREVIA PÚBLICA ·\u0020\u0020 Elegir iPhone ·\u0020 - Guardado: %1$d Vista previa ·\u0020 DiPlay se conecta a través del punto de acceso del coche «%1$s». Actívalo en la configuración del coche y luego conéctate. Editar punto de acceso guardado ·\u0020 - Si ADB lista varios dispositivos, usa adb -s <car-device-ID> shell appops set %1$s GET_USAGE_STATS allow. Encuentra el ID con adb devices. Listo para\u0020 El tipo de flujo %1$d no está disponible aquí (estado=%2$s) Resolución del enlace:\u0020 @@ -103,28 +90,21 @@ Enrutamiento de audio Auto Inicio automático al arrancar - Configuración automática del mapa del cuadro Conexión automática - Mapa automático activado. Abre la tarjeta del mapa del cuadro o selecciona el tema del mapa. - Configuración automática del mapa · ADB La disponibilidad depende de los ajustes de inicio de tu unidad principal. Atrás Volver a DiPlay Banda Ajustes de Bluetooth - Navegación BYD Cancelar Inicio del coche Datos del punto de acceso del coche El punto de acceso del coche está apagado - Marcador del coche · horizontal - Marcador del coche · vertical CarPlay, como en casa en tu coche. CarPlay conectado Control de CarPlay en ejecución Ventana de control de CarPlay finalizada Icono de CarPlay - Mapa de CarPlay en el panel de instrumentos · experimental El servicio de CarPlay ya está en ejecución La sesión de CarPlay ya está en ejecución Sesión de CarPlay finalizada; reconectando @@ -134,7 +114,6 @@ Canal (0 = auto) El canal no es válido para la banda seleccionada El canal debe ser 0 o estar entre 1 y 196 - Comprobar y activar Comprueba que el almacenamiento esté disponible o elige otro lugar de guardado. Elige cómo conectarte, sigue los pasos de configuración y guarda los datos de tu punto de acceso del coche. Elegir imagen @@ -144,7 +123,6 @@ Elige dónde guardar tu informe.\u0020 Elige tu iPhone Cerrar - Tamaño del mapa del panel de instrumentos Conectar Conectar teléfono Conectar al abrir DiPlay @@ -156,8 +134,6 @@ Conexión Conexión interrumpida. Reintentando… Configuración de conexión - Copiado al portapapeles del coche. Ejecuta el comando en tu ordenador. - Copiar comando Copia esto de los ajustes del punto de acceso del coche. Usa 5 GHz si está disponible. Guardar aquí no cambia el punto de acceso del coche. No se pudo decodificar la imagen No se pudo codificar la imagen @@ -185,7 +161,6 @@ Error SALIR DE LA APLICACIÓN Finalizar configuración · Guarda los datos de tu punto de acceso para usar este modo. - Seguir el tema del cuadro y la tarjeta del mapa Frecuencia de imágenes Pantalla completa Pantalla completa @@ -215,8 +190,6 @@ Identidad y apariencia La imagen no está lista En CarPlay, desliza hacia abajo con tres dedos para abrir los ajustes de DiPlay. - Contraste del cuadro - Tema del cuadro Mantén activos el Bluetooth y el Wi‑Fi en tu iPhone. Empareja el teléfono con el Bluetooth del coche y luego selecciona tu iPhone aquí. Permite «Dispositivos cercanos» cuando se te pida. Mantén tu iPhone cerca con el Bluetooth y el Wi‑Fi activados.\nPermite CarPlay si tu iPhone lo pide. Más tarde @@ -230,21 +203,17 @@ Hecho posible por el código abierto Haz que DiPlay encaje con tu coche. Punto de acceso manual - Modo manual: ajusta aquí el tema del cuadro. El mapa no puede seguir la visibilidad de las tarjetas sin el permiso de uso. Fabricante Autenticación MFi lista Certificado MFi y destino de firma Modelo Búfer de música Nativa - Navegación en HUD y panel de instrumentos - Tipo de flujo de navegación Dispositivos cercanos «Dispositivos cercanos» conecta tu iPhone. El micrófono activa Siri y las llamadas. Las versiones antiguas de Android también requieren Ubicación para la configuración inalámbrica. El modo USB puede pedir una conexión VPN local. No se envía nada automáticamente. Las cargas del protocolo y las credenciales quedan excluidas. Etiqueta OEM En tu iPhone, abre Ajustes → Bluetooth y empareja con el coche. Después vuelve a DiPlay y elige «Conectar teléfono». - Configuración única en este coche Abrir Abrir después de arrancar el coche Abrir Bluetooth @@ -286,7 +255,6 @@ Solicitando permiso USB de MFi Restablecer Restablecer y conectar - Restablecer el marcador del coche al centro Restablecer el Wi‑Fi de CarPlay ¿Restablecer el Wi‑Fi de CarPlay? Resolución @@ -296,13 +264,11 @@ En ejecución 1000 ms · la más estable 1 · Elige tu conexión - 1. Conecta un ordenador con ADB instalado al coche mediante tu conexión USB o de depuración inalámbrica existente. Aprueba la depuración en el coche si se te pide.\n\n2. Ejecuta este comando en la terminal del ordenador: 1. Abre los ajustes del punto de acceso del coche, actívalo y selecciona 5 GHz si está disponible.\n2. Copia abajo su nombre y contraseña exactamente.\n3. Deja el punto de acceso del coche activado al conectarte. DiPlay envía los datos por Bluetooth; tu iPhone se une automáticamente. 2 · Empareja tu iPhone 300 ms · predeterminado 30 img/s · carga más ligera 3 · Conéctate - 3. Toca «Comprobar y activar» abajo. Esto activa el mapa del cuadro y el seguimiento automático del tema. Una sesión de CarPlay activa se reconectará una vez. Después puedes desconectar el ordenador. 500 ms 60 img/s · movimiento más suave 60% · carga más ligera @@ -330,16 +296,11 @@ Compartir Mostrar registros de depuración en pantalla Mostrar contraseña - Muestra las flechas de navegación, la distancia y los nombres de calles del teléfono en pantallas BYD compatibles. La compatibilidad varía según el vehículo. - Muestra el mapa lateral solo cuando su tarjeta está abierta y cambia al mapa completo en el tema del mapa. Los cambios de tema y tarjeta mantienen CarPlay conectado. - Muestra el mapa del iPhone en el panel de instrumentos. Selecciona navegación en pantalla pequeña o completa en el menú del panel mediante los controles del volante. Iniciar CarPlay automáticamente tras el arranque del dispositivo Iniciando Iniciando el servicio de AirPlay Iniciando el punto de acceso inalámbrico Inicio - Sigue esperando el acceso al uso. Comprueba que el comando se ejecutó correctamente para este coche e inténtalo de nuevo. - Toca un número para probar. 14 = altavoz del conductor en BYD. La unidad principal no pudo iniciar el Wi‑Fi de CarPlay. Comprueba el Wi‑Fi y cierra otras aplicaciones de proyección. Reintentando… Esto finaliza la conexión Wi-Fi Direct existente, incluida la que quedó tras reinstalar. Cierra primero las otras aplicaciones de proyección. El Wi‑Fi de internet de tu coche sigue activo. Esta unidad principal no puede usar el tamaño más pequeño con esta resolución. Se usará el predeterminado. @@ -352,9 +313,6 @@ Activar Bluetooth Activa el Wi‑Fi en los ajustes de la unidad principal para conectarte. Activa el interruptor Wi‑Fi del coche. Permite Ubicación/«Dispositivos cercanos» si se te pide y activa la ubicación cuando Android lo solicite. Si la reproducción se traba, prueba el punto de acceso integrado del coche a 5 GHz. - Acceso al uso: activado - El acceso al uso permite que DiPlay siga el tema del cuadro y la tarjeta del mapa. Solo se procesan localmente los eventos de actividad del cuadro BYD. Este coche no ofrece una página de configuración de permisos funcional. - Acceso al uso: se necesita configuración para el modo automático USB/CH341 Usa un cable de datos USB y el puerto de datos USB del coche. Desbloquea tu iPhone y permite CarPlay. No hace falta configurar el punto de acceso. Usa un cable de datos USB y desbloquea tu iPhone.\nPermite «Confiar» y CarPlay si tu iPhone lo pide. @@ -386,63 +344,11 @@ Tus mapas, tu música y tus conversaciones.\nCarPlay, aquí mismo en la pantalla de tu coche. TU TELÉFONO. TU TRAYECTO. Tu informe se guardó en la ubicación seleccionada. - DiPlay · esperando el mapa de CarPlay Grande Mediano Pequeño - Escenario · mapa lateral - Mapa · mapa completo - Simple · mapa lateral - Predeterminado del tema - Fondo claro · instrumentos oscuros - Fondo oscuro · instrumentos claros Introduce el nombre del punto de acceso del coche El nombre del punto de acceso no debe superar los 32 bytes El nombre o la contraseña contiene un carácter no válido La contraseña del punto de acceso debe tener entre 8 y 63 caracteres - Contenido del panel de instrumentos - Mapa · predeterminado - Tarjeta de giro - Mapa con tarjeta de giro - Tamaño de la tarjeta de giro - Tarjeta de giro · horizontal - Tarjeta de giro · vertical - Centrar la tarjeta de giro - Mapa del panel solo en navegación en pantalla pequeña y completa · requiere ADB - DiPlay lee el modo de navegación que eliges con el volante. En «Apagado» y «Activar con la navegación» el panel solo muestra flechas, así que el iPhone no envía el mapa; en navegación en pantalla pequeña y completa sí lo envía, uno o dos segundos después del cambio. Requiere ADB por red en la unidad principal. - Comprobar acceso ADB - Comprobando el acceso ADB… - Comprobando el acceso ADB… Si el coche lo pide, permite DiPlay y marca «Permitir siempre». - La comprobación de ADB falló. Inténtalo de nuevo. - Acceso ADB listo. - Panel: %1$s, así que el iPhone envía el mapa. - Panel: %1$s, así que el iPhone no envía el mapa. - DiPlay aún no está autorizado. Toca «Comprobar acceso ADB» y permite DiPlay en la pantalla del coche. - ADB por red está desactivado. Actívalo en las opciones de desarrollador de la unidad principal. - Esta unidad principal solo ofrece depuración inalámbrica con emparejamiento, que DiPlay aún no admite. - Apagado - Activar con la navegación - Navegación en pantalla pequeña - Navegación en pantalla completa - modo desconocido - Batería del coche para el iPhone · requiere ADB - DiPlay indica al iPhone la carga y la autonomía del coche, para que Apple Maps avise de una carga baja y sugiera cargadores en el camino. El iPhone solo sabe que es un coche eléctrico mientras DiPlay puede leer la batería. Reconecta CarPlay. Requiere ADB por red en la unidad principal. - Conectores de carga - CCS2 y Tipo 2 · Europa - GB/T · China - CCS1 y J1772 · Norteamérica - Aviso de carga baja - %1$d %% - %1$d %% · predeterminado - Batería: %1$d %%, %2$d km. - No se puede leer la batería de este coche, así que el iPhone no sabe que es un coche eléctrico. - Si CarPlay se conectó antes de que la batería estuviera lista, usa Aplicar y reconectar para activar el envío de los datos de la batería. - Velocidad de las ruedas para túneles · requiere ADB - Con «Informar la ubicación al iPhone» activado, DiPlay también envía la velocidad de las ruedas y la marcha, para que Apple Maps siga moviendo tu posición en túneles y aparcamientos. Reconecta CarPlay. Requiere ADB por red en la unidad principal. - Vídeo con el coche aparcado · requiere ADB - iOS 27: el vídeo que envías a CarPlay desde el iPhone se reproduce en la pantalla del coche mientras está en P. El reproductor se cierra al salir de P; sin ADB el vídeo queda desactivado y el iPhone solo reproduce el audio. El vídeo HTTPS normal (por ejemplo, de Safari) funciona; el vídeo protegido con FairPlay, como Apple TV+, necesita un receptor con licencia y aquí no se reproduce. Vuelve a conectar CarPlay. Requiere ADB por red en la unidad principal. - Volver a CarPlay - Reproducir - Pausa - Este vídeo no se puede reproducir en la pantalla del coche. El vídeo protegido, como Apple TV+, necesita un receptor con licencia. diff --git a/common/src/main/res/values-ru/strings.xml b/common/src/main/res/values-ru/strings.xml index 6dc2090b8a..75941a6db7 100644 --- a/common/src/main/res/values-ru/strings.xml +++ b/common/src/main/res/values-ru/strings.xml @@ -4,21 +4,10 @@ Встроенная точка доступа · Держите точку доступа, Bluetooth и Wi-Fi iPhone включёнными. Откройте настройки подключения, чтобы сохранить данные встроенной точки доступа. Wi-Fi Direct · Держите переключатель Wi-Fi автомобиля, Bluetooth и Wi-Fi iPhone включёнными. - Стандартный · максимальная чёткость - Крупнее · по умолчанию - Самый крупный - Влево - Вправо - Вверх - Вниз - По центру · по умолчанию Используйте собственную точку доступа автомобиля. Выберите 5 ГГц в настройках автомобиля, если доступно. Альтернативный вариант. Требует включённого переключателя Wi-Fi автомобиля; на 2,4 ГГц возможны подтормаживания. Точка доступа выключена · Включите её в настройках автомобиля. Данные сохранены · Перед подключением убедитесь, что точка доступа автомобиля включена. - Разрешение включено · готово к использованию - Разрешение ещё не включено - Доступ к использованию DiPlay Диагностический отчёт Поделиться диагностическим отчётом Не удалось загрузить аутентификацию CarPlay. Установите полную сборку DiPlay поверх этого приложения. Удалять приложение и менять настройки точки доступа не требуется. @@ -62,11 +51,9 @@ Точка доступа автомобиля «%1$s» выключена. Включите её в настройках автомобиля перед подключением. ОТКРЫТАЯ ПРЕДВАРИТЕЛЬНАЯ ВЕРСИЯ ·\u0020\u0020 Выбрать iPhone ·\u0020 - Сохранено: %1$d Предварительная версия ·\u0020 DiPlay подключается через точку доступа автомобиля «%1$s». Включите её в настройках автомобиля и подключитесь. Изменить сохранённую точку доступа ·\u0020 - Если ADB перечисляет несколько устройств, используйте adb -s <car-device-ID> shell appops set %1$s GET_USAGE_STATS allow. Узнать ID можно командой adb devices. Готов к\u0020 Тип потока %1$d недоступен здесь (состояние=%2$s) Разрешение рукопожатия:\u0020 @@ -103,28 +90,21 @@ Маршрутизация звука Авто Автозапуск при загрузке - Автоматическая настройка карты комбинации Автоматическое подключение - Автоматическая карта включена. Откройте карточку карты комбинации или выберите тему карты. - Автоматическая настройка карты · ADB Доступность зависит от настроек запуска вашего головного устройства. Назад Вернуться в DiPlay Диапазон Настройки Bluetooth - Навигация BYD Отмена Главная в автомобиле Данные точки доступа автомобиля Точка доступа автомобиля выключена - Маркер автомобиля · по горизонтали - Маркер автомобиля · по вертикали CarPlay, как дома в вашем автомобиле. CarPlay подключён Управление CarPlay работает Окно управления CarPlay завершено Значок CarPlay - Карта CarPlay на приборной панели · экспериментально Служба CarPlay уже работает Сеанс CarPlay уже работает Сеанс CarPlay завершён; переподключение @@ -134,7 +114,6 @@ Канал (0 = авто) Канал недействителен для выбранного диапазона Канал должен быть 0 или от 1 до 196 - Проверить и включить Убедитесь, что хранилище доступно, или выберите другое место сохранения. Выберите способ подключения, выполните шаги настройки и сохраните данные точки доступа автомобиля. Выбрать изображение @@ -144,7 +123,6 @@ Выберите, куда сохранить отчёт.\u0020 Выберите свой iPhone Закрыть - Размер карты на приборной панели Подключить Подключить телефон Подключать при открытии DiPlay @@ -156,8 +134,6 @@ Подключение Соединение прервано. Повтор… Настройка подключения - Скопировано в буфер обмена автомобиля. Выполните команду на компьютере. - Копировать команду Скопируйте это из настроек точки доступа автомобиля. Используйте 5 ГГц, если доступно. Сохранение здесь не меняет точку доступа автомобиля. Не удалось декодировать изображение Не удалось закодировать изображение @@ -185,7 +161,6 @@ Ошибка ВЫЙТИ ИЗ ПРИЛОЖЕНИЯ Завершить настройку · Сохраните данные точки доступа, чтобы использовать этот режим. - Следовать теме приборов и карточке карты Частота кадров Полный экран Полноэкранный режим @@ -215,8 +190,6 @@ Идентичность и оформление Изображение не готово В CarPlay проведите тремя пальцами вниз, чтобы открыть настройки DiPlay. - Контраст приборов - Тема приборов Держите Bluetooth и Wi-Fi включёнными на iPhone. Свяжите телефон с Bluetooth автомобиля, затем выберите iPhone здесь. Разрешите «Рядом находящиеся устройства», когда попросят. Держите iPhone рядом с включёнными Bluetooth и Wi-Fi.\nРазрешите CarPlay, если iPhone попросит. Позже @@ -230,21 +203,17 @@ Реализовано благодаря открытому коду Сделайте DiPlay удобным для вашего автомобиля. Ручная точка доступа - Ручной режим: настройте тему комбинации здесь. Карта не может следовать видимости карточек без доступа к использованию. Производитель Аутентификация MFi готова Сертификат MFi и цель подписи Модель Буфер музыки Нативное - Навигация на HUD и приборной панели - Тип потока навигации Рядом находящиеся устройства «Рядом находящиеся устройства» связывают iPhone. Микрофон нужен для Siri и звонков. Старые версии Android также требуют местоположение для беспроводной настройки. Режим USB может запросить локальное VPN-подключение. Ничего не отправляется автоматически. Данные протокола и учётные данные исключены. Метка OEM На iPhone откройте Настройки → Bluetooth и свяжитесь с автомобилем. Затем вернитесь в DiPlay и выберите «Подключить телефон». - Разовая настройка для этого автомобиля Открыть Открывать после запуска автомобиля Открыть Bluetooth @@ -286,7 +255,6 @@ Запрос разрешения USB для MFi Сбросить Сбросить и подключить - Вернуть маркер автомобиля в центр Сбросить Wi-Fi CarPlay Сбросить Wi-Fi CarPlay? Разрешение @@ -296,13 +264,11 @@ Работает 1000 мс · самая стабильная 1 · Выберите способ подключения - 1. Подключите компьютер с установленным ADB к автомобилю по имеющемуся USB или беспроводной отладке. При запросе подтвердите отладку на автомобиле.\n\n2. Выполните эту команду в терминале компьютера: 1. Откройте настройки точки доступа автомобиля, включите её и выберите 5 ГГц, если доступно.\n2. Точно скопируйте ниже её имя и пароль.\n3. Оставляйте точку доступа включённой при подключении. DiPlay передаёт данные по Bluetooth; iPhone подключится автоматически. 2 · Свяжите iPhone 300 мс · по умолчанию 30 кадров/с · меньшая нагрузка 3 · Подключитесь - 3. Нажмите «Проверить и включить» ниже. Это включит карту комбинации и автоматическое следование теме. Активный сеанс CarPlay переподключится один раз. После этого можно отключить компьютер. 500 мс 60 кадров/с · более плавное движение 60% · минимальная нагрузка @@ -330,16 +296,11 @@ Поделиться Показывать отладочные журналы на экране Показать пароль - Показывает стрелки навигации, расстояние и названия улиц с телефона на поддерживаемых дисплеях BYD. Совместимость зависит от автомобиля. - Показывать боковую карту только когда её карточка открыта, а для полной карты переключаться в теме карты. Изменения темы и карточек сохраняют подключение CarPlay. - Показывает карту iPhone на приборной панели. В меню приборной панели, управляемом с руля, выберите навигацию на малом или полном экране. Запускать CarPlay автоматически после загрузки устройства Запуск Запуск службы AirPlay Запуск беспроводной точки доступа Запуск - Всё ещё ожидаем доступ к использованию. Проверьте, что команда успешно выполнена для этого автомобиля, и повторите попытку. - Нажмите число для теста. 14 = динамик водителя в BYD. Головному устройству не удалось запустить Wi-Fi CarPlay. Проверьте Wi-Fi и закройте другие приложения проекции. Повтор… Это завершит существующее подключение Wi-Fi Direct, в том числе оставшееся после переустановки. Сначала закройте другие приложения проекции. Интернет-Wi-Fi автомобиля останется включённым. Это головное устройство не может использовать меньший размер при этом разрешении. Используется значение по умолчанию. @@ -352,9 +313,6 @@ Включить Bluetooth Включите Wi-Fi в настройках головного устройства для подключения. Включите переключатель Wi-Fi автомобиля. Разрешите местоположение/«Рядом находящиеся устройства» при запросе и включите местоположение, когда Android попросит. Если воспроизведение подтормаживает, попробуйте встроенную точку доступа на 5 ГГц. - Доступ к использованию: включён - Доступ к использованию позволяет DiPlay следовать теме приборов и карточке карты. Обрабатываются только события активности комбинации BYD локально. В этом автомобиле нет рабочей страницы настройки разрешений. - Доступ к использованию: настройка нужна для автоматического режима USB/CH341 Используйте кабель данных USB и порт данных USB автомобиля. Разблокируйте iPhone и разрешите CarPlay. Настройка точки доступа не нужна. Используйте кабель данных USB и разблокируйте iPhone.\nРазрешите доверие и CarPlay, если iPhone попросит. @@ -386,63 +344,11 @@ Ваши карты, музыка и разговоры.\nCarPlay прямо здесь на экране автомобиля. ВАШ ТЕЛЕФОН. ВАША ПОЕЗДКА. Отчёт сохранён в выбранном месте. - DiPlay · ожидание карты CarPlay Большой Средний Маленький - Сценарий · карта сбоку - Карта · полная карта - Простой · карта сбоку - По умолчанию для темы - Светлый фон · тёмные приборы - Тёмный фон · светлые приборы Введите имя точки доступа автомобиля Имя точки доступа не должно превышать 32 байта Имя или пароль содержит недопустимый символ Пароль точки доступа должен содержать от 8 до 63 символов - Содержимое приборной панели - Карта · по умолчанию - Карточка поворота - Карта с карточкой поворота - Размер карточки поворота - Карточка поворота · по горизонтали - Карточка поворота · по вертикали - Вернуть карточку поворота в центр - Карта на приборной панели только в малой и полноэкранной навигации · нужен ADB - DiPlay считывает режим навигации, выбранный кнопками на руле. В режимах «Выкл.» и «Включать при навигации» приборная панель показывает только стрелки, поэтому iPhone не передаёт карту; в режимах малого и полного экрана навигации передаёт — через секунду-две после переключения. Нужен ADB по сети на головном устройстве. - Проверить доступ ADB - Проверка доступа ADB… - Проверка доступа ADB… Если машина спросит, разрешите DiPlay и отметьте «Всегда разрешать». - Проверка ADB не удалась. Попробуйте ещё раз. - Доступ ADB есть. - Приборная панель: %1$s, поэтому iPhone передаёт карту. - Приборная панель: %1$s, поэтому iPhone не передаёт карту. - DiPlay ещё не разрешён. Нажмите «Проверить доступ ADB» и разрешите DiPlay на экране машины. - ADB по сети выключен. Включите его в параметрах разработчика головного устройства. - Это головное устройство поддерживает только беспроводную отладку с сопряжением, которую DiPlay пока не поддерживает. - Выкл. - Включать при навигации - Навигация на малом экране - Навигация на полном экране - неизвестный режим - Батарея машины для iPhone · нужен ADB - DiPlay сообщает iPhone заряд и запас хода машины, чтобы Apple Карты предупреждали о низком заряде и предлагали зарядки по пути. iPhone узнаёт об электромобиле, только пока DiPlay может прочитать батарею. Переподключает CarPlay. Нужен ADB по сети на головном устройстве. - Разъёмы зарядки - CCS2 и Type 2 · Европа - GB/T · Китай - CCS1 и J1772 · Северная Америка - Предупреждение о низком заряде - %1$d %% - %1$d %% · по умолчанию - Батарея: %1$d %%, %2$d км. - Батарею этой машины прочитать не удалось, поэтому iPhone не узнаёт об электромобиле. - Если CarPlay подключился до получения данных батареи, нажмите «Применить и переподключить», чтобы включить передачу данных батареи. - Скорость колёс для тоннелей · нужен ADB - Если включено «Передавать местоположение на iPhone», DiPlay также передаёт скорость колёс и передачу, чтобы Apple Карты продолжали вести вашу позицию в тоннелях и на парковках. Переподключает CarPlay. Нужен ADB по сети на головном устройстве. - Видео на стоянке · нужен ADB - iOS 27: видео, которое вы отправляете в CarPlay с iPhone, показывается на экране машины, пока включён P. Плеер закрывается, когда вы выходите из P; без ADB видео выключено и iPhone играет только звук. Обычное видео по HTTPS (например, из Safari) работает; видео под защитой FairPlay, как Apple TV+, требует лицензированного приёмника и здесь не воспроизводится. Переподключает CarPlay. Нужен ADB по сети на головном устройстве. - Назад в CarPlay - Воспроизвести - Пауза - Это видео нельзя воспроизвести на экране машины. Защищённому видео, например Apple TV+, нужен лицензированный приёмник. diff --git a/common/src/main/res/values-zh-rCN/strings.xml b/common/src/main/res/values-zh-rCN/strings.xml index 3ab3411e13..8cebf91b71 100644 --- a/common/src/main/res/values-zh-rCN/strings.xml +++ b/common/src/main/res/values-zh-rCN/strings.xml @@ -4,21 +4,10 @@ 车载热点 · 保持车载热点、蓝牙和 iPhone 的 Wi-Fi 开启。 打开“连接设置”以保存车载热点信息。 Wi-Fi Direct · 保持车机 Wi-Fi 开关、蓝牙和 iPhone 的 Wi-Fi 开启。 - 标准 · 最清晰 - 更大 · 默认 - 最大 - 左 - 右 - 上 - 下 - 居中 · 默认 使用车輄自带热点。若车机支持,请在车机设置中选择 5 GHz。 备选方案。需要打开车机 Wi-Fi 开关;2.4 GHz 连接可能会卡顿。 热点已关闭 · 请在车机设置中开启。 详情已保存 · 连接前请确认车载热点已开启。 - 权限已启用 · 可以使用 - 权限尚未启用 - DiPlay 使用情况访问权限 诊断报告 分享诊断报告 无法加载 CarPlay 认证。请在本应用之上覆盖安装完整的 DiPlay 构建。无需卸载或更改热点设置。 @@ -62,11 +51,9 @@ 车机热点“%1$s”未开启。请在车机设置中开启后再连接。 公开预览 ·\u0020\u0020 选择 iPhone ·\u0020 - 已保存:%1$d 公开预览 ·\u0020 DiPlay 通过车机热点“%1$s”连接。请在车机设置中开启热点后连接。 编辑已保存的热点 ·\u0020 - 如果 ADB 列出多个设备,请使用 adb -s <car-device-ID> shell appops set %1$s GET_USAGE_STATS allow。用 adb devices 查询 ID。 已准备连接: 流类型 %1$d 在此不可用(状态=%2$s) 握手分辨率: @@ -98,29 +85,22 @@ 音频路由 自动 开机后自动启动 - 自动仪表盘地图设置 自动连接 - 自动地图已启用。打开仪表盘地图卡片或选择“地图主题”。 - 自动地图设置 · ADB 是否可用取决于车机的启动设置。 返回 返回 DiPlay 频段 蓝牙设置 - 比亚迪导航 取消 车机主页 车机热点详情 车机热点未开启 - 车辆标记 · 水平 - 车辆标记 · 垂直 CarPlay 让 CarPlay 融入车机。 CarPlay 已连接 CarPlay 控制通道运行中 CarPlay 控制会话已结束 CarPlay 图标 - 仪表盘上的CarPlay地图 · 实验性 CarPlay 服务已在运行 CarPlay 会话已在运行 CarPlay 会话已结束;正在重新连接 @@ -130,7 +110,6 @@ 信道(0 = 自动) 所选频段不支持此信道 信道必须为 0 或 1–196 - 检查并启用 请检查存储空间,或选择其他保存位置。 选择连接方式,按步骤操作并保存车机热点信息。 选择图片 @@ -140,7 +119,6 @@ 选择报告的保存位置。 选择 iPhone 关闭 - 仪表盘地图大小 取消 连接 连接手机 @@ -153,8 +131,6 @@ 连接 连接中断,正在重试… 连接设置 - 已复制到车机剪贴板。在电脑上运行该命令。 - 复制命令 从车机热点设置中复制以下内容。如有 5 GHz 请选择。在此保存不会更改车机的热点。 无法读取图片 无法编码图片 @@ -183,7 +159,6 @@ 错误 退出应用 完成设置 · 保存热点信息以使用此模式。 - 跟随仪表盘主题和地图卡片 帧率 全屏显示 全屏 @@ -214,8 +189,6 @@ 身份与外观 图片尚未准备好 在 CarPlay 界面用三指向下滑动,可打开 DiPlay 设置。 - 仪表盘对比度 - 仪表盘主题 保持 iPhone 的蓝牙和 Wi-Fi 开启。先与车机蓝牙配对,然后在此选择你的 iPhone。出现提示时允许“附近的设备”。 请将 iPhone 放在附近并开启蓝牙和 Wi-Fi。\niPhone 出现提示时允许使用 CarPlay。 应用语言 @@ -235,21 +208,17 @@ 开源项目鸣谢 按需调整 DiPlay 设置。 手动热点 - 手动模式:在此匹配仪表盘主题。没有使用访问权限时,地图无法跟随卡片显示状态。 制造商 MFi 认证已就绪 MFi 证书与签名目标 型号 音乐缓冲 原生 - HUD和仪表盘导航 - 导航音频流类型 附近的设备 “附近的设备”权限用于连接 iPhone;麦克风权限用于 Siri 和通话。较旧的 Android 版本还需要位置权限来设置无线连接。USB 模式可能会请求建立本地 VPN 连接。 报告不会自动发送,不包含协议数据和凭据。 OEM 标签 在 iPhone 上打开“设置 → 蓝牙”并与车机配对。然后返回 DiPlay,点击“连接手机”。 - 在此车机上一次性设置 开放 车机启动后打开 打开蓝牙 @@ -291,7 +260,6 @@ 正在请求 MFi USB 权限 重置 重置并连接 - 将车辆标记重置到居中 重置 CarPlay Wi-Fi 重置 CarPlay Wi-Fi? 分辨率 @@ -303,14 +271,12 @@ 1000 毫秒 · 更稳定 1.0x 1 · 选择连接方式 - 1. 用装有 ADB 的电脑,通过现有的 USB 或无线调试连接连接到车机。如有调试授权提示请批准。\n\n2. 在电脑终端中运行此命令: 1. 打开车机热点设置,开启热点,如有 5 GHz 请选择。\n2. 在下方准确复制热点名称和密码。\n3. 连接时保持车机热点开启。DiPlay 通过蓝牙发送热点信息,iPhone 会自动加入。 2.4 GHz 2 · 配对你的 iPhone 300 毫秒 · 默认 30 帧/秒 · 减轻负载 3 · 连接 - 3. 点击下方“检查并启用”。这将启用仪表盘地图和自动主题跟随。正在进行的 CarPlay 会话会重新连接一次,之后即可断开电脑。 500 毫秒 5 GHz 60 帧/秒 · 更流畅 @@ -339,16 +305,11 @@ 分享 在屏幕上显示调试日志 显示密码 - 在支持的比亚迪显示屏上显示手机导航箭头、距离和道路名称。不同车型的兼容性有所差异。 - 仅在地图卡片展开时显示侧方地图,并在“地图主题”中切换为完整地图。更改主题或卡片不会中断 CarPlay 连接。 - 在仪表盘上显示iPhone地图。通过方向盘操作仪表盘菜单,选择小屏导航或全屏导航。 设备启动后自动启动 CarPlay 正在启动 正在启动 AirPlay 服务 正在启动无线热点 启动 - 仍在等待使用访问权限。请确认命令已在本车机上成功运行,然后重试。 - 点按数字测试。14 = 比亚迪主驾扬声器。 车机无法启动 CarPlay Wi-Fi。请检查 Wi-Fi 并关闭其他投屏应用,正在重试… 这会结束现有的 Wi-Fi Direct 连接,包括重新安装后遗留的连接。请先关闭其他投屏应用。车机的互联网 Wi-Fi 不受影响。 此车机在当前分辨率下无法使用更小的尺寸,将使用默认尺寸。 @@ -361,9 +322,6 @@ 打开蓝牙 请在车机设置中打开 Wi-Fi 后再连接。 打开车机的 Wi-Fi 开关。如提示请允许位置/附近的设备权限,并在 Android 询问时启用位置。如果播放卡顿,请尝试使用 5 GHz 的内置车机热点。 - 使用访问权限:已启用 - 使用访问权限让 DiPlay 跟随仪表盘主题和地图卡片。仅在本地处理 BYD 仪表盘活动事件。本车机没有可用的权限设置页面。 - 使用访问权限:自动模式需要设置 USB/CH341 使用 USB 数据线连接车机的 USB 数据接口。解锁 iPhone 并允许 CarPlay。无需设置热点。 请使用 USB 数据线并解锁 iPhone。\niPhone 出现提示时允许“信任”和使用 CarPlay。 @@ -397,63 +355,11 @@ 地图、音乐与通话,\n在车机屏幕上畅享 CarPlay。 你的手机,畅享旅程。 报告已保存到所选位置。 - DiPlay · 等待 CarPlay 地图 大 中 小 - 场景 · 侧边地图 - 地图 · 全屏地图 - 简约 · 侧边地图 - 主题默认 - 浅色背景 · 深色仪表 - 深色背景 · 浅色仪表 请输入车载热点名称 热点名称不能超过32字节 名称或密码包含无效字符 热点密码长度必须为8至63个字符 - 仪表盘显示内容 - 地图 · 默认 - 转向提示卡 - 地图和转向提示卡 - 转向提示卡大小 - 转向提示卡 · 水平位置 - 转向提示卡 · 垂直位置 - 将转向提示卡重置到中央 - 仅在小屏或全屏导航时显示仪表盘地图 · 需要 ADB - DiPlay 读取你在方向盘菜单中选择的导航模式。在“关闭”和“导航时开启”模式下仪表盘只显示箭头,因此 iPhone 不发送地图;在小屏导航和全屏导航模式下会发送,切换后一两秒内生效。需要在车机上开启网络 ADB。 - 检查 ADB 访问 - 正在检查 ADB 访问… - 正在检查 ADB 访问…如果车机询问,请允许 DiPlay 并勾选“始终允许”。 - ADB 检查失败,请重试。 - ADB 访问已就绪。 - 仪表盘:%1$s,因此 iPhone 会发送地图。 - 仪表盘:%1$s,因此 iPhone 不发送地图。 - DiPlay 尚未获得授权。点按“检查 ADB 访问”,然后在车机屏幕上允许 DiPlay。 - 网络 ADB 已关闭。请在车机的开发者选项中开启。 - 此车机仅提供需要配对的无线调试,DiPlay 暂不支持。 - 关闭 - 导航时开启 - 小屏导航 - 全屏导航 - 未知模式 - 向 iPhone 提供车辆电量 · 需要 ADB - DiPlay 将车辆的电量和续航告诉 iPhone,Apple 地图即可在电量低时提醒并推荐沿途充电站。只有在 DiPlay 能读取电池信息时,才会向 iPhone 声明这是电动车。会重新连接 CarPlay。需要在车机上开启网络 ADB。 - 充电接口 - CCS2 和 Type 2 · 欧洲 - GB/T · 中国 - CCS1 和 J1772 · 北美 - 低电量提醒 - %1$d%% - %1$d%% · 默认 - 电池:%1$d%%,%2$d 公里。 - 无法读取这辆车的电池信息,因此不会向 iPhone 声明这是电动车。 - 如果 CarPlay 在电池数据就绪前已连接,请使用“应用并重新连接”以启用电池数据上报。 - 隧道中的车轮速度 · 需要 ADB - 开启“向 iPhone 报告位置”后,DiPlay 还会发送车轮速度和挡位,让 Apple 地图在隧道和停车场里也能继续推算你的位置。会重新连接 CarPlay。需要在车机上开启网络 ADB。 - 驻车时播放视频 · 需要 ADB - iOS 27:在 iPhone 上投送到 CarPlay 的视频会在车辆处于 P 挡时在车机屏幕上播放。挂出 P 挡时播放器会关闭;没有 ADB 时视频保持关闭,iPhone 只播放声音。普通 HTTPS 视频(例如来自 Safari)可以播放;受 FairPlay 保护的视频(例如 Apple TV+)需要获得授权的接收器,在这里无法播放。会重新连接 CarPlay。需要车机开启网络 ADB。 - 返回 CarPlay - 播放 - 暂停 - 此视频无法在车机屏幕上播放。受保护的视频(例如 Apple TV+)需要获得授权的接收器。 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index d6a92098f8..022e88992d 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -4,21 +4,10 @@ Built-in car hotspot · Keep the car hotspot, Bluetooth and your iPhone’s Wi-Fi on. Open Connection setup to save your built-in car hotspot details. Wi-Fi Direct · Keep the car’s Wi-Fi switch, Bluetooth and your iPhone’s Wi-Fi on. - Standard · sharpest - Larger · default - Largest - Left - Right - Up - Down - Centre · default Use the car’s own hotspot. Select 5 GHz in car settings if available. Alternative setup. Requires the car’s Wi-Fi switch on; a 2.4 GHz connection may stutter. Hotspot is off · Turn it on in car settings. Details saved · Check that the car hotspot is on before connecting. - Permission enabled · ready to use - Permission not enabled yet - DiPlay Usage Access Diagnostic report Share diagnostic report CarPlay authentication could not be loaded. Install the complete DiPlay build over this app. No uninstall or hotspot change is needed. @@ -62,11 +51,9 @@ The car hotspot “%1$s” is off. Turn it on in the car settings before connecting. PUBLIC PREVIEW ·\u0020\u0020 Choose iPhone ·\u0020 - Saved: %1$d Public preview ·\u0020 DiPlay connects through the car hotspot “%1$s”. Turn it on in the car settings, then connect. Edit saved hotspot ·\u0020 - If ADB lists several devices, use adb -s <car-device-ID> shell appops set %1$s GET_USAGE_STATS allow. Find the ID with adb devices. Ready for\u0020 Stream type %1$d is unavailable here (state=%2$s) Handshake resolution:\u0020 @@ -104,29 +91,22 @@ Audio routing Auto Auto-start on boot - Automatic cluster map setup Automatic connection - Automatic map enabled. Open the cluster map card or select Map theme. - Automatic map setup · ADB Availability depends on your head unit’s startup settings. Back Back to DiPlay Band Bluetooth settings - BYD navigation Cancel Car home Car hotspot details Car hotspot is off - Car marker · horizontal - Car marker · vertical CarPlay CarPlay, at home in your car. CarPlay connected CarPlay control running CarPlay control window ended CarPlay icon - CarPlay map on dashboard · experimental CarPlay service already running CarPlay session already running CarPlay session ended; reconnecting @@ -136,7 +116,6 @@ Channel (0 = auto) Channel is not valid for the selected band Channel must be 0 or 1-196 - Check and enable Check that storage is available, or choose another save location. Choose how to connect, follow the setup steps and save your car hotspot details. Choose image @@ -146,7 +125,6 @@ Choose where to save your report.\u0020 Choose your iPhone Close - Dashboard map size Connect Connect phone Connect when DiPlay opens @@ -158,8 +136,6 @@ Connection Connection interrupted. Retrying… Connection setup - Copied to the car clipboard. Run the command on your computer. - Copy command Copy these from the car’s hotspot settings. Use 5 GHz if available. Saving here does not change the car’s hotspot. Could not decode image Could not encode image @@ -188,7 +164,6 @@ Error EXIT APPLICATION Finish setup · Save your hotspot details to use this mode. - Follow instrument theme and map card Frame rate Full screen Fullscreen @@ -219,8 +194,6 @@ Identity & appearance Image is not ready In CarPlay, swipe down with three fingers to open DiPlay settings. - Instrument contrast - Instrument theme Keep Bluetooth and Wi-Fi on your iPhone. Pair with the car’s Bluetooth, then select your iPhone here. Allow Nearby devices when asked. Keep your iPhone nearby with Bluetooth and Wi-Fi on.\nAllow CarPlay if your iPhone asks. Later @@ -235,21 +208,17 @@ Made possible by open source Make DiPlay feel right for your car. Manual hotspot - Manual mode: match the cluster theme here. The map cannot follow card visibility without Usage Access. Manufacturer MFi authentication ready MFI certificate & signing target Model Music buffer Native - Navigation on HUD and dashboard - Navigation stream type Nearby devices Nearby devices connects your iPhone. Microphone enables Siri and calls. Older Android versions also require Location for wireless setup. USB mode may ask for a local VPN connection. Nothing is sent automatically. Protocol payloads and credentials are excluded. OEM label On your iPhone, open Settings → Bluetooth and pair with the car. Then return to DiPlay and choose Connect phone. - One-time setup on this car Open Open after the car starts Open Bluetooth @@ -291,7 +260,6 @@ Requesting MFi USB permission Reset Reset and connect - Reset car marker to centre Reset CarPlay Wi-Fi Reset CarPlay Wi-Fi? Resolution @@ -303,14 +271,12 @@ 1000 ms · most stable 1.0x 1 · Choose your connection - 1. Connect a computer with ADB installed to the car using your existing USB or wireless debugging connection. Approve debugging on the car if asked.\n\n2. Run this command in the computer’s terminal: 1. Open car hotspot settings, turn the hotspot on and select 5 GHz if available.\n2. Copy its name and password below exactly.\n3. Leave the car hotspot on when connecting. DiPlay sends the details over Bluetooth; your iPhone joins automatically. 2.4 GHz 2 · Pair your iPhone 300 ms · default 30 fps · lighter load 3 · Connect - 3. Tap Check and enable below. This enables the cluster map and automatic theme following. An active CarPlay session reconnects once. You can then disconnect the computer. 500 ms 5 GHz 60 fps · smoother motion @@ -339,16 +305,11 @@ Share Show on-screen debug logs Show password - Show phone navigation arrows, distance and street names on supported BYD displays. Vehicle compatibility varies. - Show the side map only when its card is open, and switch to the full map in Map theme. Theme and card changes keep CarPlay connected. - Shows the iPhone\'s map on the dashboard. Choose Small or Full screen navi in the dashboard\'s steering-wheel menu. Start CarPlay automatically after device boot Starting Starting AirPlay service Starting wireless hotspot Startup - Still waiting for Usage Access. Check that the command ran successfully for this car, then try again. - Tap a number to test. 14 = driver speaker on BYD. The head unit couldn’t start CarPlay Wi-Fi. Check Wi-Fi and close other projection apps. Retrying… This ends the existing Wi-Fi Direct connection, including one left behind after reinstalling. Close other projection apps first. Your car’s internet Wi-Fi stays on. This head unit cannot use the smaller size at this resolution. Using Default. @@ -361,9 +322,6 @@ Turn on Bluetooth Turn on Wi-Fi in the head unit’s settings to connect. Turn the car’s Wi-Fi switch on. Allow Location / Nearby devices if requested and enable Location when Android asks. If playback stutters, try the built-in car hotspot at 5 GHz. - Usage Access: enabled - Usage Access lets DiPlay follow the instrument theme and map card. Only BYD cluster activity events are processed locally. This car does not provide a working permission settings page. - Usage Access: setup needed for automatic mode USB/CH341 Use a USB data cable and the car’s USB data port. Unlock your iPhone and allow CarPlay. No hotspot setup is needed. Use a USB data cable and unlock your iPhone.\nAllow Trust and CarPlay if your iPhone asks. @@ -397,63 +355,11 @@ Your maps, music and conversations.\nCarPlay, right here on your car display. YOUR PHONE. YOUR DRIVE. Your report was saved to the selected location. - DiPlay · waiting for the CarPlay map Large Medium Small - Scenario · side map - Map · full map - Simple · side map - Theme default - Light background · dark instruments - Dark background · light instruments Enter the car hotspot name The hotspot name must be at most 32 bytes The name or password contains an invalid character The hotspot password must be 8–63 characters - Dashboard shows - Map · default - Turn card - Map with turn card - Turn card size - Turn card · horizontal - Turn card · vertical - Reset turn card to centre - Dashboard map only in Small and Full navi · needs ADB - DiPlay reads the navi mode you pick on the steering wheel. In Off and Turn on by navi the dashboard shows arrows only, so the iPhone does not send the map; in Small and Full screen navi it does, within a second or two of the switch. Needs ADB over network on the head unit. - Check ADB access - Checking ADB access… - Checking ADB access… If the car asks, allow DiPlay and tick “Always allow”. - The ADB check failed. Try again. - ADB access ready. - Dashboard: %1$s, so the iPhone sends the map. - Dashboard: %1$s, so the iPhone does not send the map. - DiPlay is not approved yet. Tap Check ADB access, then allow DiPlay on the car screen. - ADB over network is off. Turn it on in the head unit’s developer options. - This head unit offers only wireless debugging with pairing, which DiPlay does not support yet. - Off - Turn on by navi - Small screen navi - Full screen navi - unknown mode - Car battery for the iPhone · needs ADB - DiPlay tells the iPhone the car\'s charge and range, so Apple Maps can warn about a low charge and suggest chargers on the way. The iPhone is told about an electric car only while DiPlay can read the battery. Reconnects CarPlay. Needs ADB over network on the head unit. - Charging connectors - CCS2 and Type 2 · Europe - GB/T · China - CCS1 and J1772 · North America - Low charge warning - %1$d %% - %1$d %% · default - Battery: %1$d %%, %2$d km. - The battery cannot be read on this car, so the iPhone is not told about an electric car. - If CarPlay connected before the battery was ready, use Apply and reconnect to enable battery reporting. - Wheel speed for tunnels · needs ADB - With Report location to iPhone on, DiPlay also sends the car\'s wheel speed and gear, so Apple Maps can keep your position moving in tunnels and car parks. Reconnects CarPlay. Needs ADB over network on the head unit. - Video while parked · needs ADB - iOS 27: a video you send to CarPlay on the iPhone plays on the car screen while the car is in P. The player closes when you shift out of P; without ADB video stays off and the iPhone plays audio only. Plain HTTPS video (for example from Safari) plays; video protected with FairPlay, such as Apple TV+, needs a licensed receiver and does not play here. Reconnects CarPlay. Needs ADB over network on the head unit. - Back to CarPlay - Play - Pause - This video can\'t play on the car screen. Protected video, such as Apple TV+, needs a licensed receiver. diff --git a/common/src/test/java/com/shilapi/xcertplay/CarPlayMediaCallbackTest.kt b/common/src/test/java/com/shilapi/xcertplay/CarPlayMediaCallbackTest.kt index 2d54d08f0b..59751a4466 100644 --- a/common/src/test/java/com/shilapi/xcertplay/CarPlayMediaCallbackTest.kt +++ b/common/src/test/java/com/shilapi/xcertplay/CarPlayMediaCallbackTest.kt @@ -32,7 +32,7 @@ class CarPlayMediaCallbackTest { fun hardwarePlayAndPauseKeysToggle() { press(KeyEvent.KEYCODE_MEDIA_PLAY) press(KeyEvent.KEYCODE_MEDIA_PAUSE) - press(CarPlayMediaButton.KEYCODE_BYD_AUTO_MEDIA_PLAY_PAUSE) + press(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) assertEquals(List(3) { CarPlayMediaButton.PLAY_PAUSE }, sent) } diff --git a/common/src/test/java/com/shilapi/xcertplay/ClusterActivityStateTest.kt b/common/src/test/java/com/shilapi/xcertplay/ClusterActivityStateTest.kt deleted file mode 100644 index 082298fd32..0000000000 --- a/common/src/test/java/com/shilapi/xcertplay/ClusterActivityStateTest.kt +++ /dev/null @@ -1,76 +0,0 @@ -package com.shilapi.xcertplay - -import com.shilapi.xcertplay.DiLink51ClusterLayout.Theme -import org.junit.Assert.* -import org.junit.Test - -class ClusterActivityStateTest { - private val state = ClusterActivityState() - private fun event(name: String, type: Int, instance: Int = 1, time: Long = 100) { - val pkg = when (name) { - ClusterActivityState.SCENARIO -> "com.byd.sr" - ClusterActivityState.SIMPLE -> "com.byd.cluster" - else -> "com.byd.launchermap" - } - state.event(pkg, name, instance, type, time) - } - - @Test fun scenarioOnlyShowsTheMiniMapWhileItsCardIsVisible() { - event(ClusterActivityState.SCENARIO, 1) - assertEquals(ClusterActivityState.Snapshot(Theme.SCENARIO, false), state.snapshot()) - event(ClusterActivityState.MINI_MAP, 1) - assertTrue(state.snapshot().mapVisible) - event(ClusterActivityState.MINI_MAP, 23) - assertEquals(ClusterActivityState.Snapshot(Theme.SCENARIO, false), state.snapshot()) - } - - @Test fun switchingToMapDoesNotRetainTheSideLayout() { - event(ClusterActivityState.SCENARIO, 1) - event(ClusterActivityState.MINI_MAP, 1) - event(ClusterActivityState.FULL_MAP, 1, time = 200) - assertEquals(ClusterActivityState.Snapshot(Theme.MAP, true), state.snapshot()) - event(ClusterActivityState.SCENARIO, 23, time = 201) - event(ClusterActivityState.MINI_MAP, 23, time = 202) - assertEquals(ClusterActivityState.Snapshot(Theme.MAP, true), state.snapshot()) - } - - @Test fun switchingFromMapToSimpleWithoutAMapCardHidesTheOverlay() { - event(ClusterActivityState.FULL_MAP, 1) - event(ClusterActivityState.SIMPLE, 1, time = 200) - assertEquals(ClusterActivityState.Snapshot(Theme.SIMPLE, false), state.snapshot()) - event(ClusterActivityState.MINI_MAP, 1, time = 210) - assertEquals(ClusterActivityState.Snapshot(Theme.SIMPLE, true), state.snapshot()) - } - - @Test fun pausedButVisibleClusterSurvivesFocusMovingToTheHeadUnit() { - event(ClusterActivityState.FULL_MAP, 1) - event(ClusterActivityState.FULL_MAP, 2) - state.event("com.example.music", "PlayerActivity", 9, 1, 300) - assertEquals(ClusterActivityState.Snapshot(Theme.MAP, true), state.snapshot()) - } - - @Test fun stoppingAnOldInstanceDoesNotHideItsReplacement() { - event(ClusterActivityState.SCENARIO, 1) - event(ClusterActivityState.MINI_MAP, 1, instance = 1) - event(ClusterActivityState.MINI_MAP, 1, instance = 2, time = 200) - event(ClusterActivityState.MINI_MAP, 23, instance = 1, time = 201) - assertTrue(state.snapshot().mapVisible) - event(ClusterActivityState.MINI_MAP, 23, instance = 2, time = 202) - assertFalse(state.snapshot().mapVisible) - } - - @Test fun unknownStateAndRestartCannotDisplayAStaleOverlay() { - assertEquals(ClusterActivityState.Snapshot(null, false), state.snapshot()) - event(ClusterActivityState.FULL_MAP, 1) - state.event(null, null, 0, 26, 200) - assertEquals(ClusterActivityState.Snapshot(null, false), state.snapshot()) - event(ClusterActivityState.FULL_MAP, 1) - state.event(null, null, 0, 27, 300) - assertEquals(ClusterActivityState.Snapshot(null, false), state.snapshot()) - } - - @Test fun matchingClassNameFromAnotherPackageCannotSelectATheme() { - state.event("unrelated.app", ClusterActivityState.FULL_MAP, 1, 1, 100) - assertNull(state.snapshot().theme) - } -} diff --git a/common/src/test/java/com/shilapi/xcertplay/ClusterMapPresentationTest.kt b/common/src/test/java/com/shilapi/xcertplay/ClusterMapPresentationTest.kt deleted file mode 100644 index 4c29b23bb4..0000000000 --- a/common/src/test/java/com/shilapi/xcertplay/ClusterMapPresentationTest.kt +++ /dev/null @@ -1,59 +0,0 @@ -package com.shilapi.xcertplay - -import android.hardware.display.DisplayManager -import android.view.Display -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNull -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment -import org.robolectric.Shadows.shadowOf -import org.robolectric.shadows.ShadowDisplayManager -import org.robolectric.annotation.Config - -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [29], manifest = Config.NONE) -class ClusterMapPresentationTest { - private val context get() = RuntimeEnvironment.getApplication() - private val manager get() = context.getSystemService(DisplayManager::class.java) - - private fun display(name: String): Int { - // Display.TYPE_VIRTUAL (5) is hidden from the public Android SDK. - val id = ShadowDisplayManager.addDisplay("w960dp-h360dp", 5) - shadowOf(manager.getDisplay(id)).apply { - setName(name) - setFlags(Display.FLAG_PRESENTATION) - } - return id - } - - @Test fun legacyFirmwareKeepsOriginalBaseDisplayPreference() { - val base = display("fission_bg_XDJAScreenProjection") - val shared = display("shared_fission_bg_XDJAScreenProjection_0") - try { - assertEquals(base, ClusterMapPresentation.findDisplay(context)?.displayId) - } finally { - ShadowDisplayManager.removeDisplay(shared) - ShadowDisplayManager.removeDisplay(base) - } - } - - @Test fun baseDisplayStillWorksWhenNoSharedLayerExists() { - val base = display("fission_bg_XDJAScreenProjection") - try { - assertEquals(base, ClusterMapPresentation.findDisplay(context)?.displayId) - } finally { - ShadowDisplayManager.removeDisplay(base) - } - } - - @Test fun unrelatedPresentationDisplayIsNotUsedForTheCluster() { - val other = display("Passenger display") - try { - assertNull(ClusterMapPresentation.findDisplay(context)) - } finally { - ShadowDisplayManager.removeDisplay(other) - } - } -} diff --git a/common/src/test/java/com/shilapi/xcertplay/DiLink51ClusterLayoutTest.kt b/common/src/test/java/com/shilapi/xcertplay/DiLink51ClusterLayoutTest.kt deleted file mode 100644 index 959c4cff07..0000000000 --- a/common/src/test/java/com/shilapi/xcertplay/DiLink51ClusterLayoutTest.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.shilapi.xcertplay - -import com.shilapi.xcertplay.DiLink51ClusterLayout.Theme -import com.shilapi.xcertplay.DiLink51ClusterLayout.Plan -import org.junit.Assert.* -import org.junit.Test - -class DiLink51ClusterLayoutTest { - private val names = listOf(DiLink51ClusterLayout.BASE, DiLink51ClusterLayout.FULL, DiLink51ClusterLayout.SIDE) - private val firmware = DiLink51ClusterLayout.FINGERPRINT - - @Test fun mapUsesFullLayerWhileBothOtherThemesUseSideLayer() { - assertEquals(DiLink51ClusterLayout.FULL, DiLink51ClusterLayout.displayName(names, firmware, Theme.MAP)) - for (theme in listOf(Theme.SCENARIO, Theme.SIMPLE)) { - assertEquals(DiLink51ClusterLayout.SIDE, DiLink51ClusterLayout.displayName(names, firmware, theme)) - assertEquals(Plan(1320, 0, 600, 720, false), DiLink51ClusterLayout.plan(1920, 720, theme)) - } - } - - @Test fun missingSideLayerCannotCoverScenarioWithAFullMap() { - assertNull(DiLink51ClusterLayout.displayName(listOf(DiLink51ClusterLayout.BASE, DiLink51ClusterLayout.FULL), firmware, Theme.SCENARIO)) - } - - @Test fun fullMapKeepsSpeedAndGearBandsOutsideTheVideoViewport() { - val plan = DiLink51ClusterLayout.plan(1920, 720, Theme.MAP)!! - assertTrue(plan.top >= 144) - assertTrue(plan.top + plan.height <= 624) - assertEquals(0, plan.left) - assertEquals(1920, plan.width) - assertEquals(0, plan.sourceLeft) - assertEquals(240, plan.sourceTop) - assertNull(DiLink51ClusterLayout.streamConfig().safeArea) - } - - @Test fun oneContinuousStreamSupportsBothViewportsWithoutStretching() { - val config = DiLink51ClusterLayout.streamConfig() - assertEquals(1920, config.widthPixels) - assertEquals(720, config.heightPixels) - assertEquals(292, config.widthPhysicalMm) - assertEquals(110, config.heightPhysicalMm) - assertEquals(0, config.features) - for (theme in Theme.entries) { - val plan = DiLink51ClusterLayout.plan(1920, 720, theme)!! - assertTrue(plan.sourceLeft >= 0) - assertTrue(plan.sourceTop >= 0) - assertTrue(plan.sourceLeft + plan.width <= config.widthPixels) - assertEquals(config.heightPixels, plan.sourceTop + plan.height) - // Preserve the centered, bottom-anchored car marker in every crop. - assertTrue(960 in plan.sourceLeft until plan.sourceLeft + plan.width) - assertTrue(640 in plan.sourceTop until plan.sourceTop + plan.height) - } - val side = DiLink51ClusterLayout.plan(1920, 720, Theme.SIMPLE)!! - assertEquals(660, side.sourceLeft) - assertEquals(0, side.sourceTop) - } - - @Test fun diLink5AndUnknownFirmwareRetainThePrDisplaySelection() { - for (fingerprint in listOf("BYD-AUTO/DiLink5.0/DiLink5.0:12/test", "unknown")) { - assertFalse(DiLink51ClusterLayout.supported(fingerprint)) - assertEquals(DiLink51ClusterLayout.BASE, DiLink51ClusterLayout.displayName(names, fingerprint, Theme.SIMPLE)) - assertEquals(DiLink51ClusterLayout.FULL, DiLink51ClusterLayout.displayName(names.drop(1), fingerprint, Theme.MAP)) - } - } - - @Test fun unmeasuredPanelSizesAreNotGivenTheWrongReadoutMask() { - assertNull(DiLink51ClusterLayout.plan(1280, 480, Theme.MAP)) - } -} diff --git a/docs/BYD_NAVIGATION.md b/docs/BYD_NAVIGATION.md deleted file mode 100644 index a77e9dce90..0000000000 --- a/docs/BYD_NAVIGATION.md +++ /dev/null @@ -1,102 +0,0 @@ -# BYD navigation displays - -Phone navigation arrows, next-turn distance and street names can appear on supported BYD displays. Ordinary operation requires no ADB, root, laptop or helper process. The map app must provide structured navigation metadata; compatibility is not guaranteed for every map app or version. - -## Validated windshield path - -Live guidance and street names were physically confirmed in both DiAuto and DiPlay on DiLink5.1 / Android13, firmware `BYD-AUTO/IVI/IVI:13/TP1A.220624.014/eng.build20260722.221155:user/release-keys`. The standalone output is restricted to that firmware and the verified stock receiver version10601004/signing certificate. Other firmware is not implicitly enabled by this result. Existing cluster/SOME-IP outputs remain available on supported factory services; the DiPlay contributor independently reported DiLink5.0 cluster/HUD operation. - -The app sends navigation-only broadcasts to the stock ClusterDebug receiver as its normal Android UID. Vendor output runs outside phone control callbacks. Street text uses the installed HAL's UTF-16LE chunk protocol, capped at48 UTF-16 units without splitting a surrogate pair. Output logs exclude street text. - -Normal route end, disconnect, disabling navigation output and stale guidance trigger cleanup. Force-stop/process kill may leave the last instruction visible until the app opens again; a recovery journal handles that next launch. There is no guaranteed process-independent expiry. Run only one projection app at a time. - -Enable BYD navigation in settings. In DiAuto it is opt-in under Navigation; in DiPlay it is enabled by default when available. Debug-only receivers/demos require Android's DUMP permission and are absent from release manifests. Development starter and vendor-access experiments are not part of the production navigation path. - -## CarPlay map on the instrument cluster (experimental) - -DiPlay can ask the iPhone for CarPlay's second, instrument-cluster screen and show it in the BYD cluster's map area. The iPhone renders this map itself; DiPlay decodes the stream onto the cluster projection display. No root or persistent helper is needed. The optional DiLink 5.1 automatic mode described below needs a one-time permission setup. - -Validated on DiLink5.0 / Android12, firmware `BYD-AUTO/DiLink5.0/DiLink5.0:12/SKQ1.230128.001/eng.build.20251111.182747:user/release-keys`, with Apple Maps on iOS 27: - -- Turn on "CarPlay map on dashboard" under BYD navigation. The switch appears only when a cluster projection display is visible to the app. -- In the cluster's own steering-wheel menu, choose "Full screen navi" or "Small screen navi". "Turn on by navi" shows arrows only, even during CarPlay navigation. -- The cluster's speed readout stays visible. "Small screen navi" crops the same picture on the cluster side; Android does not report that crop. -- The car marker is placed through CarPlay's safe area: the centre of the panel (x 35–64 %, y 16–75 %), measured with a calibration grid to be clear of BYD's own readouts in both Full and Small screen navi. "Car marker · horizontal" (Left 40 % … Right 40 %) and "Car marker · vertical" (Up 30 % … Down 30 %) move it from there in 10 % steps of the panel. Near a panel edge the safe area shrinks so the marker stays at its centre. -- "Dashboard shows" picks which of the cluster contents the iPhone offers in `altScreenURLs` DiPlay asks for: Map (`maps:/car/instrumentcluster/map`, default), Turn card (`…/instructioncard`) or Map with turn card (`maps:/car/instrumentcluster`). On the tested car the turn card fit the Small screen navi window well and streamed only 0–5 kbit/s against 0.3–4 Mbit/s for the map. The iPhone lays out the map, the car marker and the turn card inside the same safe area, so the position settings below move whichever is shown; they are labelled "Car marker" or "Turn card" to match. -- "Dashboard map size" (or "Turn card size") sets the stream size, which the cluster scales up to the panel: Standard (100 %, sharpest), Larger (83 %, 1600x600, default) or Largest (67 %). Apple Maps ignores the reported physical size on the cluster, so resolution is the only way to change the map's scale. - -How it works: the iPhone lists the cluster content it offers in its `/info` request (`altScreenURLs`). DiPlay declares a second display of the cluster's size with no input devices and `initialURL=maps:/car/instrumentcluster/map`; without an initial URL the iPhone streams only a black frame. BYD exposes the cluster projection area as public presentation displays owned by `com.byd.containerservice`. The stock map's display (`fission_bg_XDJAScreenProjection`) is hidden from third-party apps, but its `shared_…_0` sibling is composited on top of it, so DiPlay shows a `Presentation` there. - -Limits: the cluster window belongs to the CarPlay screen, so it stops while that screen is closed and the session runs in the background. Other map apps and other firmware are untested. - -### DiLink 5.1 theme profile - -The exact Android 13 firmware `BYD-AUTO/IVI/IVI:13/TP1A.220624.014/eng.build20260722.221155:user/release-keys` has a separate profile for its measured 1920×720 cluster. Other firmware retains the original PR display selection, renderer and settings. - -- Map uses shared display `_0`, with a 1920×480 viewport at y=144 and contrast bands behind the instrument readouts. -- Scenario and Simple use shared display `_1`, with a 600×720 side viewport at x=1320. Everything outside the side map is transparent. No white mini-map shading is added. -- The iPhone sends one continuous 1920×720 map. DiPlay crops it at native scale into each viewport, centered horizontally and aligned to the bottom to retain the vehicle marker. Theme changes do not restart CarPlay. The side crop shows less surrounding map area than a separately negotiated portrait stream. -- The two rendering surfaces remain alive when cards close. Window opacity controls visibility, and direct decoder surface handoffs preserve its video reference frames. - -Enable **Follow instrument theme and map card** to follow the stock cluster activities. Android Usage Access is required because BYD's theme API is signature-protected. This firmware has no working Usage Access settings page, so the owner must approve one-time ADB setup. For the HUD Test package: - -```sh -adb shell appops set com.shihab.diplay.hudtest GET_USAGE_STATS allow -``` - -Open **Settings → BYD navigation → Automatic map setup · ADB** for the guided setup, available even when automatic mode is off. It shows the command for the installed package, offers a copy button, explains multiple-device ADB selection, and displays the current permission status. After running the command on your computer, tap **Check and enable** to verify permission and enable both the cluster map and automatic following. If permission is still missing, the guide stays open with instructions; an active CarPlay session reconnects once after successful setup. The copy button copies to the car clipboard, so the command is also displayed for typing on your computer. To revoke it, substitute `default` for `allow`. Without access or a recognized active theme, automatic mode hides the overlay. Manual mode remains available but cannot follow card visibility. If no current theme can be inferred after startup, select a different theme once to produce a fresh event. - -Only the four stock full-map, mini-map, Scenario and Simple activity events are processed locally. Closing the mini-map card hides the side overlay; Map theme selects the full layer. Merely moving focus to a head-unit app does not hide a still-visible cluster activity. See [Android's UsageStatsManager documentation](https://developer.android.com/reference/android/app/usage/UsageStatsManager) for the permission model. - -### Dashboard map only in Small and Full navi (optional, needs ADB) - -The iPhone draws and streams the cluster map for the whole session, even while the cluster shows no projection: in Off and "Turn on by navi" the cluster draws arrows only (in "Turn on by navi" the stock map even removes its own cluster window). With "Dashboard map only in Small and Full navi · needs ADB" turned on, DiPlay reads the mode the driver picked on the wheel every second and, while it is Off or "Turn on by navi", sends `stopUI` for the alt screen (`{"type": "stopUI", "params": {"uuid": }}`). When the driver picks Small or Full screen navi it sends `showUI` with the map URL (`{"uuid", "url": "maps:/car/instrumentcluster/map"}`) and `forceKeyFrame` for the same UUID. CarKit handles both as car-initiated commands (`_handleStopUIWithParameters:` / `_handleShowUIWithParameters:`); the stream stays up, so nothing reconnects. - -Measured on the car: after `stopUI` the cluster stream carried no frames at all while the main screen went on as usual; after a switch on the wheel `showUI` went out about 0.6 s later and the map was back within a second. If the mode cannot be read (no ADB access), DiPlay keeps the map streaming as without the setting. - -Ordinary apps cannot read the mode: BYD's `INSTRUMENT_NAVI_TYPE` needs a BYD signature. The adb shell reads it through the `autoservice` binder (instrument device 1007, feature `0x40C03032`): `service call autoservice 5 i32 1007 i32 1086337074` → `Parcel(00000000 0000000N)`, N = 1 Off, 2 Turn on by navi, 3 Small screen navi, 4 Full screen navi. (The shell can also set it through `INSTRUMENT_NAVI_TYPE_SET`, `0x4C10A018`, with `service call autoservice 6 …`; DiPlay does not change the mode.) - -DiPlay runs the read through the head unit's own adbd on `127.0.0.1:5555` ("ADB over network" in developer options) with its own RSA key. The car asks once to allow that key; DiPlay offers the key only from the settings button "Check ADB access", never in the background, so the dialog cannot appear while driving. The TLS pairing flavour of wireless debugging is not supported. - -## Car battery for the iPhone (optional, needs ADB) - -CarPlay's vehicle status lets the car tell the iPhone its charge and range; Apple Maps then warns about a low charge and offers chargers on the way. With "Car battery for the iPhone · needs ADB" turned on, DiPlay declares an electric vehicle in its iAP2 identification (VehicleInformation with engine type electric and the chosen charging connectors, VehicleStatus with range, range warning, charge and maximum range) and answers the iPhone's StartVehicleStatusUpdates (`0xA100`) with VehicleStatusUpdate (`0xA101`) every 30 s. - -DiPlay declares the electric vehicle only when it already has a battery reading as the iPhone identifies the accessory. With ADB off or not approved, or on a car without these properties, the identification stays as without the switch, and the log says `iap2 no battery reading: not declaring an electric vehicle`. The battery is read when DiPlay opens and when CarPlay starts, without blocking the settings page or the iAP2 loop; "Check ADB access" shows whether the battery can be read. - -"Charging connectors" picks what the iPhone is told the car can plug into: CCS2 and Type 2 (Europe, the default), GB/T DC and AC (China), or CCS1 and J1772 (North America). Pick the one that matches the car's charging inlet. - -The values come from the adb shell (apps need a BYD signature for them), read every 30 s while the iPhone asks: - -- charge: statistic device 1014, `0x4A505038` (`STATISTIC_ELEC_PERCENTAGE`), float percent — `service call autoservice 7 i32 1014 i32 1246777400`; -- range: 1014, `0x4A50203E` (`STATISTIC_ELEC_DRIVING_RANGE` on this platform), km — `service call autoservice 5 i32 1014 i32 1246765118`; -- energy left: power device 1005, `882901008` (`POWER_BATTERY_REMAIN_ELECTRICITY`), float kWh; -- charging: charging device 1009, `876609560` (BMS state, 1 = charging). - -Full charge and full range are scaled up from the current values. At or below "Low charge warning" (20 % by default) DiPlay sets the range warning. On the car above DiPlay read 25 %, 150 km and 25.1 kWh, and with the warning threshold at 30 % Apple Maps offered to find a charging station. The suggestion comes from Apple Maps and iOS; Google Maps did not react in testing. - -If CarPlay connected before the first battery reading was available, battery reporting stays off for that connection. In BYD navigation settings, **Check ADB access** now caches the reading it displays. **Apply and reconnect** checks and caches a valid reading before reconnecting; if ADB or the battery is unavailable, it keeps the current connection and shows the failure instead. Enabling battery reporting during an active session uses the same check-before-reconnect path. Returning after idle also requests an immediate background refresh rather than waiting for the next 30-second poll. The UI and iAP2 loop never wait for ADB. - -## Wheel speed for tunnels (optional, needs ADB) - -"Report location to iPhone" (Settings → Location) sends the head unit's position as `$GPGGA` + `$GPRMC` in iAP2 LocationInformation (`0xFFFB`). In a tunnel or car park there is no fix, and the iPhone has only its own motion sensors. "Wheel speed for tunnels · needs ADB" adds the car's speed and gear so the iPhone can keep the position moving: - -- DiPlay also sets VehicleSpeedData (id 20) in the LocationInformation identification component. It sends `$PASCD` only if the iPhone selects it (id 4) in StartLocationInformation (`0xFFFA`); the log shows the ids the iPhone asked for (`components=[…]`). -- Every LocationInformation (about once a second) carries the samples since the previous one, even without a GPS fix: `$PASCD,,C,

,0,,,,…*CS`. The layout copies a production head unit's log; what `C` and `0` stand for is not public. -- Speed: device 1013, `-1807745016`, float km/h (BYD SDK speed), read four times a second over adb — `service call autoservice 7 i32 1013 i32 -1807745016`. Gear: device 1011, `555745336`, 1 P, 2 R, 3 N, 4 D, read once a second — `service call autoservice 5 i32 1011 i32 555745336`. - -Checked in the car at walking speed: the gear followed D, R and P (4, 2, 1), and the speed arrives in whole km/h. With the setting on, the iPhone asked for vehicle speed (id 4) and DiPlay sent `$PASCD` over both the Bluetooth and the Wi-Fi link. Whether the iPhone uses the speed in a tunnel is still to be tested. Gyro and accelerometer (`$PAGCD`, `$PAACD`) are not sent because their layout is not public. - -## Video while parked (optional, needs ADB) - -iOS 27 can play video on the CarPlay screen while the car is parked ("video in car"): the iPhone hands the head unit a media URL and drives playback, and the head unit plays it in its own player. With "Video while parked · needs ADB" turned on, DiPlay offers this and plays the video full screen over CarPlay; a tap shows **Back to CarPlay** and play/pause. The switch is off by default and reconnects CarPlay. - -Video is allowed only while the gear reads P. DiPlay reads the gearbox once a second through the adb shell (gearbox device 1011, `service call autoservice 5 i32 1011 i32 555745336` → 1 P, 2 R, 3 N, 4 D) and tells the iPhone with `setVideoPlaybackAllowed`. Leaving P closes the player and the iPhone goes on with audio only; so does a gear that cannot be read (no ADB access). The steering-wheel keys drive the car's player while it is open: play/pause toggles it and next/previous skip 10 s. They do not go to the iPhone, which ends the video session on a CarPlay play/pause. - -What the iPhone expects, as observed with iOS 27 and checked against Apple's CarPlay Simulator (Additional Tools for Xcode 27) and its AirPlay web app: - -- `/info` carries `videoPlaybackInfo`: `videoPlaybackAllowed`, `featuresEx` (the legacy feature bits plus bits 0 and 64, base64 of the little-endian bit set) and `playbackCapabilities`. SETUP enables `videoPlayback` when the iPhone proposes it; without `videoPlaybackInfo` the iPhone tears the session down. -- The iPhone opens a "CarPlayVideo Settings App" data stream (`BB493F61-…`), encrypted like the iAP tunnel; each `sync` package gets an empty `rply`. Playback runs over remote control sessions without a socket (`A6B27562-…` video setup, `E3DC3EA6-…` overlay UI, `controlType` 1), answered with a stream ID from 3 up. Tearing down one of them must not close the iAP tunnel (stream ID 1). -- Playback messages arrive as `POST /command` with `X-Apple-StreamID` and `{params: {data: bplist}}`: `insertPlayQueueItem`, `setRate`, `seek`, `playbackInfo`, `property`, `setProperty`, `stop`. DiPlay answers `playbackInfo`, `seek` and `property` the way Apple's web app does and sends `playbackState` when the car pauses or resumes. `requestUI` with `videoplayback:` asks the car to show its player. - -What plays: plain HTTPS media, as Safari sends it, worked in the car, including pause, seeking from the iPhone and the wheel keys. Apple TV sends HLS encrypted with `cbcs` (SAMPLE-AES) and keys for FairPlay, Widevine and PlayReady only; over AirPlay the iPhone brokers just the FairPlay key (`unhandledURL`, `streamingKey`), which needs a licensed FairPlay receiver, so Apple TV+ does not play here. When the car's player cannot play an item, DiPlay tells the iPhone as Apple's receiver does (`{type: error, error: {domain, code}, uuid}`), shows a short note and returns to CarPlay. Netflix does not support AirPlay. In testing YouTube played audio only. diff --git a/docs/PR3_REVIEW.md b/docs/PR3_REVIEW.md deleted file mode 100644 index 87890503f5..0000000000 --- a/docs/PR3_REVIEW.md +++ /dev/null @@ -1,20 +0,0 @@ -# Release review — 27 September 2026 - -# 0.2.0 — BYD navigation and connection improvements - -- Standalone windshield HUD arrows, distance and street names on the verified DiLink5.1 firmware; no ADB, root or computer helper. -- Retain contributor cluster/SOME-IP navigation, route parsing, BYD CarPlay icon and display-size presets. -- Fix Car hotspot startup by using scoped IPv6 when available and binding discovery/probing to the AP interface. Physically confirmed on the development car. -- Drain asynchronously decoded audio during packet gaps and rebuild the music buffer after starvation. Wi-Fi Direct is much better in the user retest; occasional audio cutouts remain for a later version. -- Preserve bounded music-buffer choices, USB read improvements and decoder recovery; fix USB request/close races and keep vendor output outside phone callbacks. -- Save audio/video/receive timing and discovery diagnostics without road names or protocol payloads. -- HUD cleanup on normal end/disconnect/off/stale input; interrupted sessions recover on the next app launch. Force-stop may leave guidance visible until reopening. -- Thanks to @romanchukg-cloud and @georgiyrr for PR #3 and vehicle testing. - -## Validation scope - -The user physically confirmed live standalone HUD guidance and street names in both apps. The latest DiPlay test also confirmed Car hotspot startup and substantially improved Wi-Fi Direct performance. Occasional audio cutouts remain; the user explicitly deferred them to another version and authorized pushing, merging and releasing these changes. The release packages now permit the verified standalone backend while retaining the exact firmware/stock-receiver guard. See [BYD navigation](BYD_NAVIGATION.md). - -Earlier local review blockers for the standalone HUD path are resolved by physical tests. No claim is made that every vehicle, map app, force-stop sequence or USB failure mode was physically tested. Release checks include unit tests, build/lint, package/signature inspection and public-source credential checks. Android signing secrets and accessory private assets remain outside the repository/source archives. - -Review corrections retain codec release/reconfigure during video recovery, synchronize USB request publication with close, interpret vendor status codes correctly, and separate vendor work from phone control callbacks. Runtime authentication assets follow the established explicit local release packaging. diff --git a/mobile/src/debug/AndroidManifest.xml b/mobile/src/debug/AndroidManifest.xml deleted file mode 100644 index bad1bcbc00..0000000000 --- a/mobile/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/mobile/src/debug/java/com/shilapi/xcertplay/hud/StandaloneHudDemoActivity.kt b/mobile/src/debug/java/com/shilapi/xcertplay/hud/StandaloneHudDemoActivity.kt deleted file mode 100644 index 5ee646ae4b..0000000000 --- a/mobile/src/debug/java/com/shilapi/xcertplay/hud/StandaloneHudDemoActivity.kt +++ /dev/null @@ -1,146 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.app.Activity -import android.content.ComponentName -import android.content.Intent -import android.content.pm.ApplicationInfo -import android.content.pm.PackageManager -import android.os.Build -import android.os.Bundle -import android.os.Handler -import android.os.Looper -import android.os.Process -import android.os.SystemClock -import android.util.Log -import android.widget.Button -import android.widget.LinearLayout -import android.widget.TextView -import java.security.MessageDigest - -/** Parked, finite probe of stock IPC. No shell, socket, SDK privilege or helper. */ -class StandaloneHudDemoActivity : Activity() { - private val handler = Handler(Looper.getMainLooper()) - private lateinit var status: TextView - private var showing = false - private var started = 0L - private var lastTurn = 0 - private var running = false - private val target = ComponentName("com.byd.clusterdebug", "com.byd.clusterdebug.BroadcastReceiverCAN") - private val tick = object : Runnable { - override fun run() { - if (!running) return - try { - val elapsed = SystemClock.elapsedRealtime() - started - if (elapsed >= 16_000) { clear("demo complete"); return } - val turn = if (elapsed < 8_000) 1 else 2 - val distance = if (turn == 1) 500 else 800 - val road = if (turn == 1) "Muscat Road" else "Sultan Qaboos Street" - transmit(BydStandalonePackets.guidance(if (turn == 1) 2 else 3, 0, distance, road)!!) - if (turn != lastTurn) Log.i(TAG, "APP_GUIDANCE uid=${Process.myUid()} turn=$turn distance=$distance") - lastTurn = turn - status.text = (if (turn == 1) "LEFT — 500 m" else "RIGHT — 800 m") + "\n" + road - handler.postDelayed(this, 1_000) - } catch (error: Exception) { - Log.e(TAG, "Demo failed", error) - clear("send failed") - } - } - } - - override fun onCreate(state: Bundle?) { - super.onCreate(state) - status = TextView(this).apply { textSize = 32f; text = "Standalone HUD test ready" } - setContentView(LinearLayout(this).apply { - orientation = LinearLayout.VERTICAL - setPadding(40, 40, 40, 40) - addView(status) - addView(TextView(this@StandaloneHudDemoActivity).apply { - text = "Parked test: Muscat Road / left 500 m, then Sultan Qaboos Street / right 800 m; 8 seconds each, then clear." - textSize = 22f - }) - addView(Button(this@StandaloneHudDemoActivity).apply { - text = "Start 16-second test" - setOnClickListener { startDemo() } - }) - addView(Button(this@StandaloneHudDemoActivity).apply { - text = "Clear HUD" - setOnClickListener { - try { validateTarget(); showing = true; clear("button") } - catch (error: Exception) { status.text = "Clear unavailable: ${error.message}" } - } - }) - }) - try { - validateTarget() - Log.i(TAG, "PREFLIGHT_OK uid=${Process.myUid()} stock receiver verified") - if (intent.getBooleanExtra("run", false) && state == null) handler.post { startDemo() } - } catch (error: Exception) { - status.text = "Test unavailable: ${error.message}" - Log.e(TAG, "Preflight failed", error) - } - } - - private fun validateTarget() { - check(packageName == "com.shihab.diplay.hudtest" && Process.myUid() >= 10000) - check(Build.FINGERPRINT == "BYD-AUTO/IVI/IVI:13/TP1A.220624.014/eng.build20260722.221155:user/release-keys") { - "This test is restricted to the inspected firmware" - } - val info = packageManager.getPackageInfo(target.packageName, PackageManager.GET_SIGNING_CERTIFICATES) - check(info.longVersionCode == 10601004L) { "Different stock receiver version" } - check(info.applicationInfo!!.flags and ApplicationInfo.FLAG_SYSTEM != 0) - val certs = info.signingInfo!!.apkContentsSigners - check(certs.size == 1 && MessageDigest.getInstance("SHA-256").digest(certs[0].toByteArray()) - .joinToString("") { "%02x".format(it.toInt() and 255) } == - "efe3ca8ada0d10c655c3df9910ad2ebc121a47d9a6358434eb24074309933efc") - val receiver = packageManager.getReceiverInfo(target, 0) - check(receiver.enabled && receiver.exported && receiver.permission.isNullOrEmpty()) - } - - private fun startDemo() { - if (running) return - try { - validateTarget() - - BydNavigationOutputs.setDiagnosticHold(true) - showing = true // Preserve cleanup even if a later operation fails. - transmit(StandaloneHudPackets.start()) - started = SystemClock.elapsedRealtime() - running = true - lastTurn = 0 - Log.i(TAG, "APP_START uid=${Process.myUid()} helper=none") - // Start and subsequent records target the same manifest receiver. - handler.postDelayed(tick, 250) - } catch (error: Exception) { - Log.e(TAG, "Standalone preflight/start failed", error) - status.text = "Test unavailable: ${error.message}" - clear("start failed") - } - } - - private fun transmit(packet: String) { - sendBroadcast(Intent("byd.hud.NAVIGATION_DEMO").setComponent(target) - .putExtra("normal", packet).addFlags(Intent.FLAG_RECEIVER_FOREGROUND)) - } - - private fun clear(reason: String) { - running = false - handler.removeCallbacksAndMessages(null) - if (showing) { - try { - transmit(StandaloneHudPackets.clear()) - // Broadcast delivery is not a hardware acknowledgement. - Log.i(TAG, "APP_CLEAR_SENT uid=${Process.myUid()} reason=$reason") - showing = false - status.text = "Clear sent — check windshield" - } catch (error: Exception) { - Log.e(TAG, "Clear failed; retry with Clear HUD", error) - status.text = "Clear failed — tap Clear HUD" - } - } - - } - - override fun onStop() { clear("activity stopped"); BydNavigationOutputs.setDiagnosticHold(false); super.onStop() } - override fun onDestroy() { clear("activity destroyed"); super.onDestroy() } - companion object { private const val TAG = "BYD-Standalone" } -} diff --git a/mobile/src/debug/java/com/shilapi/xcertplay/hud/StandaloneHudPackets.kt b/mobile/src/debug/java/com/shilapi/xcertplay/hud/StandaloneHudPackets.kt deleted file mode 100644 index 18e3c7ec0f..0000000000 --- a/mobile/src/debug/java/com/shilapi/xcertplay/hud/StandaloneHudPackets.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.shilapi.xcertplay.hud - -/** Fixed navigation-only vectors matching the inspected IVI HAL. Debug builds only. */ -internal object StandaloneHudPackets { - fun start(): String = "43,E0,00,3A,01,02" - fun clear(): String = "43,E0,00,3A,01,01" - fun guidance(turn: Int, distanceMeters: Int): String { - require(turn in setOf(1, 2, 11)) { "Demo permits only left, right and straight" } - require(distanceMeters in 0..9999) { "Invalid demo distance" } - return (record(0x43F01018, distanceMeters) + record(0x43F01010, turn) + - record(0x43F01030, turn)).joinToString(",") { "%02X".format(it.toInt() and 255) } - } - private fun record(feature: Int, value: Int): ByteArray = byteArrayOf( - (feature ushr 24).toByte(), (feature ushr 16).toByte(), - (feature ushr 8).toByte(), feature.toByte(), 4, - (value ushr 24).toByte(), (value ushr 16).toByte(), - (value ushr 8).toByte(), value.toByte(), - ) -} diff --git a/mobile/src/debug/java/com/shilapi/xcertplay/hud/StarterBridgeReceiver.kt b/mobile/src/debug/java/com/shilapi/xcertplay/hud/StarterBridgeReceiver.kt deleted file mode 100644 index 4e716ee9aa..0000000000 --- a/mobile/src/debug/java/com/shilapi/xcertplay/hud/StarterBridgeReceiver.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent - -/** Only the shell (DUMP permission) can provision this temporary test bridge. */ -class StarterBridgeReceiver : BroadcastReceiver() { - override fun onReceive(context: Context, intent: Intent) { - when (intent.action) { - "byd.hud.STARTER_CONFIG" -> { - BydStarterBridge.configure(context, intent.getStringExtra("token") ?: return) - resultData = "Starter configured" - } - "byd.hud.STARTER_DEMO" -> BydStarterBridge.demonstrate(context) - } - } -} diff --git a/shared/BYD_HUD_ICONS_NOTICE.md b/shared/BYD_HUD_ICONS_NOTICE.md deleted file mode 100644 index c448a16392..0000000000 --- a/shared/BYD_HUD_ICONS_NOTICE.md +++ /dev/null @@ -1,5 +0,0 @@ -BYD HUD maneuver icons were imported from AndyShaman/BYDMate, app/src/main/assets/navi/. -Required Notice: Copyright AndyShaman (https://github.com/AndyShaman/BYDMate) -PolyForm Noncommercial License 1.0.0: https://polyformproject.org/licenses/noncommercial/1.0.0/ -See LICENSE-BYDMate.txt. These assets are not relicensed under the application's code license. -Upstream describes these as donor assets; original provenance is not independently established. diff --git a/shared/src/main/assets/byd-hud-icons/0x0.png b/shared/src/main/assets/byd-hud-icons/0x0.png deleted file mode 100644 index b97e9f34b842e04b42a0daf2769add52bc116c64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^YCx>X!3HEFv!knll&q(VV@SoVw+9UwfxJTtzWV2K e`Y!-7f#4jQL?Z)Zve6wL5YN-q&t;ucLK6Vqm=i7l diff --git a/shared/src/main/assets/byd-hud-icons/0x1.png b/shared/src/main/assets/byd-hud-icons/0x1.png deleted file mode 100644 index e1d280ebb7699dd4d558c58b9f69d46afe490dbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1271 zcmVmuJUB@3=fu=#!v547Fbi2Lh0eny3f)5KeM1|0kjTEE|e;iyC ztZ1=8+*DzaRx5i10go3aX&;o!04_&bhAG5;>%^k;8N7HB zdk>vC^S+@h{c&(`Q1|>=j}=96-T>bcxERk_T7gmuT_VTw;UNCV6gj^-? z#e;Kmr&|dtisBN1uK}Dzpr8m%>>KyLo)#;@O`MTQFkU2ar7f{n2+R|DgbZ1Gl2%Nn zkxc4Wp+gKQ<8>;HP~K`K?C0g>w*kBk$i5$Si7bg_8LkkTMA9_SinGr^dC&KqYbDIy zWO=3k35oLnzDvd~M_3AB8A78dnB3^KwEVHV?_AqZy0+5q4@kZM;5|*NLgKTH%}v?d z+LrC{ShmMIva_=*ySu;2-fwr@AApAmd5Ofb2_uibgtE(YVPS!_tv?w2HMl)|#{jPZ z*h_wjNtSpzWqqGL)zagS@9f{bx4(b)D*{)OPZ{%Gv$A?(VVRJybPQKlZy4Y?65nWQ z1bUA>zHqwC?x8O%J$euZ_=zd4NEU%s!j#vuWcthM+K7P7^6wJD;H^^xx>Z_faC+&X z{LRd3r8irKvb=G6P$0K98vQdGtzRSXDuC^9(`P7o{gvvmxL8ZMoolSEO`U+Ibm1mIg;upP-P|5;S#ktEPt}7BT@WLw zP*l}NOIm1L#Hp@RVX;3(P4n@1#}M*^7m(9RgoF1|nyJugO)Sz9Rbk2ub$luW!)-${ z^@HXNvoc$HCMwhVI-a5ifYOfw$-Zz@QcYuWMO`QpfvI)8RO@p@tUScqNUSClfP<-X-axT zHcZ~+)01hsE;D%a&y{m`|8|iIS8WsuQ3!vC>B>G3xY?(Tb66 zpG>vkk2Ncyrn*7gmb6&$QKD5beC9)`5St>Zme?#WMXJfv(GG*l*W7lrYK8r$$u#s) zBqP;ic-`^a8A{qL(HciPi3570qrZ3z_5}W0vh%_YAGRKvDZD^t1{P&+sCA=w2 hA)IEYlXkxiz`xCOcM5{9HKPCk002ovPDHLkV1j~_W@`Wd diff --git a/shared/src/main/assets/byd-hud-icons/0x10.png b/shared/src/main/assets/byd-hud-icons/0x10.png deleted file mode 100644 index 4859cba1d85821eeb961428fd666b4196cd53d8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1410 zcmV-|1%3L7P)r9EZ$2Qe%8L)0XbegW zK_i-AAVh&gBT)$^1~5Un7}}u)xwO@$rKP2v&R%Apv-ixI=^1RN_+ZjMY0u>BefIv( zzt;ZOI!s{-Q<%d49HOc>^9@o!1F#gB2iyt-fB^=8F5oHmb7Rpk+<&_rPs{LZO)Q;E$1o&au{#2SOZexN5#ESSWCmdx5olB&3l zZ2aukl36O^MgkO}A)TJ1$kyz+_D#`PfI;|leWnFiSYfljfU_=CL%>WI>I^Wq!ZVkE zuW^diBu;Up(&_X)3VV&xh9xC}YDlW70;v(;Fwk0d|0>W4{07)(9|ES8%~|Ni!e>iD zX%(>< zQU2YLu;69FITJ$GJy(u!{V2yo$Ye4r6~0nfWG%$1h#;MViczKQs;=%H z(jDtFH9rFvt0b26T$m<7Q*-k+;A4MEOiZnKI9;weveCVxU8cp=yrC+I4JFjfkcZ8& zgNh7<8@nn{Lc$e>kZd@ocz*a+(fGVc=_^`O~#J7a2luB=^nFcAjgU-iQScOuQMcub9-BcvhD5pj*gDa zs`8Aj`lgs?4Jx7KZ8z?uIwct#W$w0<`Imw81WBb6tiqz55`)#q&#cjQoWHPJ;Xze7 z=M-wN!<}8-?W%m^bIq8D;EBJrW&0_!*|kCAft|NHVP2m%-N36=P);L4WiaZ zQsJic^$SvY>Nxc3 zG8vv|+anu3KN%4U>tM=t7!d)rh1<12;nj`Jx~(oHa3H7hXxm4v+mE2-jb{ zQ{G?K5cX%4a1Gewy4k3MRq@3+D4446$J7;W-wt`jdVBlwqbg6Q#D=-(X;5sNya(o# z8M|8bxf_tOWDa;z9$}7oC89hEVkF#sVk)`~ulDy3j^tT8Jtc3uN>;ECPt=p_ACdYB zq-=+~H>q6;?E>%izDso^e8Ly+`;!}loA+P4mj7f;>dk32ET2^?`&Aev7EW)%37<~ zFYVgvaeeScifK_L*9aEWDp#?fCdC(sl>0H$}uTP zcwz+bin-9m)r{Ur#w@sRt>hH0N5(8kVH_8t9HaEqMfFo+A16*tPhN@#BnbthCNaOp zg&HkbMOnC{s8-<`S1low9vbWCszngVEo1FLDX|A(Y<_74Vv|*C3KItK58#TQR7g;T QTmS$707*qoM6N<$g8uriR{#J2 diff --git a/shared/src/main/assets/byd-hud-icons/0x11.png b/shared/src/main/assets/byd-hud-icons/0x11.png deleted file mode 100644 index 64fa34480d051941a8ad515009c12270614a91ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1782 zcmVluA$|8jT7X5)({_2$2sz^hXo@ z05mElf`M2t5Rjyx7!jxtP+KU{3T=@Br7zn1oU_fDJC8Hdxfg#;dXk&Db7tn8b=F>c zpLH_68=kHpLVZ;2y9*#&8#f$PVme98D7wz7E@9>-K8@$0D35Z>yd!g z7!A?B(gvCJPi{mwgt-Al?m(-VSzyh>0{&z@A+-p}th-PB*q zFk;MX^fTM<1QI&R<7qDMOzIBv)VIa0aa>od$L1sc>KYU(@5= zlk7=G|0}S^swx+@^yqc*438G(tU{qlWmP_B1+=^lWH6@TCjU5Z@`!orXUuRh$L`_s z16wd_QdMi8zB9uVbp~N`@WE`^AXx#*Kw2Pnu1kD3|H1O9Fxio8m6Vo+n6v*awr(5B zRdc6ATKmMV3?mA+mJB&WgLL%n0(vnTqOr`lGZLhUWd*dlAVl@*;1+W!9YyE5_}g`J z%EJm<+lxy|MzfFpyv-K>g&zIAc!tLqtFS;ZBc$QR9bs+diN=;6j0}^jHMB+DAZilO zKAk*nR83Ekx3NqTE6f0TQ#_%rP2T{b4Mrvk$n^WIsJNu2x3{m()>KmF{VAd9Ob*kXyuj%qXrwT)~+7%`S;yTJsToWtJ z&WoI#Lu24W2JMIzMx!}_^`&@`m#v~O)g5nWu45wju?3SYR*LCgZ5>}m0%)+%qa#X_{zLg}zYgUW-OL7*^5TL5=S=t*Ka z1I-Lt&-O=TX>kfO>Yq9&77YTH)G-{MOc9_1Oyq1&W-+B4Y+3gS9eXXdO=^HPG8T=U|S0&7`tNovt?fHE{#x=I-V*Kl`XiR{|d&mJ@e@ptO6Sj z(8ZK4s-S48Gr=oCbj-c=km(K_w!G{CsCau?Xv^U?F+Q&IF!`)2!B>y|!)FL@*aRsZsB_AL&(K@pj&G=(yd;djFU?DBJ_IwNwSTa>Fz-v-pdrM2Cisy5^C zgbm7$N^jtHm^1Ui_l30E6=K zrOT~)QpfWQocB7@+ccSd^#FEP*LHRKWinLjWJM(hV?oykW-)DRYvU0k?>oo9M3t?S zz<@aqnb$s<3;S`&6pC>+Z9vCG1wH?8?|vO>zvA#%g1>D+cm z*%HdBC)Y7wWy=Xq4z?_SEZ^`?0y`_&!nY^h=XkF{~A$Myem{afYXATM07*qoM6N<$f>T>wpa1{> diff --git a/shared/src/main/assets/byd-hud-icons/0x12.png b/shared/src/main/assets/byd-hud-icons/0x12.png deleted file mode 100644 index ae7302173296fc15c54df5552083efd5039b45dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1389 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 diff --git a/shared/src/main/assets/byd-hud-icons/0x15.png b/shared/src/main/assets/byd-hud-icons/0x15.png deleted file mode 100644 index e1dbbaf153c2d9bb132d8b9102104a40d7875aad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1698 zcmV;T23`4yP)+1(RK?8aJrwY$w07 zz12Lq<+M?s&scebO{}k58M`gMO`52bgCPKt)dyL?3Up_ZYk$8Ye%W}^n0rUSCe_!i zyc`$r2|%}*V1*D6@CJ5NQegx<1!YT{C^_2BpKm;AKAjI(sHX>08tSIE-4^StPmT(X zWY(Y|4IM=x?U+uuXfVPllLmLDcnmY5E--tO5R8Ij?V@R0D~+EwOl#>g*p!C4XnQv| zaz-f&3QDMo!qhS_N^6Fc>N__5_NM?5gcP3$57!Ki5Ye)$30~c8pi;nrBM1Q)K))kb zxoO@oOt6K|*>Z+5Wnyi@s((Q8%eEd2yZ9} z)9|t|?Q;}!7X=8H;{51GC(MPtDV7B`W88>>j-*%$TOHN#6;ZwM(5Z7vHvM|mfMR%% zX2B`hXZ5)7%^NA6S{k7Pj_R&@44mo2irze)^`P6}=Tidx+(B)_7lpN!+5y^fsZ3BM z=X*^4*KL>_F&TJ918%W0Q3-f8j)%6N6%BcVbs2208o%Kyqx44OfmVaznP2V(q^QNg zmjQV9v2c4?ggy|?`|R{00BY$#kLe=|EMa1F(C}fMuD>**V5gO(EfCpv@>d3mEc54T zooU_x23tP!EYOj}*u24#CRZb1_^3|Ji?+3}wO{56rE)Jv+c-HKE70+mw?eIJR~m!! z1`|vL!3-bPDCP?x{Dx<86wVDMo35eFRma5R-!eQNzC_gwt(!UJ?9Z?L^bT9f??wNKUb z;G~a>UA$;?P1WWFsv;a(RZmSlK_O>7Muhz* z&L<|0xNqTwTjKjn{!z`krQirKR|aO%R|LB-lCRV{ZQyMOqKcoskn0J#E3-AM9yHPr+SuYr=|DlmU> zEuHQSDkqql;SZhu`~AuydJPQIt>F~|$4wgG{OnjeS9GN@P^}_@hL`2{PqCi2q29q* z^T9Q@UR+mItUV`>i>`9Y5zT1_FN+6#2a+6y7l6jV=9%B|zaB_(hEm;T-@N4~I}=(IhU+7npTs$``Y^s3T~I+8_E)B>Ed>qcX7NvURnzObPR1yiAI z_%gvH!xv(pgsqtt!vd27^v@qGQ$-+qlMWoiRJdDRalxPtIjP;VOL~h?c7S@g-{Yzb zZqlmZRgXDUty|sRp_b#o>-U(uVJk4gx9SvQ=l4IFyjt#6Nm`(Wr$7k3V;H$=-8m@q sq?n_WsumPac?GT)La%?f{Ra)eKl6y^gS8{^2><{907*qoM6N<$f)qtB&j0`b diff --git a/shared/src/main/assets/byd-hud-icons/0x16.png b/shared/src/main/assets/byd-hud-icons/0x16.png deleted file mode 100644 index 679a1b16a28475350d71e8cefa544ff29280c9bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1721 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 diff --git a/shared/src/main/assets/byd-hud-icons/0x1a.png b/shared/src/main/assets/byd-hud-icons/0x1a.png deleted file mode 100644 index 7f7a2797158c709522a8f6ebf6485479925a5626..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2110 zcmV-E2*LM>P)#J4?oOT#DdoJk=94pajId_^kl$6Ywbr zz4~S~02O*vZ_5BK6YzEcp8&8$!20H1buIM6w~0Lc@1mHgt43Y4nlbdMao$i=4Jh*- z$8j(2^}Y+>6#;jPUazXsE+&VGn%D01uA@;rwbW39_F}a}8z8Ru{*; z)e;VYcvlP9-Xsc;zlV5Kz-t0hfY%AQ3BauY76|y7ocUC<@=*adLpVG?2sTa^Ssh?o?xKTWdfhM9&T4`stn5JhpG7l|CU76s9pO7P~g z9=`$L{&{|I*Gy5SEnCg{)mE;U*Q3i;FOF9Mct+?zfxHZ18-VwwY5LPNb3vimK061I zW_hAcdzP)+9p=ny6MzHrd_R&a4@YCaTrsb=+Mw>maV&a|3%K6l@fCr$Bx$-Q$x>Nu zIW%{yHJ?dGGo6k;R<^9LVprfMkq3I7AHmU>1@>kDM^^NDI|SSZV67b>;BO*7l*}f_ zJN>odZd<)$oGn8xTML5F$mYXpW#Qa6;D7^>=S6lNJL5@#BLIH5#PjbDS~22v0Hf(_ z`YPB|>Qq&43tj!SWBN2xv$ehi7g=UYx462SHwiot(hptn|HGmW0B^BJWCC*Xxscux z^@89`GMm>(>IwI5xvBa(e(2&72%AB?ymxfz%jR!e4xH-jp;^2n?`YYqy1QSS%}$tY zodmEWXy`v#|GhR-BcFhT4{R)jjfS}!dc8ji{K2^-{e@*~eComkfSn)~o0-R_E}Rsw zCd+0nS&=&idWZciAuoWSFw9krzz=%hOG&9|H4wY4Y)!S>`?5KT1dIsylf=W8{_&}c zs|4(V@GOL-0PY02lH@ka790JI1mO)LZxQepkvkG_O9r3QPK~5 zfYYi>xLRwyV<8u`TvM&u{LbCV(?Ye~_RKO{{dE8v&KXd2I;icy?i!ym z4WNU7E(7?PtsebmI%p}!Z6ipy-X zqb~uQ_l_>TRGVuZW7zs!cTm@?@O*6*wT40ZK<9~pT}+ji;jbmR^~{yovzDDXW;zf^ z#-}ct&ipK-2lkCEdlm!cIr#3dJ-<7<4L}u@h0xJhbJsZj@6KLHias+{znQk}UxV5P zXqSLJ`^J_{wBsDMN{210A=O2$=*$_f)eYAbU9E8UBS+eh)*i+UJA>)L3fPYq8^Ice z77KX5=^e}z`NXhfDt3vLUT{Lf%Ep9$TbB4h0~k+j3I}43tc3dPqHhZv5pNc-xDK)0 zWq;eKePUQLtvl6#^50p3>gIbvt#lmmw``G!qIg3XMGr+`e3#Ijjdaq3sXWi7C-Q8D zX?BH)dF8X5%~Q@4Ij@#XyM=j=)mGIA;uEdbTwrY2iKF-pAf5uv5BXRaMIRZ=S{;K| zu>^Gtt5bJ-M$+?_OSs3Gs3N zhCebL>9F;ENhLZ@>wwwP(=a+2v*^I#H$!KxuS{_gWAUCf*^dOlT1%EIo>3N@0H*mdVa7L zbJ;>EJtkl!z||%A&2IPR6yVr}*k`6$o<9t5tH8v0&=>*u74szR`{C1m5Z;@Ui(1Xp zAl3>n;C4rzx4`a1caq?=N}OoL?yxndE8Roc-GVgB9x)Fl0{%Q;4}SgN%5N0H_EzMb znfemGB=T6~`J?WZ$^|rpt^Tca*cvp`EH91$TnF%r0RPzu-|L%Hj+vHS?70!(ROopR zJND2I$YDzkL6$$KqPb?8<$0dv`9lESBEdXr{ahv{30(&cF;ju(OYmL+U+yblz)aos z>=oD>mZd5Y44A3?o)txA{vlG*J8Y7q?+43$^6?UUpUYPD)DG+hxH~J$X=@ucowWLL zI?-hdZR{D6Ok3uh>~3>>qcgpF diff --git a/shared/src/main/assets/byd-hud-icons/0x1b.png b/shared/src/main/assets/byd-hud-icons/0x1b.png deleted file mode 100644 index 97bfec4020fb4c6dc0081a17b996bd041ea2dbf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2113 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 IM6N<$f~Ae<#Q*>R diff --git a/shared/src/main/assets/byd-hud-icons/0x1d.png b/shared/src/main/assets/byd-hud-icons/0x1d.png deleted file mode 100644 index e8650fa80748d2f74fc897eaf7a342308311e409..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2088 zcmV+@2-o+CP)IA@dtB_mR~IE{0RNKxLGGD30C$ z;4T55fDo4tiwP*KNAWcVa7@6P1>6ka76F^8XT@0Qhi?>l;@??zq4XN1)2imsE9Q9v zt*VSN-%%9BQ5=68z;gmVEqZa`rQJ*p5+%GfIv_W)La0H8I{@w<4#E}1ToPm(O)~}} zX1$A|c%6jDLAQn zvwW$ZP&quY*q0{V#R{1UArE11Kc;{2OqtVvowBjfl2k@lO7zOe?gj)f;GfmSUrd`)4 zRN=F05NWrUsNtSP>jnoo^VteuX2|zDa_Ql4>}P9-;&sOAIEo_CdrZI;4vxgD z4<+4HmRk2Rju(TDOH6&C0U+$wS=_WTYUj#v)N2?G8m z^8LwDa;)KBP3}6?8^l>73Ckpu47j`E^rvYcSb$`?w}?k zUIMT!T}n@bm8XtZWmxF)ub$K5Oo`T}99(6Q&0XipY~CtxCZr#_x-YP9{se(h_IE_*J7Gx!&rLO}*)fu>&8UIngpMCvU9LEV8@J%_SvErB6 z>4~veB=x9N+}$(z_>1EZ9t1Hvy>0b57Q8Bp|6-OsBYMx+QkCa<=6S)>0I#dUR61Cp z>}KT&p$NCFStit91+e*)F^Uf1T``r$D__=|Ye0Jd%umjp9qlVaP1R}MKV}m_!WFiY zu`*K__WaUP7r?(N$W95o;bfBBy^to^e-l#y2MoWaCswbYo){Y!up824Aa7E|Pu4ou z6zUQco++iG@Czk+Z4q@T zQjHZ&?KTD~D>{KBaz&$3zrzge^-TdRzO|R8*$Z8

eczD0E?0f>;FcPI-!&OoCxWF<+D2L2Fr7 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 diff --git a/shared/src/main/assets/byd-hud-icons/0x22.png b/shared/src/main/assets/byd-hud-icons/0x22.png deleted file mode 100644 index 9cf6033cafab2ee1848f7ce44f0d365e4f709e52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2086 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 diff --git a/shared/src/main/assets/byd-hud-icons/0x24.png b/shared/src/main/assets/byd-hud-icons/0x24.png deleted file mode 100644 index bb338da995faa6b183f045b2141c59d832d390c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2101 zcmV-52+H?~P) zwj`ur@Gk?tAn*{#nK()RVzT?0#k7A-8PonR|7_2_H;!h{i5B814**PbMlO;t`$n&K z!d+`NTNeZP4TuKpI^_vuputeUg~-qA1?&vN=ukj@El$#(NRAG`eU^Ks_xxZesshw_ zr!xWIX%L%ywg9db&`_R1@&Eh@Im`J8mMm=mcpz#t_JvX7-5En7$eb;d>nk`z8M6ve`}Q7FWbAYkHJgFJ zt3-Ytz*dXEf)w~p2tNzL@TSCQU&e9~yR7lBQjWLVO9AW$@P4No0V~hzbXK|`DsJud z;|x@uc~Azo<%yHjBuVS*dbntTv~^AX+c4AzER`p}@vFoe>L44A!gU z)hU&m9raFwuI#FbzXI>R$8qvI0hbGSvPzB}0Y41FaG3?y41)6oJT(v4M5k>*Jtg2O zhsOmkTKl^4VXBLph2R}q_3!!h#F#md+XVa=h4@8Y0AOc32)Bd$qrlZQU=y8oQ{Xg! z59T-dbuUxD_PlmGDm$%Y#TTs;xzA>exmbV&_p*x~BDh1qV*;#%ULRnL-v)4l^DZBc zDa{W{Y&o1gSQhqdTaE8;TZN!Cx-4uj+a9);Trz$01(?41{5(iecHbUa48|kzrxA&U zWfzsj7zD35U|Cnb-tFE7;I{G3$l{aIM-p&4WagfTtdrZs%I@T^oZ#&-weRTt0PZSk zjE~RE9wxZ47tbAY;1)#g3S5rx-8guZGf@dIN#`YPjzF=q@i7&Ne-` z#A4}a7z8&$yxPB70<$;udi|u?Z2wclszO_rmel!N-X90-)-t=I%p{)x|4{H9_Y-(~s>W%$H2%TcyYsHyW1;_#T80xapy|{#Fo# zw+p;Nz!s5Xjv@B|5nmN}j|$_=J+j`FIj|wqgBh>~_kD4r*|tFqc()--8!?4Fq~rv| zN6K>7e?B-O2HPd=&!;NZI&sJgZ`};5!)Y(Cz>-E|g%O?+@jjGVS=b(`H$Zj?J}B`% zL9=CJcx-7{S1vR?4BEr-Bsn5lr{)tTvmbvfF6=>Y#yThQkbut$m@v}a#*XI|*m*3? z16EEC9$Ok>rWV}EH2K?!H2s)JtFe8hM|t)T0GnY=Q@TdLLlFL3c6>RhRQ52)7JMHY zHa#q45B9^UBsqL4HIq{Ij_`B;8m-yUiW(>3N`*O)5=P8xDq%^v*e fVF7!n9RU6ZVg@DspK13600000NkvXXu0mjf@cZx# diff --git a/shared/src/main/assets/byd-hud-icons/0x25.png b/shared/src/main/assets/byd-hud-icons/0x25.png deleted file mode 100644 index a85994d4ac48e18dcfd1609c2261957074437b2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2127 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 diff --git a/shared/src/main/assets/byd-hud-icons/0x27.png b/shared/src/main/assets/byd-hud-icons/0x27.png deleted file mode 100644 index b4eb01ac5afaddc053e81a8ba808938430b9e759..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2103 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 diff --git a/shared/src/main/assets/byd-hud-icons/0x29.png b/shared/src/main/assets/byd-hud-icons/0x29.png deleted file mode 100644 index 5589efc3ac12f3b31d9f0706c487bbb100801736..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2010 zcmV<02POE4P)RO2gHIaWX`WGe!p^1MG zCHR5FCM9W!CS@C}5V3|;BQXUMM)lJrr@(*gMJ@_h#Vn~|srP?Md` z6oAJ-Yzx@}c!_|9@(~o*^B!`R^Ajvt+5+&AxY0Nm#f>*-42d9fwopD_!5PVz>u9Ro zUMui12^WgE2Ec)=p?p|B2Ju^vmr4AK$Rh$?0{A+B@q(?Z1We?t6pV`3g1jP%8#|ID z{e>Gu-X=@gEDwxype96f7{G>{c7CuZQ`SIl&_5+$Q?uD__WS+5d&d?d_PU9iO(XD1 zk+%Za;Se~G0^b1PXC{hnOso!OEEjE;H6B&U$#(lZ0EYm)+v`Ta`U^Up^}Z1mulD+b z3{*aHQ#S6(Ge}aKB1+cqqq8X4+3cRQWY^u|43fvFi z{rO8_-OHh0eL=e&mou$oB^0d}dB|psxq$!&?pfb@1oIgIKM>#~^uiEh{0@L?y?2Fp zY-xTt*OkND0}Fr{!H$A^C@jI-LyKlI7JnL(XgGFJS&W5w-UG{K--s#>nc{2eZ+7xck!zp+^V?YR)%jlnOJhI$(+Bg z%Yu#PhZxI^^Tlp=p$l$K0CXjs0_^L+CJ}cCn3wp0QuKL=HbU5%oxoO*TbbL#?WK2t zI6X-ICSYGC_&_FBAzRt=b;hb0mZ82ven}F3eX`#>3i9Y1o1MEv?poV!#mD=DgfMtu z`utnN_dh;6e?7?qAU=iA*GRmUrVn1W%;c|BY#~?=7p;A*o7zu+{H(xU=z*5}XAM}u)k2MM zZR`z_G-T^cHy8PRQ$=oNpe_{oB(msZT(|GAfJ?%7^doV=n5vTW2ZIHG_Xi_%f$@ue z94n=VmF%H(AY+^^?jhJIN=kv}h3!@v3m4S9YbJ%w)y~Xv97{$PnaQKUU-2|LHM@FeT7!$K|bQWsRERj>YOOPNWfu%_epSN z`Fm&&G*KHg_lo>hS^j)LpR>@@g)J=IR|fV_8si{I-572XcrnQJgCu=!*o#)j&3IMZ z_>#zDF7_0I=q_4&A{)Pnnuca4#HRt=GGq_C1>NrlIBYkuXACt#=P{%|a7mcY*lKrE zihOmWajAgsLwHYa$mRW)jfrj+c)5VrfJHE+y;jYtnRnEK)G z)s1G`HEO}zEZyG$gn)|NG#CXl5iG%2O3@@lKRlS>7J19U!{|?~!7kYwmYS&pw~!`(J(Z>(6X`T|u=J?F9t^M@&NQX> z3Ah)+f65tOCY8z_hS@?bU5rW(%h-eaaym(lolfnvlB zNMOsShq^t4n+u;F7E}AgqP16BVH?OJ1qE9|mTT!@$R0+qRRQ}S|2@>!z+iI`PMEH> shr8BZE^ykCYijloriW$hp>_cHFFLFKv(y|0J^%m!07*qoM6N<$f@tT>7XSbN diff --git a/shared/src/main/assets/byd-hud-icons/0x2a.png b/shared/src/main/assets/byd-hud-icons/0x2a.png deleted file mode 100644 index 5b3bf7e09003f2bfe129484f81e594ca7741e537..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2081 zcmV++2;TRJP)qD zw~I)}WFedRfsq!}nCR^XusWrkAJ4*+4AALyPYYOEt2JufZntaum~6$lZh~6P6L_u2 ztpGM#1Qw*gcR~1#=lfeCqrC~s+1N#l2ZeIH(O3*%AAk?$x)HGQl4f&dK8Uieoo+7y zm9E??2DjnqMX`yZ_zzJOZxOjx;2Vh&n^QS;QBk-~cu!&})Ch!pe zA5A;CaW9sB{Uwb?P-I%ciYwY&a)G*UjlX}f_G$M-p`jW_MzHs&V)?3VRnx^})5 z$7uJ3vWRipVar~%^Vvg&eh+|?kX8^_4)6e^-M7!oE+14q(Ak1I27eWBm4F$mFLA!T zk~~?l2XfrChdg|FqD;=5*Z^p;pgq&AB}b=QOHKmXo^{_)Y+)#?hdz5iPdXv;W{6*L zp?Kv)K&R7<03KCdyopy9&x`VI&}SeUMy{A{Ey-Cc!tRvb={%mdp5%`SwsPNe zlPW=|Vb)2tyIG;Tf4&-@O7Y`6@W+A1(#qPMJ#@via z!}eW}XPm>u{Xtk;eIeDuP!PVm=?AL^*@F_@;_Cu7IpI49B#=^eTwfawLkmd@T2~5>Ohd1%7aufc*j=l3>H~Z`U5^`3=x}P~;Da@TUv3Cpw_OMOR z!}$Vbu_;hP8$r)PVOG+Mfe5yU6SzCMO_1RD`?w^TBb^ zo07CIt*Thb!~q9hx4v>IEo&-!dr=rJHNx*id;o=3=C_CP1jshQ2PEDvXtqcUhb;}t z$_qVQoQk63qIGKSGKu}TWpQQ?LT;>c5)TUaqJRk_-D7NdUV=S`rE`GIS3L}}hcj{X z&(m>yt4OP{y&6zGc)%uD)0D0g@F0Z$6d9k-<=8_%Tc}hQ1FDDl?7@CG8%0OX#-=4D zXN2FnhYOD!Ge(gcGO+|d$Q}j)o4eyPvK^B@(hPF@UmH(`zt5z200W;ARmUfMB)2QIQP^ z2^hR;z~=-W207D+2jG6ojp>aaRHDj3jkQ|i z03HRg*=GyjS^+g>5#;x?5i*vu6D(NT2=L*kRyz+E@K%pAxY1^fzm@r!&9fSt`CoC5i*z)MTO##_z0zy|<) zBx~g7y$Jo4UYi(+x)KzHv2v{;8D+o5NFKW7*NDzIcCFTeNlW_HpdpK30HR6xCKQ zs@3)nMbR;lF9zhTWVtT$0bU+pEECSx+U+xKa6=5BE#Wj^-Uil-xI@6K#E%w5pZ7R9 zbK(eu`vE)#a+u`4$(a+o;HCO(FaC#sJ!!#vWn$#Bl>)5*mUjZ+D!C;|_```#=jk^( zoo`6N#Ug*PqS=U?JWS5aZUVFx(9fnPMy94eIkE}B;~+jWIWs$4=o*Q)l4P&I^#Y%_ z?Tz{?j4h8mkO5$M!RN=?{>yyA$-}X3=j^dg=ljPx-B{i-lt;hci|?`g;X37`Ip*e) z2Zxz__ zHPDd%cD+PJy<{Vd7Sk~+gHyhH@Y3yGJ3`r38>QeMQ#les*E+1MQO<-yWEFi|i)F>(~Zl)FDUGizt$S^_7}BcrmC4(sKPyv{4&Tp2)gyL3-C5$Gc5Z?FaXRIo~Kg~ zekgKJUMsU8A9i}y2b861aTr}H;E=$3CD^q5)0YPZVG|7Q5&456{aHX?G|&sVEX?0m zy3K_zroA|^G2AThGLS2Kaq`lj7A=YD(W0pKRgupC*pvs+o-^in8h;Sh0|t{2UjT61 zfIRFJbe{{5D5o-VjG|@Jaz& zMUFa#+yElJE%2Mlg)`GglteoNR^c9uH}(DNCAE6fc51-e4ejTETrP5XNXT)B_ZI0c ze?B-a22+v_X0D2*nOL#mt#%K^{oExit<_c-;c*e~M^P&a%R_$$$Tq>dCEh7$wwM?m zTdJCs=exN$701U#tJK_UQu*<1aV`&n6V^G2hXs5|z_^iaH`bo_!Oml89bMxp|l2in+t!!w2e8`Hs(r!6NVfv$%F467LbS10pP#z W{3bPJWl9|Y0000g&3Dz`7B&do0!RQ~YF$(>w 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 KMNUMnLSTYa-=Z}D diff --git a/shared/src/main/assets/byd-hud-icons/0x2e.png b/shared/src/main/assets/byd-hud-icons/0x2e.png deleted file mode 100644 index f3f7277298bdcd6768f26d2f2a5d5f469a402b85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1502 zcmV<41tI#0P)7la6vzMnGnJ20AU2FaQiui+ckZ2;`=))buNpT@(!MvJ_dox0&hMW4 zaCf`A{l^>2kALy-4{rikUpJ(Z00ruAA(27sr@|h;t|Dg?a$3P}l*u*q=jL{7S=4v4Hh11zvqMa5P7$pa4*n`-wE=x z0_*HCwj3^OaVX>MDu7o>xu9TAZkHXDPK<)g6kG&yEx_GM*`S(Vr+|vAQsoyad<0MShs9$!6*LnO0J%>upAGnrHu6zU#e>FSVHpANy;k6uJNK1>`$2wLPL6Ih&r7F%`F!u- z*psssRs+*S!F#K7V>APlfLr9D+z)a~o}>3E%y(O%eM)Yey<>=bEwqAZx!1DSr;Xv% z&67BgPM%wmi+L-Z8e6Rt(KaC~@owx&ZLihbnTBgXxdmG^a!zS;Pp@=8IHH!;yrYz{ z4jd~jTqBsq3)ecgjLVmM*8ZWuE;W_2Xw4n7gj+T>)^l~?s$r!(XXep%gf#(nT9_7i zsD)|TIQIl70}3uv$f%M_)0?B+DqR-=T2t5W)&J$5b0Ag^akP9NX7_(p4C z)4??EwVGjS{%uxpo7vCEO;)gookcR+5cndI{C5o5pp?h@hi+|CB>ez>YZ=ONsHW+) zDuv>v<3P^M;03Kzl*g)W`C2FrCd_;|A3@c8 z@8HxOiX^+zw0M<^bFMsnMF(V|7`&N0bJPt!Wx#>?*IS*07*qoM6N<$ Ef@m?#BLDyZ diff --git a/shared/src/main/assets/byd-hud-icons/0x2f.png b/shared/src/main/assets/byd-hud-icons/0x2f.png deleted file mode 100644 index 17f10e356a8c1440ec960dd9dab731cda89f2464..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1340 zcmV-C1;hG@P))sVbm=E&STKfbv?^6p!kA>_`zcYd5X-|`EFl=>bgT0C$aw=fP__d zuj?onv=z&iSa8+Ajb-c=0vC&FF_~s7fTeop00sb22A`6c_MqVbv6is0z%Ko=y83k( z#DmH2GZzX$uiKxxIvDI0;mI5zfw5tdEblwNu<$RTLM?v0qEET(8A=mslI{}OpB4EWFSt59Q-(Oz7hrqW49yY{{ z1TsV1N#L{2vEwhqFuO@bQjH?Ar6th{n9(<)*~OCOs&KuV`^qw0t@uI)#Tf{7<|^-1Dfq&2A+}V zRRce!AvS~f8#Gqgl`-C_J$S7E_>GhuLmZ;A2c-7!6C9Jsf{tD?kkceC5%>gdSBIV1 z23W!vl;?=x@|7!Fy>9<40;fE1qaB_2Vtsw%2Wf6I>k(t`qY7u@l`l4Dk>k z2MBye;;Z%b4QhJ`=b^HP5SjcCpTPO`d6?fwWUJTfoi)H6h9$uR&)7Ee3k&~{cyD8K z__m(d+r#wX>6>?fyYqewS;rcH^LsN^J`W{ji@;MP<`O@uW)Jty9l7bx;qb4I;MhWJ z`x=QSJt!rWB%T$GmDyrRXSMd=`kHXfX?ixEtD=n7lA*&{GV>;2nl0n}ON+GD9+;*! z&P<<}ojY}L?{nYbnVF|aSvA0;hB&*uGg_m_$3<8(b)L2W zX4Exi2gNl>7AtJ2{`9QNhf1dx39Qi%AP5_)T&fzYnrWJwX}|m3R^H%>yHv6 zFcz3zy-$I4PF1!CQ_3EcL0=$bxuE1&K^SYDT=W=M6OhwzvffSi?smh-$ju_X-{Xg+L$F@T&ARA-(~@93t&|- z1F5hRdtk*L5}j7Sirz@5wTgORB@i{AVt?1!1537GkDibK)YwB{t09yP&YuEIK6r@- z2rQOa)K=nT@ME&WmEZ%D4Qw?7i`m1iM?0Ni>6eiTqdjk~$f>FTPQdZ*4k_uTt}!#Irp zIi%|GA9Z%O0h|CZ0x$&dz#Q)?Fd#4@Wsks6$z7%FX?AU>Dtr6DNGb6~KkiVDfFd9w zXtHE<1lL}9r1s6`YOdV`@B)D202aqDCkp{eg625=s5z!=D{(P>_Y{<*;OyTuMO1UW zQ+85Q00L#Qc(z1(oPjZ5(IfC|9B=+eiICkU>38O@AqKN4hA{V~2*VxMK+gm{DNscj$+d~fA)13l~1im|U zdhvBgp4L32?HEfQ)}dp|E&Kr}pN_Kyn@-E#Q4&{Ao;rQWuhdqIIejoQTDy3n9|9kD zdu#71@G2n>)TGefvu{(Xrf`Ta<`)(&x>UAwep^8uuOI$H;8L%+!zu&ntAZ3NXEd?%HKn^$rckkWXQQ&0-t`wOIih?*#;Eh&3=GnuyD?}%M5ybBe+>py$XiNm`jzU^n^ojXEg3U< zO2K#*g51f=`r&Z6GbHdiJuvEf9dNz{uqY_`%+tL2s$>B4`=LU<@%2?0lOCHHShAq_ zY&rJ)(ZwH^!+ywYyiNu0vt?3yc6ML}T$w$%!LPuU-w$_3qrXYn$u%Z6jT6md)w?9y zI^1}Sz#huSWeK#WOno+(daVi1%vi8-DA)rs4Y?f;-MJh*3`4M;z|+|zQO%gO2XEoh z{b6wcbUF;@d~XPF^W02~l?uLOf9MNdoVP``0K!eoglwTvW1is0+48J{#RBlgZG;oY zBy80JEA~TF37!a2o3LdI$4$QUw{DX~^Vrj{Kg=pLGT@@1Jz2JF3a0^9%UI?9&@;WDSiuJ77*g}1;Z0?6B*aN&u x&2l-N;3ovu+z-bDZ~e=ga%Tm07*hp+{{WHnQm--pX)gc(002ovPDHLkV1hw?L<#@^ diff --git a/shared/src/main/assets/byd-hud-icons/0x30.png b/shared/src/main/assets/byd-hud-icons/0x30.png deleted file mode 100644 index 1c10907d6e104e6d44dcdb7d7d86e61faad37026..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1622 zcmV-c2C4apP)VypNF_`tln`_^kOIrX@8s=DqYq9b#ly3)6+_E~%Fwb$7T{)qu6as;YOk&hA z=K(X-eXZKRd>I~~Dw4ag`YehDqGA{)338=lGFR%6I7yBSZFm*MJPCmnQ^s={RY?`4 z?OUe*V^<-dc}FGz*agetZ%QS$He=WzM6L>_te|`|B61=Kqu-Z@a>f{YilW~DI36d-Ik7?Jn#OgZ zYQt8whf_u`X|os`5b|T1W)EDra3Nm1Y8O~CQ0T~7i_wl9e-PLS$koQ08zW=yQ_3@u zvF?%Y;xs!Zz&-+(;KWaCDe-5T=RZK?WSZ+SF~O?~1JmZ8c{GUPXfSXhg60ZWs>ldd zR#stbV6~`7rI%VWuD-ynK^WdzBm#L(iI0@7d3h;Gv-4stj0r)JbRl3(2Ns)&E5q8_ z8pd&oalD1$Xa~Y50>rv!a}t)FrqCK>1yqT%3j9!(lMeXA6LpHndV%@&FplG*%ZxEl zy7r?{Wh90+2UY>|lal9Dagzc|%0dD%u>-d+3tue2q*>xvDjK5_|9p-0*h8MC>4-4* zMp1C{a5%ar2*TT7%ykqQK@n2$?bdkw_|`bx6@=k#W5Yc*2=}B}whzYMPm#S@p2sjj zlQ^a7PF*I=@lpghr<|jO-loPgG z9m9&0lc1ag@QDK75pq$9lyq|*mI&+?WA0Ysa1aECa>!Fg5ru=nUrPBxi5n(oW3h|J zeEHdLbAfqmEh+E|fQLvNZP;qWul0FXqW_r0TMAeu_7k`hVh#&%NQosUvCsnWH}6tO Ucfc;DSpWb407*qoM6N<$g88@v-2eap diff --git a/shared/src/main/assets/byd-hud-icons/0x31.png b/shared/src/main/assets/byd-hud-icons/0x31.png deleted file mode 100644 index 797b44f2caae3cc8b250d74689361bafc2e1448c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1868 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 a0R96Y6_tEMyWGM60000R~nxH diff --git a/shared/src/main/assets/byd-hud-icons/0x7.png b/shared/src/main/assets/byd-hud-icons/0x7.png deleted file mode 100644 index 3bb1668d467506c721f99e8266564b6e4efe29dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1190 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 diff --git a/shared/src/main/assets/byd-hud-icons/0xb.png b/shared/src/main/assets/byd-hud-icons/0xb.png deleted file mode 100644 index bf86f575f01496d119516787732413b2caefc96e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 953 zcmV;q14jIbP)*@|qdInefBjh2AE|Nwd#T?SK;8hjNXW+%z20v7*-{)!fdV7S z&3PQg7v{*w14CRhBn)wmz>88u`OJ#*B5iPFn}qfI{YwNMTal%ha;DrlzPNY~aFo1w zON)}f+{nU~v|b|Q9SP-WSz+aDi09p-3+F8@IAI~QtqRjx&j9#LVjszrmYX3{hFCq) z?REpPk`~(xrPf*u@RpD>P6V2?+yz-6@!{a1!&4E5+@5tdH)2!-H8cXUteE#POhRS87M6FdY6q4SD@u`41a$9`n_hL z)~GrzoYHBpD$@$IRmLi;ffjvknc(`YJd8sumqjelDu;-~MYo`Z0%31de&cr6#0{1M zX{lfbo=`%ooJ&!ZWWQAQ-H8g5kQ?F`vD9D}ZdPIuiy#mZyA1u$OjKBt7U}z~1}!Vj z`20!)afDFj+JzS)aci+%DIKBIx1za95TdFgP_5*cinL-Am{ek*6@g<=d^$nP#x zJV{rE*@+?wBzvcy$DxIxa;%p4RVbUe6{#i3-G4k~<00000NkvXXu0mjf(eK0) diff --git a/shared/src/main/assets/byd-hud-icons/0xc.png b/shared/src/main/assets/byd-hud-icons/0xc.png deleted file mode 100644 index f1153605739d0c937ade40cd8f6ddc839f5c5ea7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1007 zcmVRzZ#H-LPI3SF_(~Y!qxHNGxm=8>5}5h#)p%t)vkf8$nY9v{69>gJK~0 z2P_0T`vsMx_d*J{n)i`&oioFV=evy69ypwV8Rk6md#`7(JeEh#LrPwM;nC}_-xR@5 zgTY#*{H^4moaF~#1yXNLrxz}28 zv;qYxm0!y^j4#ZSk*i9aR1!)YAn=D3VedI{L8LQ|d?#Up!Qd!?8&0GZV^_-gowKu- z08c51ceE(w+l?%2-k5np9+Rj7Eho&bO8h>vZTmq-3tm_>ZLh+NF>3+*MPdWVoR(i9 zE0uWqt@OaiTM-j0;woDs*s!16#RIMya7qQXH96Cl>%Jvy8vh!@9B}3$~VpAgZ z?oG?w>LxN;8UjT-w0baQd~uwWS(;8RY^RRds=W6&xVmY)mrXsZ=h z)gO2pV!^D4v}{csl2*B}V7`?75&A3OIEkNYWVO?;FDdfRsIkhs#NMamt@c)|*+sx(P8YnfZVl{b^i d<9iPPUjWCGtZh8tNiqNc002ovPDHLkV1h)f*%$x- diff --git a/shared/src/main/assets/byd-hud-icons/0xd.png b/shared/src/main/assets/byd-hud-icons/0xd.png deleted file mode 100644 index d00600cf851804ea81ff69a45b999a66b743b064..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1420 zcmV;71#|j|P)yYB9sBX{QB-Miz=?l!HUkW+@GGdK7C z<~!d#_Y9U}IhJEN{^ubyJ~P*Q6FIgA?$rgL9YC{sRsfI!kN_~FuDTQYE+RyEv3g(@ zfK32y1JK&w{8<3M05}7H{td7j0PF;C{gq5^!~%eC0L))Yu$vTAXo*ldYz24jO2Dju z=Mt*_8bCqK(XZxgIGTJ0>hy^kljH$hR9=Ge-Z}s+0prCxrwi}rOZ@InXD=LKSRi46 zCPViy#Fog0_2aSl>}hwn zaKI#>H@tT?)iC-PfTI9nex=~q!C(2A!LgVcGp6q+7P;;F3#BKC1xkcfB^zIMc6D{K zkU&x`7p@kVP$eMbp+=kO+eV~@=)lvGPW>EFj0Vgf?ES}&DdK1=15(d&kz61z~5XjBm6pbdms zJ#*AjfLcA9@Jjf))w}DZvfXF#iw&Q7&h}TSBC(f&om^H+-B*{X95W8KwuQIU0&Dg@ zH0o3XiYc`sy*D%Pnz67``pfC$ih7P}j243U^s%q)ND$ang@ovdMw^Inh=CR#!ShKGoFB&yWzW0Z_BG#!{+HVt@yoPTQIO)Q>8u=AiFPPshlxOGGdR)#T zs#}nY9*^03&Lw%k_Az{_i1##*o66dipH(}&&1cD;&4hon6A#lT8;5~ZHEA0yQUKN!%HN#F-`qnIvoA)e-NJj>DZ8QM0P zNyD)4bKKOTsm_(bAYT%Ym}QP{BrDCcF5j3t^NA z1z4|K_{F?xm50nyVl!5lhjh838z}^kVDG{` zmXkJl=yeh!Y(reSoJ=yQa^Upz3ZSa}7S+mK4OltIG`yR>He%%F7B1&pRYHcb)uu2F zujX-6xHOOXgPDdmx>D_*$|sqI@i)9*3Uw?=F}ExAGram7bH02`7zOOyuQq&8x%h7e afWHAredO;=a2Ip{0000^Tr zmS^TQdglFsoO`V4$-%8nF^Uj>_&`I^rR}v*?ZEkL0l>KU62$jz0&rb{y|r>Z_E`Oj zMRS(R0)4^+ytt&WukUJV?DneYk>UtazSY`i`T_hL5Ow-N4FGoL@yUp|Mt4v^H#U6B-k1`VyDZcrmOUZ|POE1bpujEMuEcd!)ZID$+gy&c`7?F8eQ&TJkppyYd z$qqlvsD}rBcQ;$816`wM_jmsi82UcbYt9yc+a~JfS4;!M0qWAQjK<6UOn$}liybH&~`w}kp*Ung7lca16q z4VLqw*HW%O&%OL$o>2z_ds&>{s^!6v0i0UE;o7>o7K8_b1j$0cd|e=zr&jZ$iqWAH zE<<24)UvP&C{m0QmDSY|P-rlgwBomofnf1?Tt~(S@Esj|YFS`r>|n+VOe@XLS(XTx zEAme`vF7Fq2K6XLS&&*PTdmBwSIWyPZd(o6N=(1LvRQ) z#`nDIVg^neI+F@3TTn-m^iM>Gf4uy(RY`LyBHYs0c&}nSvFu+m?%5J~z2_(Q%_SGx zmBJ1MYGp<{fKw}kA}LjVo6P|;%>{Y2N_l^P6%Be0pH@q+8=U03Uc0;Ko%TL)Kf%ADeAOpDepq1rGRwQ(xadCr$zHR^xqPj%@8vaAOP>1|f|>wFcM@r}WF!Y;lchzk77zFFXmLF{lX3oWA#X0jL@I9gzFwgD1ZQ9LF4?22wKW>zYlQ zDwV?bDMpP}%T=Cgc8n0_n#-LpTdFY7P=>+!GMcC@F`@sD8$~+UIRw^VEXq;DKq>M7 zE30enSB%~iljEsJNXclg^$xBwYIA)V&cEDB@70wA)j+?i*;89Ba!P@ZB|Ew(VuG9WUpXXpOxbQwFDsb5K9_vbm=2Dyw4 zzI_tX#dZh%rVO&E|LBmR7F%HBgTP#3{+p8POWSlAV&E`NsW3R2?64F{&WGS zbOj)R)6OlWhb7;c(>JRL$yADyiWXV7Oe@H=Va!XgRwbl;OIhd70AEhR_K59UhO3z? xvgk4l*#^<71<$wOQ!6WSg=>w~`tKTmzX6(`l{KpeGB5xD002ovPDHLkV1ikKnyCN) diff --git a/shared/src/main/assets/byd-hud-icons/0xf.png b/shared/src/main/assets/byd-hud-icons/0xf.png deleted file mode 100644 index 9610bd829f0b533740456cc63b1201e5b62a3e9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1815 zcmV+y2k7{TP)v_nve9_xCO5 zyTwGCXcKLs{m&ac@Y(O)Hy{FAzkuvh>auxFOO4(8=2-U2FPo9yIgAH;M!0++!50l1 zG*ti@%n-VU&a40(%+>MTq>#4$$5>ZyYHcFa-ags4y}6(6=gRIQU{3uw6YO!SFBf3K zs;k3U4ZY&E{U^lQgg~xfq@EMjS_05U3=|C}xu_FZ)I1AbpsjoN_(mr8Q3D07}FGBpMvX&|?`pC9iS!R-se1uFpT zPA5!DPYWIsrtqpaiLhjD_=fs!as#-Kfx^51g^P3O{(>NOSlSi3z^I^{ zL)~1nsX>HPExJmJBrV0^Baz5rW~ydjA1q=!<3{B`f@hg#A%~U*^yg*L+WMCEYE!J~ zlO3QQChcQp`gr!V!X+Ie_pJlAiYT5r)szk_LNpqsa3t~+gMJdg z6b2gQ{U;Zdh2jI^QCp1dGa4|E70?zQZfUQEBFYM3C#4)}>;17XldcMC=w#I&0sJ$7 zhdw>bIgT(tt!Olw!^|52ybX4QH^_zecN%L(3{3VfnjN5Zv6i+vkC`kYDN#-!5Mph8 zjgv#Pia`u^eQ_v>f>}BRTzDSVW=b3S|FTq!+ zv}DWH=>v9Oz(>pcSj!H)lH$K zhhafmB?+O@lJgZ>X2LdU*}f-$?^RlI*`WlA)Tpc#j0$rzB`YdHAru0>WXgS`+-yg( zV`frb!k3%v^m3qmus1h5YiLv;%Z88?$aI|_cnd%qTcXm?au@X_Q;jhE?t-8v0?l(& zOQjM@LyN5EUcWX+Hw5X<3$yv6j<6#~8g>Gh$H1<1M~O`bQg4lyva;EFE7ftG%tYS)FL{KTytK= z-vG)0YIDjYg_clg!J=i;Z5_ZGm6r6;PzD+tV)ok{Z9F!5^w_b77ZrFz* z!ApBYRbwA+_S4D>V#lY8>5$`NV^yZjEiK0{C@Hy)LGLqgl_Et7n+c%6Cr^r7SyM5k z9>5U*9Ti)8j4ihnWXJ&d`8Z$q>@K4+K1dg$#}M@?TMb?SH>*I&mg zDqW$TEW}XBvyaBl=u{3P;!dptrICcEW&25rg ztvvkGM60K%$=2!|9yD;zH%rM#_q=Xbrrx86tTWD~<)>#S(>phJBtcYHQ!(XFS&0KE zu}*_LD?{_BfkA&V1yFAo2B-OgG=#&a*>x#} zmTK0qnhtM$b&A8nN6P`l<~}Mp=Ug0zmhi1PCNXxBT6$XSqs6DGOkMLh|Mc+Cg7Ps; z-p^W3)750^k|G!XSyrZM>T%9rc4?_*=F@VUXlK{}{0Ba4&$tXHin0Iz002ovPDHLk FV1icVX+{75 diff --git a/shared/src/main/assets/byd-hud-icons/LICENSE-BYDMate.txt b/shared/src/main/assets/byd-hud-icons/LICENSE-BYDMate.txt deleted file mode 100644 index d264e3f478..0000000000 --- a/shared/src/main/assets/byd-hud-icons/LICENSE-BYDMate.txt +++ /dev/null @@ -1,81 +0,0 @@ -BYDMate - Trip and Charge Tracker for BYD DiLink 5.0 -Copyright (C) 2026 AndyShaman (https://github.com/AndyShaman) - -Licensed under the PolyForm Noncommercial License 1.0.0. -Required Notice: Copyright AndyShaman (https://github.com/AndyShaman/BYDMate) - ---- - -# Polyform Noncommercial License 1.0.0 - - - -## Acceptance - -In order to get any license under these terms, you must agree to them as both strict obligations and conditions to all your licenses. - -## Copyright License - -The licensor grants you a copyright license for the software to do everything you might do with the software that would otherwise infringe the licensor's copyright in it for any permitted purpose. However, you may only distribute the software according to [Distribution License](#distribution-license) and make changes or new works based on the software according to [Changes and New Works License](#changes-and-new-works-license). - -## Distribution License - -The licensor grants you an additional copyright license to distribute copies of the software. Your license to distribute covers distributing the software with changes and new works permitted by [Changes and New Works License](#changes-and-new-works-license). - -## Notices - -You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms or the URL for them above, as well as copies of any plain-text lines beginning with `Required Notice:` that the licensor provided with the software. For example: - -> Required Notice: Copyright Yoyodyne, Inc. (http://example.com) - -## Changes and New Works License - -The licensor grants you an additional copyright license to make changes and new works based on the software for any permitted purpose. - -## Patent License - -The licensor grants you a patent license for the software that covers patent claims the licensor can license, or becomes able to license, that you would infringe by using the software. - -## Noncommercial Purposes - -Any noncommercial purpose is a permitted purpose. - -## Personal Uses - -Personal use for research, experiment, and testing for the benefit of public knowledge, personal study, private entertainment, hobby projects, amateur pursuits, or religious observance, without any anticipated commercial application, is use for a permitted purpose. - -## Noncommercial Organizations - -Use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization, or government institution is use for a permitted purpose regardless of the source of funding or obligations resulting from the funding. - -## Fair Use - -You may have "fair use" rights for the software under the law. These terms do not limit them. - -## No Other Rights - -These terms do not allow you to sublicense or transfer any of your licenses to anyone else, or prevent the licensor from granting licenses to anyone else. These terms do not imply any other licenses. - -## Patent Defense - -If you make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company. - -## Violations - -The first time you are notified in writing that you have violated any of these terms, or done anything with the software not covered by your licenses, your licenses can nonetheless continue if you come into full compliance with these terms, and take practical steps to correct past violations, within 32 days of receiving notice. Otherwise, all your licenses end immediately. - -## No Liability - -***As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.*** - -## Definitions - -The **licensor** is the individual or entity offering these terms, and the **software** is the software the licensor makes available under these terms. - -**You** refers to the individual or entity agreeing to these terms. - -**Your company** is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. **Control** means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect. - -**Your licenses** are all the licenses granted to you for the software under these terms. - -**Use** means anything you do with the software requiring one of your licenses. diff --git a/shared/src/main/assets/byd-hud-icons/NOTICE.txt b/shared/src/main/assets/byd-hud-icons/NOTICE.txt deleted file mode 100644 index c448a16392..0000000000 --- a/shared/src/main/assets/byd-hud-icons/NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -BYD HUD maneuver icons were imported from AndyShaman/BYDMate, app/src/main/assets/navi/. -Required Notice: Copyright AndyShaman (https://github.com/AndyShaman/BYDMate) -PolyForm Noncommercial License 1.0.0: https://polyformproject.org/licenses/noncommercial/1.0.0/ -See LICENSE-BYDMate.txt. These assets are not relicensed under the application's code license. -Upstream describes these as donor assets; original provenance is not independently established. diff --git a/shared/src/main/java/com/shilapi/xcertplay/adb/AdbKeys.kt b/shared/src/main/java/com/shilapi/xcertplay/adb/AdbKeys.kt deleted file mode 100644 index 612e8e585e..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/adb/AdbKeys.kt +++ /dev/null @@ -1,85 +0,0 @@ -package com.shilapi.xcertplay.adb - -import android.content.Context -import java.io.File -import java.math.BigInteger -import java.nio.ByteBuffer -import java.nio.ByteOrder -import java.security.KeyFactory -import java.security.KeyPair -import java.security.KeyPairGenerator -import java.security.PrivateKey -import java.security.PublicKey -import java.security.Signature -import java.security.interfaces.RSAPublicKey -import java.security.spec.PKCS8EncodedKeySpec -import java.security.spec.X509EncodedKeySpec -import java.util.Base64 - -/** DiPlay's own ADB key: adbd remembers it after the driver approves it once. */ -object AdbKeys { - private const val DIR = "adb" - private const val PRIVATE = "adbkey.private" - private const val PUBLIC = "adbkey.public" - private const val KEY_BITS = 2048 - private const val NAME = " diplay@headunit" - - // ADB signs the token as if it were a SHA-1 digest: the host prepends SHA-1's DigestInfo header. - private val SHA1_DIGEST_INFO = byteArrayOf( - 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, - ) - - /** Loads the key from app-private storage, or makes one on first use. */ - @Synchronized - fun load(context: Context): KeyPair { - val dir = File(context.noBackupFilesDir, DIR) - val privateFile = File(dir, PRIVATE) - val publicFile = File(dir, PUBLIC) - runCatching { - val factory = KeyFactory.getInstance("RSA") - return KeyPair( - factory.generatePublic(X509EncodedKeySpec(publicFile.readBytes())), - factory.generatePrivate(PKCS8EncodedKeySpec(privateFile.readBytes())), - ) - } - val pair = KeyPairGenerator.getInstance("RSA").apply { initialize(KEY_BITS) }.generateKeyPair() - dir.mkdirs() - privateFile.writeBytes(pair.private.encoded) - publicFile.writeBytes(pair.public.encoded) - return pair - } - - fun sign(token: ByteArray, key: PrivateKey): ByteArray = - Signature.getInstance("NONEwithRSA").run { - initSign(key) - update(SHA1_DIGEST_INFO + token) - sign() - } - - /** - * The public key as adbd stores it (AOSP android_pubkey): modulus size in words, n0inv = -1/n mod - * 2^32, the modulus and R^2 mod n (R = 2^2048) as little-endian numbers, then the exponent; - * Base64, a name and a NUL. - */ - fun publicKeyMessage(key: PublicKey): ByteArray { - val rsa = key as RSAPublicKey - val n = rsa.modulus - val words = KEY_BITS / 32 - val r32 = BigInteger.ONE.shiftLeft(32) - val n0inv = r32.subtract(n.mod(r32).modInverse(r32)) - val rr = BigInteger.ONE.shiftLeft(2 * KEY_BITS).mod(n) - val blob = ByteBuffer.allocate(8 + 2 * KEY_BITS / 8 + 4).order(ByteOrder.LITTLE_ENDIAN).apply { - putInt(words) - putInt(n0inv.toInt()) - put(littleEndian(n, KEY_BITS / 8)) - put(littleEndian(rr, KEY_BITS / 8)) - putInt(rsa.publicExponent.toInt()) - }.array() - return (Base64.getEncoder().encodeToString(blob) + NAME + "\u0000").toByteArray(Charsets.UTF_8) - } - - private fun littleEndian(value: BigInteger, size: Int): ByteArray { - val bigEndian = value.toByteArray().takeLast(size) // drops BigInteger's sign byte - return ByteArray(size) { index -> bigEndian.getOrElse(bigEndian.size - 1 - index) { 0 } } - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/adb/AdbPacket.kt b/shared/src/main/java/com/shilapi/xcertplay/adb/AdbPacket.kt deleted file mode 100644 index e97111cc9c..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/adb/AdbPacket.kt +++ /dev/null @@ -1,60 +0,0 @@ -package com.shilapi.xcertplay.adb - -import java.io.EOFException -import java.io.IOException -import java.io.InputStream -import java.nio.ByteBuffer -import java.nio.ByteOrder - -/** One ADB message: a 24-byte little-endian header followed by its payload. */ -internal class AdbPacket(val command: Int, val arg0: Int, val arg1: Int, val payload: ByteArray) { - fun encode(): ByteArray = ByteBuffer.allocate(HEADER_BYTES + payload.size).order(ByteOrder.LITTLE_ENDIAN).apply { - putInt(command) - putInt(arg0) - putInt(arg1) - putInt(payload.size) - putInt(payload.sumOf { it.toInt() and 0xff }) // adbd before protocol 0x01000001 checks this sum - putInt(command.inv()) - put(payload) - }.array() - - companion object { - const val CNXN = 0x4e584e43 - const val AUTH = 0x48545541 - const val OPEN = 0x4e45504f - const val OKAY = 0x59414b4f - const val CLSE = 0x45534c43 - const val WRTE = 0x45545257 - const val STLS = 0x534c5453 - - const val VERSION = 0x01000000 - const val MAX_PAYLOAD = 256 * 1024 - const val AUTH_TOKEN = 1 - const val AUTH_SIGNATURE = 2 - const val AUTH_PUBLIC_KEY = 3 - - private const val HEADER_BYTES = 24 - - fun read(input: InputStream): AdbPacket { - val header = ByteBuffer.wrap(readFully(input, HEADER_BYTES)).order(ByteOrder.LITTLE_ENDIAN) - val command = header.int - val arg0 = header.int - val arg1 = header.int - val length = header.int - header.int // payload sum - if (header.int != command.inv() || length !in 0..MAX_PAYLOAD) throw IOException("bad ADB header") - return AdbPacket(command, arg0, arg1, readFully(input, length)) - } - - private fun readFully(input: InputStream, count: Int): ByteArray { - val bytes = ByteArray(count) - var offset = 0 - while (offset < count) { - val read = input.read(bytes, offset, count - offset) - if (read < 0) throw EOFException("ADB stream ended") - offset += read - } - return bytes - } - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/adb/LocalAdb.kt b/shared/src/main/java/com/shilapi/xcertplay/adb/LocalAdb.kt deleted file mode 100644 index 742d83daa4..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/adb/LocalAdb.kt +++ /dev/null @@ -1,133 +0,0 @@ -package com.shilapi.xcertplay.adb - -import java.io.Closeable -import java.io.IOException -import java.io.InputStream -import java.io.OutputStream -import java.net.InetSocketAddress -import java.net.Socket -import java.net.SocketTimeoutException -import java.security.KeyPair - -/** - * A shell on the head unit's own adbd ("ADB over network", 127.0.0.1:5555), for the few commands an - * ordinary app may not run, such as switching the BYD cluster's navigation mode. Speaks the plain - * ADB protocol (AOSP adb/protocol.txt); the TLS variant used by Android 11+ wireless debugging is - * not supported. - * - * adbd trusts a key once the driver approves it in the car's "Allow debugging?" dialog. Only - * [connect] with `mayAsk = true` offers the key for approval. Background use never does, so the - * dialog cannot appear while driving. - */ -class LocalAdb( - private val key: KeyPair, - private val host: String = "127.0.0.1", - private val port: Int = 5555, -) : Closeable { - enum class Access { READY, NOT_APPROVED, UNREACHABLE, UNSUPPORTED } - - private var socket: Socket? = null - private var input: InputStream? = null - private var output: OutputStream? = null - private var nextStreamId = 1 - - @Synchronized - fun connect(mayAsk: Boolean): Access { - if (socket?.isClosed == false) return Access.READY - return try { - val address = InetSocketAddress(host, port) - val opened = Socket().apply { - connect(address, CONNECT_TIMEOUT_MS) - soTimeout = READ_TIMEOUT_MS - tcpNoDelay = true - } - socket = opened - input = opened.getInputStream() - output = opened.getOutputStream() - send(AdbPacket(AdbPacket.CNXN, AdbPacket.VERSION, AdbPacket.MAX_PAYLOAD, "host::\u0000".toByteArray())) - handshake(mayAsk).also { if (it != Access.READY) closeQuietly() } - } catch (_: SocketTimeoutException) { - closeQuietly() - if (mayAsk) Access.NOT_APPROVED else Access.UNREACHABLE - } catch (_: IOException) { - closeQuietly() - Access.UNREACHABLE - } - } - - /** Runs [command] in adbd's shell and returns its output, or null if the link failed. */ - @Synchronized - fun shell(command: String): String? { - if (socket?.isClosed != false && connect(mayAsk = false) != Access.READY) return null - return try { - val local = nextStreamId++ - send(AdbPacket(AdbPacket.OPEN, local, 0, "shell:$command\u0000".toByteArray())) - var remote = 0 - var finished = false - val text = StringBuilder() - while (!finished) { - val packet = receive() - when { - packet.command == AdbPacket.OKAY && packet.arg1 == local -> remote = packet.arg0 - packet.command == AdbPacket.WRTE && packet.arg1 == local -> { - text.append(String(packet.payload, Charsets.UTF_8)) - send(AdbPacket(AdbPacket.OKAY, local, packet.arg0, ByteArray(0))) - } - packet.command == AdbPacket.CLSE && packet.arg1 == local -> { - if (remote != 0) send(AdbPacket(AdbPacket.CLSE, local, remote, ByteArray(0))) - finished = true - } - // A stream left over from an earlier, interrupted command: close it and move on. - packet.command == AdbPacket.WRTE -> - send(AdbPacket(AdbPacket.CLSE, packet.arg1, packet.arg0, ByteArray(0))) - } - } - text.toString().trim() - } catch (_: IOException) { - closeQuietly() - null - } - } - - @Synchronized - override fun close() = closeQuietly() - - private fun handshake(mayAsk: Boolean): Access { - var packet = receive() - if (packet.command == AdbPacket.STLS) return Access.UNSUPPORTED - if (packet.command == AdbPacket.CNXN) return Access.READY - if (packet.command != AdbPacket.AUTH || packet.arg0 != AdbPacket.AUTH_TOKEN) return Access.UNREACHABLE - send(AdbPacket(AdbPacket.AUTH, AdbPacket.AUTH_SIGNATURE, 0, AdbKeys.sign(packet.payload, key.private))) - packet = receive() - if (packet.command == AdbPacket.CNXN) return Access.READY - if (!mayAsk) return Access.NOT_APPROVED - // adbd did not know the key: offer it, which opens the approval dialog on the car's screen. - send(AdbPacket(AdbPacket.AUTH, AdbPacket.AUTH_PUBLIC_KEY, 0, AdbKeys.publicKeyMessage(key.public))) - socket?.soTimeout = APPROVAL_TIMEOUT_MS - packet = receive() - socket?.soTimeout = READ_TIMEOUT_MS - return if (packet.command == AdbPacket.CNXN) Access.READY else Access.NOT_APPROVED - } - - private fun send(packet: AdbPacket) { - val out = output ?: throw IOException("not connected") - out.write(packet.encode()) - out.flush() - } - - private fun receive(): AdbPacket = AdbPacket.read(input ?: throw IOException("not connected")) - - private fun closeQuietly() { - runCatching { socket?.close() } - socket = null - input = null - output = null - nextStreamId = 1 - } - - private companion object { - const val CONNECT_TIMEOUT_MS = 2_000 - const val READ_TIMEOUT_MS = 5_000 - const val APPROVAL_TIMEOUT_MS = 60_000 - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlayConfig.kt b/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlayConfig.kt index a4fc278318..2d4d4702f1 100644 --- a/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlayConfig.kt +++ b/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlayConfig.kt @@ -38,7 +38,6 @@ data class AirPlayConfig( val btMac: String, val sourceVersion: String, val main: AirPlayDisplayConfig, - val cluster: AirPlayDisplayConfig? = null, val rightHandDrive: Boolean = false, val port: Int = 7000, val entertainmentSampleRate: Int = 48000, diff --git a/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlayInfoPlist.kt b/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlayInfoPlist.kt index 2f7fadf4db..9d8012b053 100644 --- a/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlayInfoPlist.kt +++ b/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlayInfoPlist.kt @@ -28,7 +28,6 @@ object AirPlayInfoPlist { val displays = arrayListOf( displayEntry(config.main, STREAM_TYPE_MAIN_SCREEN, MAIN_UUID), ) - config.cluster?.let { displays.add(displayEntry(it, STREAM_TYPE_ALT_SCREEN, ALT_UUID)) } val info = linkedMapOf( "sourceVersion" to config.sourceVersion, diff --git a/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlaySession.kt b/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlaySession.kt index 05533fc116..a22a7ffdbd 100644 --- a/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlaySession.kt +++ b/shared/src/main/java/com/shilapi/xcertplay/airplay/AirPlaySession.kt @@ -73,10 +73,6 @@ class AirPlaySession( internal var deviceBtMac = "" internal val activeStreams = linkedSetOf() - /** Counts the iPhone's cluster stream setups; 0 while no cluster stream is up. */ - @Volatile var clusterStream = 0 - private set - private var clusterStreamSetups = 0 private val closed = AtomicBoolean(false) private val notified = AtomicBoolean(false) @@ -132,19 +128,6 @@ class AirPlaySession( if (notified.compareAndSet(false, true)) listener.onSessionEnded(this) } - /** - * Asks the iPhone to draw CarPlay's cluster UI on the alt screen (showUI with the display's URL, - * then a keyframe) or to stop drawing it (stopUI). The stream stays up either way; CarKit handles - * both as car-initiated commands for a screen UUID. - */ - fun setClusterUiShown(shown: Boolean): Boolean { - val uuid = AirPlayInfoPlist.ALT_UUID - if (!shown) return sendCommand(mapOf("type" to "stopUI", "params" to mapOf("uuid" to uuid))) - val url = config.cluster?.initialUrl ?: return false - return sendCommand(mapOf("type" to "showUI", "params" to mapOf("uuid" to uuid, "url" to url))) && - sendCommand(mapOf("type" to "forceKeyFrame", "params" to mapOf("uuid" to uuid))) - } - fun sendCommand(command: Map): Boolean = synchronized(eventWriteLock) { sendCommandLocked(command) } @@ -518,7 +501,6 @@ class AirPlaySession( debugLog("airplay screen stream type=$type dataPort=${port ?: "rejected"}") if (port != null) { activeStreams.add(type) - if (type == STREAM_TYPE_ALT_SCREEN) clusterStream = ++clusterStreamSetups result.add(linkedMapOf("type" to type, "dataPort" to port)) } } @@ -596,7 +578,6 @@ class AirPlaySession( } else { types.forEach { type -> if (activeStreams.remove(type)) media.onTeardown(this, type) } } - if (STREAM_TYPE_ALT_SCREEN !in activeStreams) clusterStream = 0 return RtspMessage.Response(status = 200) } @@ -770,7 +751,6 @@ internal fun setupEnabledFeatures(config: AirPlayConfig, proposed: List<*>?): Li if (config.hevc) features.add("hevc") features.add("iAPChannel") features.add("viewAreas") - if (config.cluster != null) features.add("altScreen") if (config.videoInCar && proposed.orEmpty().contains(VideoInCar.FEATURE)) features.add(VideoInCar.FEATURE) return features } diff --git a/shared/src/main/java/com/shilapi/xcertplay/airplay/CarPlayClusterDisplay.kt b/shared/src/main/java/com/shilapi/xcertplay/airplay/CarPlayClusterDisplay.kt deleted file mode 100644 index 860d89df22..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/airplay/CarPlayClusterDisplay.kt +++ /dev/null @@ -1,102 +0,0 @@ -package com.shilapi.xcertplay.airplay - -/** - * CarPlay's instrument-cluster screen (stream type 111). - * - * The iPhone lists the cluster content it offers in its /info request (`altScreenURLs`); without - * an initial URL it streams a black frame. The cluster has no input. Apple Maps keeps the car - * position inside the safe area while the map still fills the panel, so the safe area is set to - * the part of the panel the cluster leaves uncovered. - */ -object CarPlayClusterDisplay { - const val MAP_URL = "maps:/car/instrumentcluster/map" - - /** - * What the dashboard shows: one of the cluster contents the iPhone lists in `altScreenURLs`. - * On the tested car the turn card needed 0–5 kbit/s against 0.3–4 Mbit/s for the map, and - * "instrumentcluster" drew the map with the turn card on it. - */ - enum class Content(val url: String) { - MAP(MAP_URL), - TURN_CARD("maps:/car/instrumentcluster/instructioncard"), - INSTRUMENTS("maps:/car/instrumentcluster"), - } - - /** - * Where the car marker goes, as percent of the panel (left, top, right, bottom). Measured on a - * DiLink 5.0 cluster with a calibration grid. In "Full screen navi" BYD draws a status row, - * turn/ADAS icons, the ADAS lane view (from x 68 %), speed and power readouts and a bottom band - * over the map; "Small screen navi" crops the panel to a centre window of about x 31–68 %, - * y 16–89 %. This centre area is clear in both modes, so no per-mode setting is needed. - */ - val SAFE_AREA_PERCENT = AirPlayInsets(top = 16, bottom = 25, left = 35, right = 36) - - /** The driver can move the marker from that centre, in steps of 10 % of the panel. */ - const val MARKER_STEP_PERCENT = 10 - val horizontalSteps = -4..4 // negative = left - val verticalSteps = -3..3 // negative = up - - /** Where the car marker lands, in percent of the panel (x from the left, y from the top). */ - fun markerPercent(horizontalStep: Int, verticalStep: Int): Pair { - val area = SAFE_AREA_PERCENT - val x = (area.left + 100 - area.right) / 2.0 + horizontalStep.coerceIn(horizontalSteps) * MARKER_STEP_PERCENT - val y = (area.top + 100 - area.bottom) / 2.0 + verticalStep.coerceIn(verticalSteps) * MARKER_STEP_PERCENT - return x.coerceIn(MARKER_MARGIN, 100 - MARKER_MARGIN) to y.coerceIn(MARKER_MARGIN, 100 - MARKER_MARGIN) - } - - private const val MARKER_MARGIN = 5.0 - - /** - * Stream size in percent of the panel. The cluster scales the stream up, so a smaller stream - * gives a larger map: 83 % is clearly larger and still sharp; 50 % was visibly blurry. - */ - const val STREAM_SCALE_PERCENT = 83 - val scalePresets = listOf(100, STREAM_SCALE_PERCENT, 67) - - private const val WIDTH_PHYSICAL_MM = 292 // a 12.3-inch 8:3 cluster panel; Apple Maps ignores it here - private const val FPS = 30 - - fun config( - widthPixels: Int, - heightPixels: Int, - scalePercent: Int = STREAM_SCALE_PERCENT, - horizontalStep: Int = 0, - verticalStep: Int = 0, - content: Content = Content.MAP, - ): AirPlayDisplayConfig { - // Height rounds to a multiple of 8 and width follows it, so the panel's aspect is kept - // (83 % of 1920x720 gives exactly 1600x600). The cluster scales the stream to the panel. - val scale = scalePercent.coerceIn(25, 100) - val height = roundTo8(heightPixels * scale / 100.0) - val width = roundTo8(height * widthPixels.toDouble() / heightPixels) - return AirPlayDisplayConfig( - widthPixels = width, - heightPixels = height, - widthPhysicalMm = WIDTH_PHYSICAL_MM, - heightPhysicalMm = Math.round(WIDTH_PHYSICAL_MM * height.toDouble() / width).toInt(), - fps = FPS, - primaryInputDevice = 0, - features = 0, - initialUrl = content.url, - safeArea = safeArea(width, height, horizontalStep, verticalStep), - safeAreaDrawOutside = true, - ) - } - - // The safe area keeps its measured size around the marker and shrinks only where the marker - // comes close to a panel edge, so the marker always sits at its centre. - private fun safeArea(width: Int, height: Int, horizontalStep: Int, verticalStep: Int): AirPlayInsets { - val area = SAFE_AREA_PERCENT - val (x, y) = markerPercent(horizontalStep, verticalStep) - val halfWidth = minOf((100 - area.left - area.right) / 2.0, x, 100 - x) - val halfHeight = minOf((100 - area.top - area.bottom) / 2.0, y, 100 - y) - return AirPlayInsets( - top = (height * (y - halfHeight) / 100).toInt(), - bottom = (height * (100 - y - halfHeight) / 100).toInt(), - left = (width * (x - halfWidth) / 100).toInt(), - right = (width * (100 - x - halfWidth) / 100).toInt(), - ) - } - - private fun roundTo8(value: Double): Int = (Math.round(value / 8) * 8).toInt().coerceAtLeast(8) -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/airplay/CarPlayMediaButton.kt b/shared/src/main/java/com/shilapi/xcertplay/airplay/CarPlayMediaButton.kt index 616a71c344..1234f2a4c0 100644 --- a/shared/src/main/java/com/shilapi/xcertplay/airplay/CarPlayMediaButton.kt +++ b/shared/src/main/java/com/shilapi/xcertplay/airplay/CarPlayMediaButton.kt @@ -5,8 +5,8 @@ import android.view.KeyEvent /** * Hardware media keys → CarPlay media HID presses (indices into [AirPlayHid]'s media report). * - * Hardware play and pause keys both map to the toggle: BYD picks PLAY or PAUSE from its own idea of - * the play state, and a wrong guess would make the button do nothing. Explicit play and pause + * Hardware play and pause keys both map to the toggle: a head unit may pick PLAY or PAUSE from its own + * idea of the play state, and a wrong guess would make the button do nothing. Explicit play and pause * commands from media controllers use [PLAY] and [PAUSE]. */ object CarPlayMediaButton { @@ -16,19 +16,8 @@ object CarPlayMediaButton { const val NEXT = 4 const val PREVIOUS = 5 - /** BYD's steering-wheel play/pause key; the firmware normally rewrites it to MEDIA_PLAY/PAUSE. */ - const val KEYCODE_BYD_AUTO_MEDIA_PLAY_PAUSE = 353 - - /** BYD's steering-wheel voice key: a short press, and the code the wheel sends for a long press. */ - const val KEYCODE_BYD_AUTO_MEDIA_VOICE = 304 - const val KEYCODE_BYD_AUTO_MEDIA_VOICE_LONG = 312 - - /** - * Whether [keyCode] is a voice key that opens Siri. The BYD wheel sends each press as an - * instant down/up pair, so a long press arrives as its own key rather than as a held one. - */ - fun opensSiri(keyCode: Int): Boolean = keyCode == KeyEvent.KEYCODE_VOICE_ASSIST || - keyCode == KEYCODE_BYD_AUTO_MEDIA_VOICE || keyCode == KEYCODE_BYD_AUTO_MEDIA_VOICE_LONG + /** Whether [keyCode] is a voice key that opens Siri. */ + fun opensSiri(keyCode: Int): Boolean = keyCode == KeyEvent.KEYCODE_VOICE_ASSIST /** The CarPlay press for [keyCode], or null when the key is not a media key CarPlay handles. */ fun forKeyCode(keyCode: Int): Int? = when (keyCode) { @@ -37,8 +26,7 @@ object CarPlayMediaButton { KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_MEDIA_PAUSE, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, - KeyEvent.KEYCODE_HEADSETHOOK, - KEYCODE_BYD_AUTO_MEDIA_PLAY_PAUSE -> PLAY_PAUSE + KeyEvent.KEYCODE_HEADSETHOOK -> PLAY_PAUSE else -> null } } diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydAdbAccess.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydAdbAccess.kt deleted file mode 100644 index 8d036a4ef3..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydAdbAccess.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context -import com.shilapi.xcertplay.adb.AdbKeys -import com.shilapi.xcertplay.adb.LocalAdb - -/** What the settings page shows about the ADB link that DiPlay's optional BYD features need. */ -object BydAdbAccess { - enum class State { READY, NOT_APPROVED, ADB_OFF, PAIRING_ONLY } - - class Status( - val state: State, - val dashboardMode: BydClusterNaviMode? = null, - val dashboardShowsMap: Boolean = true, - val batteryPercent: Double? = null, - val rangeKm: Int? = null, - ) - - /** Blocking: run off the main thread. [mayAsk] lets the car show its approval dialog for DiPlay's key. */ - fun check(context: Context, mayAsk: Boolean): Status { - LocalAdb(AdbKeys.load(context)).use { adb -> - val state = when (adb.connect(mayAsk)) { - LocalAdb.Access.READY -> State.READY - LocalAdb.Access.NOT_APPROVED -> State.NOT_APPROVED - LocalAdb.Access.UNREACHABLE -> State.ADB_OFF - LocalAdb.Access.UNSUPPORTED -> State.PAIRING_ONLY - } - if (state != State.READY) return Status(state) - return readStatus(context, adb::shell) - } - } - - /** Read and publish the same battery data that the settings page reports as ready. */ - internal fun readStatus(context: Context, shell: (String) -> String?): Status { - val mode = BydClusterNaviMode.parseRead(shell(BydClusterNaviMode.READ_COMMAND)) - val battery = BydBattery.read(shell) - battery?.let { BydBatteryStatus.accept(context, it) } - return Status(State.READY, mode, mode?.showsMap != false, battery?.percent, battery?.rangeKm) - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydAdbShell.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydAdbShell.kt deleted file mode 100644 index 3c90761e66..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydAdbShell.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context -import android.os.SystemClock -import android.util.Log -import com.shilapi.xcertplay.adb.AdbKeys -import com.shilapi.xcertplay.adb.LocalAdb - -/** - * A lazily opened adb shell on the head unit for background reads. It never asks for approval, so - * the car's dialog cannot appear while driving; a refused or missing adbd is retried every 30 s. - */ -internal class BydAdbShell(private val tag: String) { - private var adb: LocalAdb? = null - private var retryAtMillis = 0L - private var unavailableLogged = false - - @Synchronized - fun run(context: Context, command: String): String? { - val now = SystemClock.elapsedRealtime() - if (now < retryAtMillis) return null - val client = adb ?: LocalAdb(AdbKeys.load(context)).also { adb = it } - val access = client.connect(mayAsk = false) - if (access != LocalAdb.Access.READY) { - retryAtMillis = now + RETRY_MILLIS - if (!unavailableLogged) { - unavailableLogged = true - Log.w(tag, "ADB access $access") - } - return null - } - unavailableLogged = false - return client.shell(command) - } - - @Synchronized - fun close() { - adb?.close() - adb = null - } - - private companion object { - const val RETRY_MILLIS = 30_000L - } -} - -/** Reads `service call` replies such as `Result: Parcel(00000000 00000002 '........')`. */ -internal object BydParcel { - /** The value after a zero exception code, as its 32 raw bits. */ - fun value(output: String?): Int? { - val words = words(output) - if (words.size < 2 || words[0] != 0L) return null - return words[1].toInt() - } - - fun words(output: String?): List { - val body = output?.substringAfter("Parcel(", "")?.substringBefore('\'') ?: return emptyList() - return body.trim().split(Regex("\\s+")).mapNotNull { word -> - word.takeIf { it.length == 8 }?.toLongOrNull(16) - } - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydBattery.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydBattery.kt deleted file mode 100644 index ff21948f3f..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydBattery.kt +++ /dev/null @@ -1,151 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context -import android.util.Log -import android.os.SystemClock -import com.shilapi.xcertplay.transport.VehicleStatusProvider -import com.shilapi.xcertplay.transport.VehicleStatusSnapshot -import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit -import kotlin.math.roundToInt -import kotlin.math.roundToLong - -/** The traction battery as BYD's statistic, power and charging devices report it. */ -internal data class BydBatteryReading( - val percent: Double, - val rangeKm: Int, - val remainingKwh: Double, - val charging: Boolean, -) - -/** - * Reads the traction battery through the adb shell (autoservice binder), where apps would need a BYD - * signature. Verified on DiLink 5.0 (Android 12); the percentage and remaining-energy ids follow - * BYDMate's validated map, the range id is Statistic.ELEC_DRIVING_RANGE for this platform. - */ -internal object BydBattery { - private const val PERCENT = "service call autoservice 7 i32 1014 i32 1246777400" // float % - private const val RANGE = "service call autoservice 5 i32 1014 i32 1246765118" // km - private const val REMAINING = "service call autoservice 7 i32 1005 i32 882901008" // float kWh - private const val BMS_STATE = "service call autoservice 5 i32 1009 i32 876609560" // 1 = charging - private const val BMS_CHARGING = 1 - - /** One reading, or null when any value is missing or outside what a battery can report. */ - fun read(shell: (String) -> String?): BydBatteryReading? { - val percent = BydParcel.value(shell(PERCENT))?.let(::float)?.takeIf { it in 0.0..100.0 } ?: return null - val range = BydParcel.value(shell(RANGE))?.takeIf { it in 0..3000 } ?: return null - val remaining = BydParcel.value(shell(REMAINING))?.let(::float)?.takeIf { it in 0.0..300.0 } ?: return null - val bms = BydParcel.value(shell(BMS_STATE)) - return BydBatteryReading(percent, range, remaining, bms == BMS_CHARGING) - } - - /** - * What the iPhone gets. Full charge and full range are scaled up from the current values; below - * 20 % the rounding of the percentage would make that scale jumpy, so [fullKwh] from an earlier, - * higher reading is used when there is one. - */ - fun snapshot(reading: BydBatteryReading, lowPercent: Int, fullKwh: Double?): VehicleStatusSnapshot { - val fraction = reading.percent / 100 - val full = fullKwh ?: if (fraction > 0) reading.remainingKwh / fraction else reading.remainingKwh - return VehicleStatusSnapshot( - rangeKm = reading.rangeKm, - rangeWarning = reading.percent <= lowPercent, - batteryPercent = reading.percent, - currentChargeWh = (reading.remainingKwh * 1000).roundToLong(), - maxChargeWh = (full * 1000).roundToLong(), - maxRangeKm = if (fraction > 0) (reading.rangeKm / fraction).roundToInt() else reading.rangeKm, - charging = reading.charging, - ) - } - - /** A full-charge estimate from [reading], when the percentage is high enough to trust it. */ - fun fullKwh(reading: BydBatteryReading): Double? = - if (reading.percent >= 20) reading.remainingKwh / (reading.percent / 100) else null - - private fun float(bits: Int): Double = java.lang.Float.intBitsToFloat(bits).toDouble() -} - -/** - * Optional, needs ADB over network: tells the iPhone the car's charge and range, so Apple Maps can - * warn about a low charge and suggest chargers. Reads the battery every 30 s while the iPhone asks - * for vehicle status; the iAP2 loop only takes the last reading, so it never waits for adb. - */ -internal object BydBatteryStatus : VehicleStatusProvider { - private const val TAG = "DiPlay-BYD-Battery" - private const val READ_MILLIS = 30_000L - private const val IDLE_MILLIS = 2 * 60_000L - - private val shell = BydAdbShell(TAG) - @Volatile private var context: Context? = null - private var started = false - private val cache = BydBatteryCache(::now) - @Volatile internal var readBattery: (Context) -> BydBatteryReading? = { app -> - BydBattery.read { shell.run(app, it) } - } - private val executor = Executors.newSingleThreadScheduledExecutor { runnable -> - Thread(runnable, "diplay-battery").apply { isDaemon = true } - } - @Volatile private var askedMillis = 0L - - @Synchronized - fun start(appContext: Context) { - context = appContext.applicationContext - askedMillis = now() - if (started) { - // A reconnect after idle must not wait for the next 30-second tick. - executor.execute(::poll) - } else { - started = true - executor.scheduleWithFixedDelay(::poll, 0, READ_MILLIS, TimeUnit.MILLISECONDS) - } - } - - override fun snapshot(): VehicleStatusSnapshot? { - askedMillis = now() - val app = context ?: return null - return cache.snapshot(BydOutputSettings.lowChargePercent(app)) - } - - private fun poll() { - val app = context ?: return - // Nobody asked for a while: the session ended. Keep adb closed until the next one. - if (now() - askedMillis > IDLE_MILLIS) return shell.close() - val reading = readBattery(app) ?: return - accept(app, reading) - } - - /** Publish a settings check before telling the user that the battery is ready. No ADB I/O. */ - fun accept(appContext: Context, reading: BydBatteryReading) { - context = appContext.applicationContext - if (cache.accept(reading)) { - Log.i(TAG, "battery ${reading.percent} % range ${reading.rangeKm} km ${reading.remainingKwh} kWh charging=${reading.charging}") - } - } - - private fun now() = SystemClock.elapsedRealtime() -} - -/** Atomically publishes the reading, timestamp and capacity estimate across both ADB readers. */ -internal class BydBatteryCache(private val now: () -> Long) { - private var latest: BydBatteryReading? = null - private var latestMillis = 0L - private var fullKwh: Double? = null - - @Synchronized - fun accept(reading: BydBatteryReading): Boolean { - val changed = latest?.let { - it.percent.roundToInt() != reading.percent.roundToInt() || it.charging != reading.charging - } != false - BydBattery.fullKwh(reading)?.let { fullKwh = it } - latest = reading - latestMillis = now() - return changed - } - - @Synchronized - fun snapshot(lowPercent: Int): VehicleStatusSnapshot? { - val reading = latest ?: return null - if (now() - latestMillis > 3 * 60_000L) return null - return BydBattery.snapshot(reading, lowPercent, fullKwh) - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterBridge.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterBridge.kt deleted file mode 100644 index a06316d950..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterBridge.kt +++ /dev/null @@ -1,156 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context -import android.content.Intent -import android.content.pm.PackageManager -import android.util.Log -import com.shilapi.xcertplay.iap2.wire.Iap2Frame -import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit - -/** - * Publishes CarPlay arrows and distance to the BYD instrument cluster through the stock - * AMap adapter (com.byd.amapservice), independently of the SOME/IP windshield HUD path. - */ -internal object BydClusterBridge { - private const val TAG = "DiPlay-BYD-Cluster" - private const val AMAP_PACKAGE = "com.byd.amapservice" - private const val AMAP_ACTION = "AUTONAVI_STANDARD_BROADCAST_SEND" - private const val KEY_GUIDANCE = 10001 - private const val KEY_STATE = 10019 - private const val STATE_ENDED = 9 - private const val KEEPALIVE_TICKS = 5 - private const val FLAG_RECEIVER_INCLUDE_BACKGROUND = 0x01000000 // hidden Intent flag, as sent by stock clients - - private val lock = Any() - private val route = BydHudRouteState() - private var context: Context? = null - private var available = false - private var factory: BydFactoryNavigationOutput? = null - private var senderStarted = false - private var lastSent: BydClusterFrame? = null - private var ticksSinceSend = 0 - private var guidanceLogged = false - - fun initialize(appContext: Context) = synchronized(lock) { - if (context != null) return@synchronized - context = appContext.applicationContext - available = try { - appContext.packageManager.getPackageInfo(AMAP_PACKAGE, 0) - true - } catch (_: PackageManager.NameNotFoundException) { - false - } - if (!available && appContext.packageName.endsWith(".hudtest")) { - factory = BydFactoryNavigationOutput(appContext.applicationContext) - available = true - } - Log.i(TAG, "cluster adapter available=$available factoryTest=${factory != null}") - if (available && !senderStarted) { - senderStarted = true - Executors.newSingleThreadScheduledExecutor { runnable -> - Thread(runnable, "diplay-byd-cluster").apply { isDaemon = true } - }.scheduleAtFixedRate(::tick, 1, 1, TimeUnit.SECONDS) - } - } - - fun onFrame(frame: Iap2Frame) = synchronized(lock) { - if (!available) return@synchronized - when (route.accept(frame.messageId, frame.payload)) { - BydHudRouteChange.GUIDANCE -> sendCurrentLocked(force = false) - BydHudRouteChange.CLEAR -> if (lastSent != null) sendEndLocked() - BydHudRouteChange.NONE -> Unit - } - } - - fun clear() = synchronized(lock) { - route.clear() // Prevent the keepalive from restoring guidance after cleanup. - if (available && lastSent != null) sendEndLocked() - } - - private fun tick() = synchronized(lock) { - // Guidance can expire without a frame (a list that stays empty), so check every second. - if (lastSent != null && route.currentApple() == null) sendEndLocked() - else if (++ticksSinceSend >= KEEPALIVE_TICKS) sendCurrentLocked(force = true) - } - - private fun sendCurrentLocked(force: Boolean) { - if (context?.let(BydOutputSettings::enabled) != true) { - if (lastSent != null) sendEndLocked() - return - } - val frame = route.currentApple()?.let(BydClusterFrame::from) - if (frame == null) { - if (lastSent != null) sendEndLocked() - return - } - if (!force && frame == lastSent) return - factory?.let { - it.update(frame.icon, frame.roundaboutExit, frame.distanceMeters) - lastSent = frame - ticksSinceSend = 0 - return - } - val intent = baseIntent(KEY_GUIDANCE).apply { - putExtra("TYPE", 0) - putExtra("EXTRA_STATE", 0) - putExtra("EXTRA_IS_FOREGROUND", 0) - putExtra("NEW_ICON", frame.icon) - putExtra("ROUNG_ABOUT_NUM", frame.roundaboutExit) - putExtra("SEG_REMAIN_DIS", frame.distanceMeters) - putExtra("NEXT_ROAD_NAME", frame.road) - putExtra("ROUTE_REMAIN_DIS", frame.routeRemainingMeters) - putExtra("ROUTE_REMAIN_TIME", frame.routeRemainingSeconds) - } - if (broadcastLocked(intent)) { - lastSent = frame - ticksSinceSend = 0 - if (!guidanceLogged) { - guidanceLogged = true - Log.i(TAG, "cluster guidance sent $frame") - } - } - } - - private fun sendEndLocked() { - factory?.let { - it.clear() - lastSent = null - guidanceLogged = false - return - } - val intent = baseIntent(KEY_STATE).apply { - putExtra("EXTRA_STATE", STATE_ENDED) - putExtra("EXTRA_IS_FOREGROUND", 1) - putExtra("NEW_ICON", -1) - putExtra("SEG_REMAIN_DIS", -1) - putExtra("NEXT_ROAD_NAME", "") - putExtra("ROUTE_REMAIN_DIS", -1) - putExtra("ROUTE_REMAIN_TIME", -1) - } - if (!broadcastLocked(intent)) return - lastSent = null - guidanceLogged = false - Log.i(TAG, "cluster guidance ended") - } - - // IS_BYD_MAP=true is required: the adapter drops foreign frames while it believes the stock map navigates. - private fun baseIntent(keyType: Int) = Intent(AMAP_ACTION).apply { - setPackage(AMAP_PACKAGE) - addFlags(FLAG_RECEIVER_INCLUDE_BACKGROUND) - putExtra("KEY_TYPE", keyType) - putExtra("IS_BYD_MAP", true) - putExtra("IS_BYD_BAIDU_MAP", false) - } - - private fun broadcastLocked(intent: Intent): Boolean { - val appContext = context ?: return false - return try { - appContext.sendBroadcast(intent) - true - } catch (error: RuntimeException) { - Log.w(TAG, "cluster broadcast failed", error) - false - } - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterFrame.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterFrame.kt deleted file mode 100644 index 76af981e09..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterFrame.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.shilapi.xcertplay.hud - -/** One instrument-cluster frame in the AMap broadcast vocabulary accepted by com.byd.amapservice. */ -internal data class BydClusterFrame( - val icon: Int, - val roundaboutExit: Int, - val distanceMeters: Int, - val road: String = "", - val routeRemainingMeters: Int = -1, - val routeRemainingSeconds: Int = -1, -) { - companion object { - private const val LEFT = 2 - private const val RIGHT = 3 - private const val SLIGHT_LEFT = 4 - private const val SLIGHT_RIGHT = 5 - private const val SHARP_LEFT = 6 - private const val SHARP_RIGHT = 7 - private const val U_TURN_LEFT = 8 - private const val STRAIGHT = 9 - private const val ROUNDABOUT_ENTER = 11 - private const val ROUNDABOUT_EXIT = 12 - private const val DESTINATION = 15 - private const val ROUNDABOUT_ENTER_CLOCKWISE = 17 - private const val ROUNDABOUT_EXIT_CLOCKWISE = 18 - private const val U_TURN_RIGHT = 19 - - /** Apple iAP2 RouteGuidanceManeuverType -> AMap NEW_ICON (+ ROUNG_ABOUT_NUM). */ - fun from(maneuver: BydAppleManeuver): BydClusterFrame { - val leftHandTraffic = maneuver.drivingSide == 1 - val distance = maneuver.distanceMeters.coerceAtLeast(0) - val type = maneuver.type - val road = maneuver.road - val remainingMeters = maneuver.remainingMeters?.coerceIn(0, Int.MAX_VALUE.toLong())?.toInt() ?: -1 - val remainingSeconds = maneuver.remainingSeconds?.coerceIn(0, Int.MAX_VALUE.toLong())?.toInt() ?: -1 - if (type in 28..46) { - val icon = if (leftHandTraffic) ROUNDABOUT_ENTER_CLOCKWISE else ROUNDABOUT_ENTER - return BydClusterFrame(icon, type - 27, distance, road, remainingMeters, remainingSeconds) - } - val icon = when (type) { - 1, 20 -> LEFT - 2, 21 -> RIGHT - 47 -> SHARP_LEFT - 48 -> SHARP_RIGHT - 13, 22, 49, 52 -> SLIGHT_LEFT - 14, 23, 50, 53 -> SLIGHT_RIGHT - 4, 18, 19, 26 -> if (leftHandTraffic) U_TURN_RIGHT else U_TURN_LEFT - 6 -> if (leftHandTraffic) ROUNDABOUT_ENTER_CLOCKWISE else ROUNDABOUT_ENTER - 7 -> if (leftHandTraffic) ROUNDABOUT_EXIT_CLOCKWISE else ROUNDABOUT_EXIT - 10, 12, 24, 25, 27 -> DESTINATION - 3, 5, 8, 9, 11, 51 -> STRAIGHT - else -> 0 // Unknown/no maneuver must not become a false straight arrow. - } - return BydClusterFrame(icon, 0, distance, road, remainingMeters, remainingSeconds) - } - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterMapPause.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterMapPause.kt deleted file mode 100644 index 27f0c1c8cd..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterMapPause.kt +++ /dev/null @@ -1,67 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context -import android.util.Log -import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicBoolean - -/** - * Optional, needs ADB over network: the iPhone draws and streams the cluster map for the whole - * session, but the cluster shows it only in Small and Full screen navi. DiPlay reads the mode the - * driver picked on the wheel every second and asks the iPhone to stop drawing the map while the - * cluster hides it (Off, Turn on by navi, where it shows arrows only), and to draw it again when the - * driver picks Small or Full. Without ADB access, or when the mode cannot be read, the map streams - * as before. - */ -internal object BydClusterMapPause { - private const val TAG = "DiPlay-BYD-ClusterMap" - private const val READ_MILLIS = 1_000L - - private val tickerStarted = AtomicBoolean(false) - private val shell = BydAdbShell(TAG) - @Volatile private var context: Context? = null - - // Only the ticker thread touches this, so nothing blocking ever runs under a lock that - // initialize() or the UI needs. - private var lastMode: BydClusterNaviMode? = null - - /** Whether DiPlay's map window is on the cluster. */ - @Volatile var clusterMapShown = false - - /** The running CarPlay session, told every second whether the iPhone should draw the cluster map. */ - @Volatile var streamControl: ((Boolean) -> Unit)? = null - - /** Reads the mode over adb. Blocking, and only called on the ticker thread; tests replace it. */ - @Volatile internal var readMode: (Context) -> BydClusterNaviMode? = { app -> - BydClusterNaviMode.parseRead(shell.run(app, BydClusterNaviMode.READ_COMMAND)) - } - - /** Never waits for the ticker: an adb read in flight does not hold up opening or reconnecting. */ - fun initialize(appContext: Context) { - context = appContext.applicationContext - if (tickerStarted.compareAndSet(false, true)) { - Executors.newSingleThreadScheduledExecutor { runnable -> - Thread(runnable, "diplay-cluster-map").apply { isDaemon = true } - }.scheduleAtFixedRate(::tick, READ_MILLIS, READ_MILLIS, TimeUnit.MILLISECONDS) - } - } - - private fun tick() { - val app = context ?: return - val control = streamControl - if (control == null || !clusterMapShown || !BydOutputSettings.clusterStreamPause(app)) { - control?.invoke(true) - shell.close() - lastMode = null - return - } - val mode = readMode(app) - if (mode != lastMode) { - lastMode = mode - Log.i(TAG, "cluster mode ${mode?.label ?: "unknown"}") - } - // An unknown mode keeps the map streaming, as without ADB. - control(mode?.showsMap != false) - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterNaviMode.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterNaviMode.kt deleted file mode 100644 index 8f9ea24e52..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydClusterNaviMode.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.shilapi.xcertplay.hud - -/** - * The cluster's navigation mode, the one the driver picks in the steering-wheel menu. BYD keeps it - * in instrument property INSTRUMENT_NAVI_TYPE; apps need a BYD signature for it, the adb shell - * reads it through the autoservice binder. Verified on DiLink 5.0 (Android 12). - */ -enum class BydClusterNaviMode(val code: Int, val label: String) { - OFF(1, "Off"), - TURN_ON_BY_NAVI(2, "Turn on by navi"), - SMALL(3, "Small screen navi"), - FULL(4, "Full screen navi"); - - /** Small and Full screen navi show the projection (DiPlay's map); Off and Turn on by navi do not. */ - val showsMap: Boolean get() = this == SMALL || this == FULL - - companion object { - private const val INSTRUMENT_DEVICE = 1007 - private const val NAVI_TYPE_GET = 0x40C03032 - private const val GET_INT = 5 - - const val READ_COMMAND = "service call autoservice $GET_INT i32 $INSTRUMENT_DEVICE i32 $NAVI_TYPE_GET" - - fun fromCode(code: Int): BydClusterNaviMode? = entries.firstOrNull { it.code == code } - - /** `Result: Parcel(00000000 00000002 '........')`: no exception, then the value. */ - fun parseRead(output: String?): BydClusterNaviMode? = BydParcel.value(output)?.let(::fromCode) - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydFactoryNavigationOutput.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydFactoryNavigationOutput.kt deleted file mode 100644 index 2ca37cc89d..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydFactoryNavigationOutput.kt +++ /dev/null @@ -1,65 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context -import android.util.Log -import java.lang.reflect.InvocationTargetException - -/** Temporary HUD-test output using the installed factory SDK and the app's own identity. */ -internal class BydFactoryNavigationOutput(private val context: Context) { - private var device: Any? = null - private var disabled = false - private var showing = false - private var logged = false - - fun update(icon: Int, exit: Int, distance: Int) { - if (disabled || !context.packageName.endsWith(".bydhudtest") && !context.packageName.endsWith(".hudtest")) return - val turn = BydFactoryTurnCode.map(icon, exit) ?: run { clear(); return } - if (distance !in 0..16777214) { clear(); return } - try { - val sdk = device ?: Class.forName("android.hardware.bydauto.instrument.BYDAutoInstrumentDevice") - .getMethod("getInstance", Context::class.java).invoke(null, context).also { device = it } - if (!showing) { - checkResult("start", sdk.javaClass.getMethod("sendAutoNaviStatus", Int::class.javaPrimitiveType).invoke(sdk, 2)) - showing = true - } - val idsClass = Class.forName("android.hardware.bydauto.BYDAutoFeatureIds\$Instrument") - val ids = arrayOf("INSTRUMENT_FRONT_CROSSING_DISTANCE_SET", "INSTRUMENT_GUIDE_INFO_SIMPLE_SET", "INSTRUMENT_GUIDE_INFO_AND_ROAD_AHEAD_DISTANCE_SET") - .map { idsClass.getField(it).getInt(null) }.toIntArray() - val valueClass = Class.forName("android.hardware.bydauto.BYDAutoEventValue") - val value = valueClass.getConstructor().newInstance() - valueClass.getField("intArrayValue").set(value, intArrayOf(distance, turn, turn)) - checkResult("guidance", sdk.javaClass.getMethod("set", IntArray::class.java, valueClass).invoke(sdk, ids, value)) - if (!logged) { - Log.i(TAG, "Factory navigation accepted turn=$turn distance=$distance; visible HUD output unconfirmed") - logged = true - } - } catch (error: Exception) { - // If start succeeded but guidance failed, end our own navigation state once. - clear() - disabled = true - val cause = (error as? InvocationTargetException)?.targetException ?: error - Log.w(TAG, "Factory navigation disabled: ${cause.javaClass.simpleName}: ${cause.message}") - } - } - - fun clear() { - if (!showing) return - showing = false - logged = false - try { - val sdk = device ?: return - checkResult("end", sdk.javaClass.getMethod("sendAutoNaviStatus", Int::class.javaPrimitiveType).invoke(sdk, 1)) - Log.i(TAG, "Factory navigation ended") - } catch (error: Exception) { - disabled = true - val cause = (error as? InvocationTargetException)?.targetException ?: error - Log.w(TAG, "Factory navigation cleanup failed: ${cause.message}") - } - } - - private fun checkResult(operation: String, result: Any?) { - check(result == 0) { "$operation returned $result" } - } - - companion object { private const val TAG = "BYD-Factory-Navi" } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydFactoryTurnCode.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydFactoryTurnCode.kt deleted file mode 100644 index c9ef9f751e..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydFactoryTurnCode.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.shilapi.xcertplay.hud - -/** Factory navigation's NEW_ICON -> instrument code mapping, verified against installed firmware. */ -internal object BydFactoryTurnCode { - private val codes = intArrayOf(0, 0, 1, 2, 3, 5, 7, 8, 9, 11, 45, 13, 24, 46, 47, 48, 49, 14, 23, 10, 12, 15, 18, 20, 22, 16, 17, 19, 21) - fun map(icon: Int, exit: Int): Int? { - if (icon !in 2..28) return null - if (exit in 1..10) { - if (icon == 11 || icon == 12) return exit + 24 - if (icon == 17 || icon == 18) return exit + 34 - } - return codes[icon] - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudBridge.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudBridge.kt deleted file mode 100644 index 05df27aaa2..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudBridge.kt +++ /dev/null @@ -1,259 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.ComponentName -import android.content.Context -import android.content.Intent -import android.content.ServiceConnection -import android.os.Binder -import android.os.IBinder -import android.os.Parcel -import android.util.Log -import com.shilapi.xcertplay.iap2.wire.Iap2Frame -import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit - -/** Publishes CarPlay route arrows, distance and street to BYD's native windshield HUD. */ -internal object BydHudBridge { - private const val TAG = "DiPlay-BYD-HUD" - private const val SOMEIP_PACKAGE = "com.ts.car.someip.service" - private const val SOMEIP_CLASS = "com.ts.car.someip.service.manager.SomeIpServerService" - private const val SOMEIP_ACTION = "com.ts.car.someip.SomeIpServerService" - private const val SOMEIP_TOKEN = "ts.car.someip.sdk.ISomeIpServerInterface" - private const val CALLBACK_TOKEN = "ts.car.someip.sdk.ISomeIpCallback" - private const val SERVICE_ID = BydHudProtocol.SERVICE_TOPIC - private const val HUD_TOPIC = BydHudProtocol.NAVIGATION_TOPIC - private const val TX_REGISTER_CALLBACK = 1 - private const val TX_START_SERVICE = 4 - private const val TX_FIRE_EVENT = 6 - private const val ICON_ASSET_DIR = "byd-hud-icons" - - private val callbacks = Executors.newSingleThreadExecutor { task -> - Thread(task, "diplay-hud-callback").apply { isDaemon = true } - } - private val lock = Any() - private val route = BydHudRouteState() - private var context: Context? = null - private var binder: IBinder? = null - private var binding = false - private var started = false - private var senderStarted = false - private var guidanceSentLogged = false - private var showing = false - private var lastSendResult: Int? = null - private var icons: Map? = null - - // The gateway pings registered callbacks and drops registrations that do not answer like an AIDL stub. - private val callback = object : Binder() { - override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean = when (code) { - INTERFACE_TRANSACTION -> { reply?.writeString(CALLBACK_TOKEN); true } - FIRST_CALL_TRANSACTION -> { - data.enforceInterface(CALLBACK_TOKEN) - reply?.writeNoException() - reply?.writeInt(0) - true - } - FIRST_CALL_TRANSACTION + 1 -> { - data.enforceInterface(CALLBACK_TOKEN) - val ready = data.readInt() != 0 - Log.i(TAG, "SOME/IP HAL ready=$ready") - reply?.writeNoException() - true - } - FIRST_CALL_TRANSACTION + 2 -> { - data.enforceInterface(CALLBACK_TOKEN) - reply?.writeNoException() - reply?.writeInt(0) // No response to an unsupported request. - reply?.writeInt(0) // No modified input parcel. - true - } - else -> super.onTransact(code, data, reply, flags) - } - } - - fun initialize(appContext: Context) = synchronized(lock) { - if (context == null) context = appContext.applicationContext - bindLocked() - if (!senderStarted) { - senderStarted = true - Executors.newSingleThreadScheduledExecutor { runnable -> - Thread(runnable, "diplay-byd-hud").apply { isDaemon = true } - }.scheduleWithFixedDelay(::tick, BydHudProtocol.REPEAT_MILLIS, BydHudProtocol.REPEAT_MILLIS, TimeUnit.MILLISECONDS) - } - } - - fun onFrame(frame: Iap2Frame) = synchronized(lock) { - val change = route.accept(frame.messageId, frame.payload) - if (frame.messageId == BydHudRouteState.ROUTE_GUIDANCE_UPDATE || - frame.messageId == BydHudRouteState.ROUTE_GUIDANCE_MANEUVER_UPDATE - ) { - Log.d(TAG, "route frame=0x${frame.messageId.toString(16)} change=$change guidance=${route.current()}") - } - when (change) { - BydHudRouteChange.GUIDANCE -> sendCurrentLocked() - BydHudRouteChange.CLEAR -> clearHudLocked() - BydHudRouteChange.NONE -> Unit - } - } - - /** Clears the HUD immediately; called when DiPlay is about to be killed. */ - fun clearNow() = clear() - - fun clear() = synchronized(lock) { - route.clear() - clearHudLocked() - } - - private fun tick() = synchronized(lock) { - if (binder == null && !binding) bindLocked() - sendCurrentLocked() - } - - private fun enabled(): Boolean = context?.let(BydOutputSettings::enabled) ?: false - - private fun sendCurrentLocked() { - if (binder == null || !started) return - if (!enabled()) { - clearHudLocked() - return - } - val guidance = route.current() - if (guidance == null) { - clearHudLocked() - return - } - val payload = BydHudPayload.guidance( - distanceMeters = guidance.distanceMeters, - maneuver = guidance.maneuver, - icon = iconFor(guidance.gaode), - road = guidance.road, - ) - val accepted = sendLocked(payload) - if (accepted && !guidanceSentLogged) { - guidanceSentLogged = true - Log.i(TAG, "HUD profile (300ms repeat, fixed field2=2): gateway accepted guidance; rendering unconfirmed") - } - if (accepted) showing = true - } - - private fun clearHudLocked() { - if (!showing) return - if (!sendLocked(BydHudPayload.clear())) return - showing = false - guidanceSentLogged = false - } - - // Arrow-less maneuvers (roundabouts, destination) are only visible through the field-8 icon. - private fun iconFor(gaode: Int): ByteArray? { - if (gaode <= 0) return null - val loaded = icons ?: loadIcons().also { icons = it } - return loaded[gaode] - } - - private fun loadIcons(): Map { - val assets = context?.assets ?: return emptyMap() - return runCatching { - assets.list(ICON_ASSET_DIR).orEmpty().mapNotNull { name -> - val code = name.removePrefix("0x").removeSuffix(".png").toIntOrNull(16) ?: return@mapNotNull null - code to assets.open("$ICON_ASSET_DIR/$name").use { it.readBytes() } - }.toMap() - }.onFailure { Log.w(TAG, "HUD icons unavailable", it) }.getOrDefault(emptyMap()) - } - - private fun bindLocked() { - val appContext = context ?: return - if (binder != null || binding) return - try { - // The gateway's onUnbind requires a MIME type; a typeless bind crashes the whole SOME/IP process. - val intent = Intent(SOMEIP_ACTION).apply { - setClassName(SOMEIP_PACKAGE, SOMEIP_CLASS) - type = appContext.packageName - } - binding = appContext.bindService(intent, connection, Context.BIND_AUTO_CREATE) - Log.i(TAG, "bindService=$binding") - } catch (error: Throwable) { - binding = false - Log.w(TAG, "cannot bind SOME/IP service", error) - } - } - - private fun onGatewayCallback(action: () -> Unit) { - callbacks.execute { - synchronized(lock) { - runCatching(action).onFailure { Log.w(TAG, "gateway callback failed", it) } - } - } - } - - private val connection = object : ServiceConnection { - override fun onServiceConnected(name: ComponentName, service: IBinder) = onGatewayCallback { - binder = service - binding = true - val registered = transactLocked(TX_REGISTER_CALLBACK, returnsValue = false) { it.writeStrongBinder(callback) } - val startResult = if (registered == 0) transactLocked(TX_START_SERVICE) { it.writeLong(SERVICE_ID) } else -1 - // Firmware explicitly treats 13 as an already-started service. - started = BydHudProtocol.serviceStarted(startResult) - Log.i(TAG, "SOME/IP connected, callback=$registered startResult=$startResult started=$started") - showing = false - sendCurrentLocked() - } - - // BIND_AUTO_CREATE reconnects after a gateway restart without a second binding. - override fun onServiceDisconnected(name: ComponentName) = onGatewayCallback { - binder = null - started = false - } - - override fun onBindingDied(name: ComponentName) = onGatewayCallback { resetBindingLocked() } - override fun onNullBinding(name: ComponentName) = onGatewayCallback { resetBindingLocked() } - } - - private inline fun transactLocked(code: Int, returnsValue: Boolean = true, write: (Parcel) -> Unit): Int { - val target = binder ?: return -1 - val data = Parcel.obtain() - val reply = Parcel.obtain() - return try { - data.writeInterfaceToken(SOMEIP_TOKEN) - write(data) - check(target.transact(code, data, reply, 0)) { "Unsupported transaction $code" } - reply.readException() - if (returnsValue) reply.readInt() else 0 - } catch (error: Throwable) { - Log.w(TAG, "SOME/IP transaction $code failed", error) - -1 - } finally { - reply.recycle() - data.recycle() - } - } - - private fun sendLocked(payload: ByteArray): Boolean { - if (binder == null) return false - val result = transactLocked(TX_FIRE_EVENT) { - it.writeInt(1) - it.writeLong(HUD_TOPIC) - it.writeLong(System.currentTimeMillis()) - it.writeInt(payload.size) - it.writeByteArray(payload) - } - if (lastSendResult != result) { - Log.i(TAG, "HUD fireEvent result=$result bytes=${payload.size}") - lastSendResult = result - } - if (result != 0) { - if (binder?.isBinderAlive != true) resetBindingLocked() - } - return BydHudProtocol.eventAccepted(result) - } - - private fun resetBindingLocked() { - val appContext = context - if (appContext != null && binding) { - runCatching { appContext.unbindService(connection) } - } - binder = null - binding = false - started = false - showing = false - guidanceSentLogged = false - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudPayload.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudPayload.kt deleted file mode 100644 index dcbd3d3f04..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudPayload.kt +++ /dev/null @@ -1,73 +0,0 @@ -package com.shilapi.xcertplay.hud - -import java.io.ByteArrayOutputStream - -/** Wire shape emitted by BYD HUD's DirectTbtPayload; field order matters to the HUD firmware. */ -internal object BydHudPayload { - private const val MIN_DISTANCE_METERS = 11 // the glass garbles 0..10 m readouts - private const val MAX_TEXT_BYTES = 200 - - fun guidance( - distanceMeters: Int, - maneuver: Int, - icon: ByteArray? = null, - road: String = "", - eta: String = "", - ): ByteArray = - ByteArrayOutputStream(64 + (icon?.size ?: 0)).apply { - // HUD experiment A: match the fixed guidance value observed by BYDMate. - field(2, 2) - field(6, 1) - bytes(7, ByteArray(0)) - bytes(8, icon ?: ByteArray(0)) - field(9, displayDistance(distanceMeters).toLong()) - bytes(10, text(road)) - field(16, 2) - bytes(26, text(eta)) - field(28, maneuver.coerceAtLeast(0).toLong()) - }.toByteArray().wrap() - - fun clear(): ByteArray = ByteArrayOutputStream(12).apply { - field(2, 2) - field(6, 255) - field(16, 1) - }.toByteArray().wrap() - - private fun displayDistance(meters: Int): Int = meters.coerceAtLeast(0).coerceAtLeast(MIN_DISTANCE_METERS) - - private fun text(value: String): ByteArray { - val encoded = value.toByteArray(Charsets.UTF_8) - if (encoded.size <= MAX_TEXT_BYTES) return encoded - // Cut on a character boundary so the HUD never receives a broken UTF-8 sequence. - var end = MAX_TEXT_BYTES - while (end > 0 && (encoded[end].toInt() and 0xc0) == 0x80) end-- - return encoded.copyOf(end) - } - - private fun ByteArrayOutputStream.field(number: Int, value: Long) { - writeVarint(number.toLong() shl 3) - writeVarint(value) - } - - private fun ByteArrayOutputStream.bytes(number: Int, value: ByteArray) { - writeVarint((number.toLong() shl 3) or 2) - writeVarint(value.size.toLong()) - write(value) - } - - private fun ByteArray.wrap(): ByteArray = ByteArrayOutputStream(size + 4).apply { - write(0x0a) - writeVarint(size.toLong()) - write(this@wrap) - }.toByteArray() - - private fun ByteArrayOutputStream.writeVarint(initialValue: Long) { - var value = initialValue - do { - var next = (value and 0x7f).toInt() - value = value ushr 7 - if (value != 0L) next = next or 0x80 - write(next) - } while (value != 0L) - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudProtocol.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudProtocol.kt deleted file mode 100644 index be4f0a406d..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudProtocol.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.shilapi.xcertplay.hud - -/** Shared wire contract; keep DiPlay and DiAuto copies identical apart from their package. */ -internal object BydHudProtocol { - const val SERVICE_TOPIC = 0x000B010A00010000L - const val NAVIGATION_TOPIC = 0x0004010A00018001L - const val REPEAT_MILLIS = 300L - fun serviceStarted(code: Int): Boolean = code == 0 || code == 13 - fun eventAccepted(code: Int): Boolean = code == 0 -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudRouteState.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudRouteState.kt deleted file mode 100644 index 6c709ce24f..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydHudRouteState.kt +++ /dev/null @@ -1,207 +0,0 @@ -package com.shilapi.xcertplay.hud - -internal data class BydHudGuidance( - val distanceMeters: Int, - /** Native HUD arrow (field 28). */ - val maneuver: Int, - /** Gaode maneuver code: selects the HUD icon (field 8). */ - val gaode: Int = 0, - val road: String = "", - val arrivalEpochSeconds: Long? = null, -) - -internal data class BydAppleManeuver( - val distanceMeters: Int, - val type: Int, - val drivingSide: Int, - val road: String = "", - val remainingSeconds: Long? = null, - val remainingMeters: Long? = null, - val arrivalEpochSeconds: Long? = null, -) - -internal enum class BydHudRouteChange { - NONE, - GUIDANCE, - CLEAR, -} - -/** Decodes the iAP2 route-guidance subset needed by the BYD windshield HUD and cluster. */ -internal class BydHudRouteState(private val nanoTime: () -> Long = System::nanoTime) { - private data class Maneuver(val type: Int, val drivingSide: Int, val afterRoad: String) - - private val maneuvers = mutableMapOf() - private var routeActive = false - private var activeIndex = -1 - private var distanceMeters = 0 - private var currentRoad = "" - private var arrivalEpochSeconds: Long? = null - private var remainingSeconds: Long? = null - private var remainingMeters: Long? = null - private var emptyListSinceNs: Long? = null - private var lastRouteUpdateNs: Long? = null - - fun accept(messageId: Int, payload: ByteArray): BydHudRouteChange { - if (!validTlvs(payload)) return BydHudRouteChange.NONE - return when (messageId) { - ROUTE_GUIDANCE_UPDATE -> parseRouteUpdate(payload) - ROUTE_GUIDANCE_MANEUVER_UPDATE -> parseManeuverUpdate(payload) - else -> BydHudRouteChange.NONE - } - } - - fun current(): BydHudGuidance? { - val maneuver = activeManeuver() ?: return null - val gaode = BydManeuverCodes.gaode(maneuver.type, maneuver.drivingSide) - return BydHudGuidance( - distanceMeters = distanceMeters, - maneuver = BydManeuverCodes.hudArrow(gaode), - gaode = gaode, - road = roadFor(maneuver), - arrivalEpochSeconds = arrivalEpochSeconds, - ) - } - - /** Next maneuver as Apple sent it, for outputs with a richer icon set than the HUD. */ - fun currentApple(): BydAppleManeuver? { - val maneuver = activeManeuver() ?: return null - return BydAppleManeuver( - distanceMeters, maneuver.type, maneuver.drivingSide, - roadFor(maneuver), remainingSeconds, remainingMeters, arrivalEpochSeconds, - ) - } - - fun clear(): Boolean { - val wasActive = routeActive - routeActive = false - activeIndex = -1 - distanceMeters = 0 - currentRoad = "" - arrivalEpochSeconds = null - remainingSeconds = null - remainingMeters = null - emptyListSinceNs = null - lastRouteUpdateNs = null - maneuvers.clear() - return wasActive - } - - private fun activeManeuver(): Maneuver? { - if (!routeActive || activeIndex < 0) return null - val updated = lastRouteUpdateNs ?: return null - if (nanoTime() - updated >= STALE_ROUTE_NS) return null - val emptySince = emptyListSinceNs - if (emptySince != null && nanoTime() - emptySince >= EMPTY_LIST_HIDE_NS) return null - return maneuvers[activeIndex] - } - - // The road the driver turns onto is what the next instruction is about; fall back to the current one. - private fun roadFor(maneuver: Maneuver): String = maneuver.afterRoad.ifEmpty { currentRoad } - - private fun parseRouteUpdate(data: ByteArray): BydHudRouteChange { - lastRouteUpdateNs = nanoTime() - var state: Int? = null - var distance: Int? = null - var firstManeuver: Int? = null - var listPresent = false - forEachTlv(data) { type, value, valueLength -> - when { - type == 0x01 && valueLength >= 1 -> state = data[value].toInt() and 0xff - type == 0x03 -> currentRoad = utf8(data, value, valueLength) - type == 0x05 && valueLength >= 8 -> arrivalEpochSeconds = u64(data, value).takeIf { it > 0 } - type == 0x06 && valueLength >= 8 -> remainingSeconds = u64(data, value).takeIf { it >= 0 } - type == 0x07 && valueLength >= 4 -> remainingMeters = u32(data, value) - type == 0x0a && valueLength >= 4 -> { - distance = u32(data, value).coerceAtMost(Int.MAX_VALUE.toLong()).toInt() - } - type == 0x0d -> { - listPresent = true - if (valueLength >= 2) firstManeuver = u16(data, value) - } - } - } - - // Only NoRouteSet (0) and Arrived (2) end the route. - if (state == 0 || state == 2) { - return if (clear()) BydHudRouteChange.CLEAR else BydHudRouteChange.NONE - } - // The iPhone briefly sends an empty current list every few seconds and while rerouting. Keep the last - // maneuver (and the cached 0x5202 details, which are never resent) and hide it only if the list stays - // empty; the bridges' 1 s tick clears the outputs once current() turns null. - if (listPresent && firstManeuver == null) { - if (emptyListSinceNs == null) emptyListSinceNs = nanoTime() - return BydHudRouteChange.NONE - } - if (firstManeuver != null) emptyListSinceNs = null - if (state != null) routeActive = true - if (firstManeuver != null) { - activeIndex = firstManeuver!! - routeActive = true - } - if (distance != null) distanceMeters = distance!!.coerceAtLeast(0) - return if (current() != null) BydHudRouteChange.GUIDANCE else BydHudRouteChange.NONE - } - - private fun parseManeuverUpdate(data: ByteArray): BydHudRouteChange { - var index: Int? = null - var type: Int? = null - var drivingSide = 0 - var afterRoad = "" - forEachTlv(data) { id, value, valueLength -> - when { - id == 0x01 && valueLength >= 2 -> index = u16(data, value) - id == 0x03 && valueLength >= 1 -> type = data[value].toInt() and 0xff - id == 0x04 -> afterRoad = utf8(data, value, valueLength) - id == 0x08 && valueLength >= 1 -> drivingSide = data[value].toInt() and 0xff - } - } - if (index != null && type != null) maneuvers[index!!] = Maneuver(type!!, drivingSide, afterRoad) - return if (current() != null) BydHudRouteChange.GUIDANCE else BydHudRouteChange.NONE - } - - private inline fun forEachTlv(data: ByteArray, block: (Int, Int, Int) -> Unit) { - var offset = 0 - while (offset < data.size) { - val length = u16(data, offset) - block(u16(data, offset + 2), offset + TLV_HEADER_BYTES, length - TLV_HEADER_BYTES) - offset += length - } - } - - private fun validTlvs(data: ByteArray): Boolean { - var offset = 0 - while (offset < data.size) { - if (offset + TLV_HEADER_BYTES > data.size) return false - val length = u16(data, offset) - if (length < TLV_HEADER_BYTES || length > data.size - offset) return false - offset += length - } - return offset == data.size - } - - private fun u16(data: ByteArray, offset: Int): Int = - ((data[offset].toInt() and 0xff) shl 8) or (data[offset + 1].toInt() and 0xff) - - private fun u32(data: ByteArray, offset: Int): Long = - ((data[offset].toLong() and 0xff) shl 24) or - ((data[offset + 1].toLong() and 0xff) shl 16) or - ((data[offset + 2].toLong() and 0xff) shl 8) or - (data[offset + 3].toLong() and 0xff) - - private fun u64(data: ByteArray, offset: Int): Long = (u32(data, offset) shl 32) or u32(data, offset + 4) - - // iAP2 utf8 parameters are NUL-terminated. - private fun utf8(data: ByteArray, offset: Int, length: Int): String { - var end = offset - while (end < offset + length && data[end] != 0.toByte()) end++ - return String(data, offset, end - offset, Charsets.UTF_8).trim() - } - - companion object { - const val ROUTE_GUIDANCE_UPDATE = 0x5201 - const val ROUTE_GUIDANCE_MANEUVER_UPDATE = 0x5202 - private const val TLV_HEADER_BYTES = 4 - private const val STALE_ROUTE_NS = 30_000_000_000L - private const val EMPTY_LIST_HIDE_NS = 3_000_000_000L - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydManeuverCodes.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydManeuverCodes.kt deleted file mode 100644 index 7c21e738bd..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydManeuverCodes.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.shilapi.xcertplay.hud - -/** - * Apple iAP2 RouteGuidanceManeuverType -> Gaode maneuver code, the vocabulary of the BYD HUD - * icon set (assets/byd-hud-icons/0x.png) and of the native HUD arrow. - */ -internal object BydManeuverCodes { - const val NONE = 0 - const val LEFT = 1 - const val RIGHT = 2 - const val SLIGHT_LEFT = 3 - const val SLIGHT_RIGHT = 4 - const val SHARP_LEFT = 7 - const val SHARP_RIGHT = 8 - const val U_TURN_LEFT = 9 - const val U_TURN_RIGHT = 10 - const val STRAIGHT = 11 - const val ROUNDABOUT_ENTER = 13 - const val ROUNDABOUT_EXIT = 24 - const val DESTINATION = 48 - - private const val ROUNDABOUT_EXIT_BASE = 24 // + exit 1..10, right-hand traffic - private const val ROUNDABOUT_EXIT_BASE_LEFT_HAND = 34 // + exit 1..10, left-hand traffic - - /** [drivingSide] 1 is Apple's left-hand driving. */ - fun gaode(appleType: Int, drivingSide: Int): Int { - val leftHand = drivingSide == 1 - if (appleType in 28..46) { - val exit = appleType - 27 - return when { - exit > 10 -> ROUNDABOUT_ENTER - leftHand -> ROUNDABOUT_EXIT_BASE_LEFT_HAND + exit - else -> ROUNDABOUT_EXIT_BASE + exit - } - } - return when (appleType) { - 1, 20 -> LEFT - 2, 21 -> RIGHT - 47 -> SHARP_LEFT - 48 -> SHARP_RIGHT - 13, 22, 49, 52 -> SLIGHT_LEFT - 14, 23, 50, 53 -> SLIGHT_RIGHT - 4, 18, 19, 26 -> if (leftHand) U_TURN_RIGHT else U_TURN_LEFT - 6 -> ROUNDABOUT_ENTER - 7 -> ROUNDABOUT_EXIT - 10, 12, 24, 25, 27 -> DESTINATION - 3, 5, 8, 9, 11, 51 -> STRAIGHT - else -> NONE - } - } - - /** - * Native HUD arrow (field 28): 1 left, 2 right, 3 slight left, 5 slight right, 7/8 U-turn, - * 11 straight, 99 blank. Anything else renders as a phantom left arrow, so glyph-less - * maneuvers (roundabouts, destination) are blank and rely on the field-8 icon; 0 clears. - */ - fun hudArrow(gaode: Int): Int = when (gaode) { - NONE -> 0 - LEFT, SHARP_LEFT -> 1 - RIGHT, SHARP_RIGHT -> 2 - SLIGHT_LEFT -> 3 - SLIGHT_RIGHT -> 5 - U_TURN_LEFT -> 7 - U_TURN_RIGHT -> 8 - STRAIGHT -> 11 - else -> 99 - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydNavigationOutputs.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydNavigationOutputs.kt deleted file mode 100644 index a1102f78bf..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydNavigationOutputs.kt +++ /dev/null @@ -1,67 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context -import com.shilapi.xcertplay.iap2.wire.Iap2Frame - -/** Nonblocking boundary between phone control messages and vendor services. */ -object BydNavigationOutputs { - /** Recover a journaled interrupted output when the app opens, even before a phone reconnects. */ - fun onAppOpened(context: Context) { - if (BydStandaloneHudOutput.available(context)) start(context) - // Read the battery early, so a reading is ready when CarPlay identifies (see batteryStatus). - if (BydOutputSettings.batteryToIphone(context)) BydBatteryStatus.start(context) - } - fun setDiagnosticHold(hold: Boolean) { BydStandaloneHudOutput.syntheticHold = hold } - @Volatile private var useStandalone = false - private val standalone = NavigationOutputWorker("diplay-standalone-output", BydStandaloneNavigationBridge::clear) - private val hud = NavigationOutputWorker("diplay-hud-output", BydHudBridge::clear) - private val cluster = NavigationOutputWorker("diplay-cluster-output", BydClusterBridge::clear) - - /** The host reports whether its CarPlay map window is on the cluster (see [BydClusterMapPause]). */ - fun setClusterMapShown(shown: Boolean) { BydClusterMapPause.clusterMapShown = shown } - - /** The running CarPlay session: told every second whether the cluster currently shows the map. */ - fun setClusterStreamControl(control: (Boolean) -> Unit) { BydClusterMapPause.streamControl = control } - - fun clearClusterStreamControl(control: (Boolean) -> Unit) { - if (BydClusterMapPause.streamControl == control) BydClusterMapPause.streamControl = null - } - - /** - * The car's battery for the iPhone's vehicle status; starts reading it over adb. The electric - * vehicle is declared only once a reading is there (see withVehicleStatusFrom). - */ - fun batteryStatus(context: Context): com.shilapi.xcertplay.transport.VehicleStatusProvider = - BydBatteryStatus.also { it.start(context) } - - /** The car's wheel speed and gear for the iPhone's dead reckoning; read over adb while asked for. */ - fun wheelSpeed(context: Context): com.shilapi.xcertplay.transport.VehicleSpeedSource = - BydWheelSpeedSource.attach(context) - /** Whether the car is in P (read over adb), or null when it cannot tell. Blocking. */ - fun parked(context: Context): Boolean? = BydParkedState.parked(context.applicationContext) - - fun start(context: Context) { - val app = context.applicationContext - useStandalone = BydStandaloneHudOutput.available(app) - if (useStandalone) standalone.start { BydStandaloneNavigationBridge.initialize(app) } - else { - hud.start { BydHudBridge.initialize(app) } - cluster.start { BydClusterBridge.initialize(app) } - } - BydClusterMapPause.initialize(app) - } - - internal fun onFrame(frame: Iap2Frame) { - if (frame.messageId != BydHudRouteState.ROUTE_GUIDANCE_UPDATE && - frame.messageId != BydHudRouteState.ROUTE_GUIDANCE_MANEUVER_UPDATE) return - val owned = frame // Iap2Frame is immutable and defensively copies its payload. - if (useStandalone) standalone.submit { BydStandaloneNavigationBridge.onFrame(owned) } - else { - hud.submit { BydHudBridge.onFrame(owned) } - cluster.submit { BydClusterBridge.onFrame(owned) } - } - } - - /** Best effort while alive; Android does not guarantee callbacks before force-stop. */ - fun endNow() { standalone.clear(); hud.clear(); cluster.clear() } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydOutputSettings.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydOutputSettings.kt deleted file mode 100644 index 73524e4a33..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydOutputSettings.kt +++ /dev/null @@ -1,72 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context -import com.shilapi.xcertplay.transport.EvChargingConnectors - -/** - * One user switch for BYD navigation output. On the tested car the windshield HUD mirrors what the - * instrument cluster receives, so separate HUD/cluster switches cannot behave independently. - */ -object BydOutputSettings { - private const val PREFS = "diplay_byd_outputs" - private const val KEY_ENABLED = "navigation_enabled" - private const val KEY_CLUSTER_STREAM_PAUSE = "cluster_stream_pause" - private const val KEY_BATTERY_TO_IPHONE = "battery_to_iphone" - private const val KEY_LOW_CHARGE_PERCENT = "low_charge_percent" - private const val KEY_CHARGING_CONNECTORS = "charging_connectors" - private const val KEY_WHEEL_SPEED_TO_IPHONE = "wheel_speed_to_iphone" - private const val KEY_VIDEO_WHILE_PARKED = "video_while_parked" - const val DEFAULT_LOW_CHARGE_PERCENT = 20 - val lowChargePresets = listOf(10, 15, 20, 25, 30) - - fun enabled(context: Context): Boolean = prefs(context).getBoolean(KEY_ENABLED, true) - - fun setEnabled(context: Context, enabled: Boolean) = prefs(context).edit().putBoolean(KEY_ENABLED, enabled).apply() - - /** Ask the iPhone to stop drawing the cluster map while the cluster hides it (needs ADB over network). */ - fun clusterStreamPause(context: Context): Boolean = prefs(context).getBoolean(KEY_CLUSTER_STREAM_PAUSE, false) - - fun setClusterStreamPause(context: Context, enabled: Boolean) = - prefs(context).edit().putBoolean(KEY_CLUSTER_STREAM_PAUSE, enabled).apply() - - /** Tell the iPhone the car's charge and range (needs ADB over network); applies on the next connection. */ - fun batteryToIphone(context: Context): Boolean = prefs(context).getBoolean(KEY_BATTERY_TO_IPHONE, false) - - fun setBatteryToIphone(context: Context, enabled: Boolean) = - prefs(context).edit().putBoolean(KEY_BATTERY_TO_IPHONE, enabled).apply() - - /** The charging inlets the iPhone is told about; applies on the next connection. */ - fun chargingConnectors(context: Context): EvChargingConnectors = - prefs(context).getString(KEY_CHARGING_CONNECTORS, null) - ?.let { saved -> EvChargingConnectors.entries.firstOrNull { it.name == saved } } - ?: EvChargingConnectors.CCS2_TYPE2 - - fun setChargingConnectors(context: Context, connectors: EvChargingConnectors) = - prefs(context).edit().putString(KEY_CHARGING_CONNECTORS, connectors.name).apply() - - /** Send wheel speed and gear with the car's GPS (needs ADB over network); applies on the next connection. */ - fun wheelSpeedToIphone(context: Context): Boolean = prefs(context).getBoolean(KEY_WHEEL_SPEED_TO_IPHONE, false) - - fun setWheelSpeedToIphone(context: Context, enabled: Boolean) = - prefs(context).edit().putBoolean(KEY_WHEEL_SPEED_TO_IPHONE, enabled).apply() - /** Offer iOS 27 video in car, played only while the gear reads P (needs ADB over network). */ - fun videoWhileParked(context: Context): Boolean = prefs(context).getBoolean(KEY_VIDEO_WHILE_PARKED, false) - - fun setVideoWhileParked(context: Context, enabled: Boolean) = - prefs(context).edit().putBoolean(KEY_VIDEO_WHILE_PARKED, enabled).apply() - - /** At or below this charge the iPhone gets the low-range warning. */ - fun lowChargePercent(context: Context): Int = prefs(context).getInt(KEY_LOW_CHARGE_PERCENT, DEFAULT_LOW_CHARGE_PERCENT) - - fun setLowChargePercent(context: Context, percent: Int) = - prefs(context).edit().putInt(KEY_LOW_CHARGE_PERCENT, percent).apply() - - /** Whether the head unit has a BYD navigation receiver, so settings can hide a switch that cannot work. */ - fun available(context: Context): Boolean = - BydStandaloneHudOutput.available(context) || installed(context, "com.byd.amapservice") || installed(context, "com.ts.car.someip.service") - - private fun installed(context: Context, pkg: String): Boolean = - runCatching { context.packageManager.getPackageInfo(pkg, 0) }.isSuccess - - private fun prefs(context: Context) = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE) -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydParkedState.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydParkedState.kt deleted file mode 100644 index df34e24035..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydParkedState.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context - -/** - * Whether the car is in P, read through the adb shell (autoservice binder) where apps would need a - * BYD signature. The id is BYD SDK 1.0.5's gearbox device: 1 P, 2 R, 3 N, 4 D. - */ -internal object BydParkedState { - const val GEAR = "service call autoservice 5 i32 1011 i32 555745336" - private const val PARK = 1 - - private val shell = BydAdbShell("DiPlay-BYD-Parked") - - /** Null when the gear cannot be read (no ADB over network, or another car). Blocking. */ - fun parked(context: Context): Boolean? = parked(shell.run(context, GEAR)) - - fun parked(output: String?): Boolean? = BydParcel.value(output)?.takeIf { it in 1..4 }?.let { it == PARK } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneHudOutput.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneHudOutput.kt deleted file mode 100644 index 38efe04fed..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneHudOutput.kt +++ /dev/null @@ -1,67 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.ComponentName -import android.content.Context -import android.content.Intent -import android.content.pm.ApplicationInfo -import android.content.pm.PackageManager -import android.os.Build -import android.os.Process -import android.util.Log -import java.security.MessageDigest - -/** Ordinary-app IPC to the real stock receiver. No shell, local socket or permission grant. */ -internal class BydStandaloneHudOutput private constructor(context: Context) { - private val app = context.applicationContext - private val prefs = app.getSharedPreferences("byd_standalone_hud", Context.MODE_PRIVATE) - private val session = BydStandaloneSession( - send = { packet -> - app.sendBroadcast(Intent("byd.hud.NAVIGATION").setComponent(TARGET) - .putExtra("normal", packet).addFlags(Intent.FLAG_RECEIVER_FOREGROUND)) - Log.d(TAG, "dispatch uid=${Process.myUid()} bytes=${packet.split(',').size}") - }, - rememberPendingClear = { pending -> - check(prefs.edit().putBoolean("pending_clear", pending).commit()) { "Cannot persist HUD cleanup" } - }, - needsRecovery = prefs.getBoolean("pending_clear", false), - ) - - init { - Log.i(TAG, "Standalone navigation ready uid=${Process.myUid()} helper=none") - // Retain the journal if dispatch fails; the next scheduled tick retries. - runCatching { session.clear() }.onFailure { Log.w(TAG, "Startup clear will retry", it) } - } - - fun update(icon: Int, exit: Int, distanceMeters: Int, road: String) = - session.update(icon, exit, distanceMeters, road) - fun clear() = session.clear() - - companion object { - private const val TAG = "BYD-Standalone-Live" - private val TARGET = ComponentName("com.byd.clusterdebug", "com.byd.clusterdebug.BroadcastReceiverCAN") - @Volatile var syntheticHold = false - - fun create(context: Context): BydStandaloneHudOutput? = - if (available(context)) BydStandaloneHudOutput(context) else null - - /** Enable production and diagnostic packages only on the physically tested firmware. */ - fun available(context: Context): Boolean { - if (Build.VERSION.SDK_INT < 28 || context.packageName !in setOf( - "com.andrerinas.headunitrevived", "com.shihab.diplay", - "com.andrerinas.headunitrevived.bydhudtest", "com.shihab.diplay.hudtest")) return false - if (Build.FINGERPRINT != "BYD-AUTO/IVI/IVI:13/TP1A.220624.014/eng.build20260722.221155:user/release-keys") return false - return runCatching { - val manager = context.packageManager - val info = manager.getPackageInfo(TARGET.packageName, PackageManager.GET_SIGNING_CERTIFICATES) - val receiver = manager.getReceiverInfo(TARGET, 0) - val signers = info.signingInfo?.apkContentsSigners ?: return false - info.longVersionCode == 10601004L && - info.applicationInfo!!.flags and ApplicationInfo.FLAG_SYSTEM != 0 && - receiver.enabled && receiver.exported && receiver.permission.isNullOrEmpty() && - signers.size == 1 && MessageDigest.getInstance("SHA-256").digest(signers[0].toByteArray()) - .joinToString("") { "%02x".format(it.toInt() and 255) } == - "efe3ca8ada0d10c655c3df9910ad2ebc121a47d9a6358434eb24074309933efc" - }.getOrDefault(false) - } - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneNavigationBridge.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneNavigationBridge.kt deleted file mode 100644 index e3e5aa9be2..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneNavigationBridge.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context -import android.util.Log -import com.shilapi.xcertplay.iap2.wire.Iap2Frame -import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit - -internal object BydStandaloneNavigationBridge { - private val lock = Any() - private val route = BydHudRouteState() - private var context: Context? = null - private var output: BydStandaloneHudOutput? = null - private var started = false - - fun initialize(appContext: Context) = synchronized(lock) { - context = appContext.applicationContext - if (output == null) output = BydStandaloneHudOutput.create(appContext) - if (output != null && !started) { - started = true - Executors.newSingleThreadScheduledExecutor { task -> - Thread(task, "diplay-standalone-navi").apply { isDaemon = true } - }.scheduleWithFixedDelay(::tick, 0, 500, TimeUnit.MILLISECONDS) - } - } - - fun onFrame(frame: Iap2Frame) = synchronized(lock) { - route.accept(frame.messageId, frame.payload) - Unit - } - - fun clear() = synchronized(lock) { - route.clear() // A keepalive must never resurrect ended guidance. - output?.clear() - Unit - } - - private fun tick() = synchronized(lock) { - if (BydStandaloneHudOutput.syntheticHold) return@synchronized - try { - val frame = if (context?.let(BydOutputSettings::enabled) == true) - route.currentApple()?.let(BydClusterFrame::from) else null - if (frame == null) output?.clear() - else output?.update(frame.icon, frame.roundaboutExit, frame.distanceMeters, frame.road) - } catch (error: Exception) { - Log.w("DiPlay-Standalone", "HUD update/cleanup will retry", error) - } - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandalonePackets.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandalonePackets.kt deleted file mode 100644 index 21b4396dff..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandalonePackets.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.shilapi.xcertplay.hud - -/** Navigation records traced from the installed IVI HAL; no arbitrary feature input. */ -object BydStandalonePackets { - const val MAX_DISTANCE_METERS = 16777214 - fun start(): String = "43,E0,00,3A,01,02" - fun clear(): String = "43,E0,00,3A,01,01" - fun guidance(icon: Int, exit: Int, distanceMeters: Int, road: String? = null): String? { - val turn = BydFactoryTurnCode.map(icon, exit) ?: return null - if (distanceMeters !in 0..MAX_DISTANCE_METERS) return null - return (record(0x43F01018, distanceMeters) + record(0x43F01010, turn) + - record(0x43F01030, turn)).toHex() + (road?.let { "," + streetName(it) } ?: "") - } - /** Exact non-RCS encodeReqSplitString format from the inspected IVI HAL. - * The HAL caps this feature at 96 bytes. Each record carries seven content bytes, - * a sequence byte, and the original feature incremented by 0x1000. - */ - fun streetName(road: String): String { - val text = buildString { - var index = 0 - while (index < road.length && length < 48) { - val char = road[index++] - when { - char.isHighSurrogate() -> { - if (index < road.length && road[index].isLowSurrogate()) { - if (length > 46) break - append(char).append(road[index++]) - } - } - char.isLowSurrogate() -> Unit - char.isISOControl() || char.isWhitespace() -> append(' ') - else -> append(char) - } - } - }.trim().ifEmpty { " " } // setString rejects zero bytes; a space replaces stale text. - val bytes = text.toByteArray(Charsets.UTF_16LE) - val contentSize = bytes.size + 2 - val content = ByteArray(((contentSize + 6) / 7) * 7) { 0xFF.toByte() } - content[0] = bytes.size.toByte() - bytes.copyInto(content, 1) - content[bytes.size + 1] = bytes.sumOf { it.toInt() and 255 }.toByte() - val packet = ByteArray(content.size / 7 * 13) - for (index in 0 until content.size / 7) { - val feature = 0x43FA1008 + (index shl 12) - val offset = index * 13 - packet[offset] = (feature ushr 24).toByte() - packet[offset + 1] = (feature ushr 16).toByte() - packet[offset + 2] = (feature ushr 8).toByte() - packet[offset + 3] = feature.toByte() - packet[offset + 4] = 8 - packet[offset + 5] = (feature ushr 12).toByte() - content.copyInto(packet, offset + 6, index * 7, (index + 1) * 7) - } - return packet.toHex() - } - private fun ByteArray.toHex(): String = joinToString(",") { "%02X".format(it.toInt() and 255) } - - private fun record(feature: Int, value: Int): ByteArray = byteArrayOf( - (feature ushr 24).toByte(), (feature ushr 16).toByte(), - (feature ushr 8).toByte(), feature.toByte(), 4, - (value ushr 24).toByte(), (value ushr 16).toByte(), - (value ushr 8).toByte(), value.toByte(), - ) -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneSession.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneSession.kt deleted file mode 100644 index 992a61e45d..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydStandaloneSession.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.shilapi.xcertplay.hud - -/** Single-worker lifecycle; all vehicle writes and persistence stay off the phone thread. */ -internal class BydStandaloneSession( - private val send: (String) -> Unit, - private val rememberPendingClear: (Boolean) -> Unit, - needsRecovery: Boolean = false, - private val nanoTime: () -> Long = System::nanoTime, -) { - private var showing = needsRecovery - private var recovering = needsRecovery - private var lastPacket: String? = null - private var lastSendNs = 0L - - fun update(icon: Int, exit: Int, distanceMeters: Int, road: String? = null) { - if (recovering) clear() - val packet = BydStandalonePackets.guidance(icon, exit, distanceMeters, road) - if (packet == null) { clear(); return } - try { - if (!showing) { - // Commit before publishing a start, so the next app launch can recover a crash. - rememberPendingClear(true) - showing = true - send(BydStandalonePackets.start()) - } - val now = nanoTime() - if (lastPacket != packet || now - lastSendNs >= 1_000_000_000L) { - send(packet) - lastPacket = packet - lastSendNs = now - } - } catch (error: Exception) { - // A failed update may follow a successful start; clear before trying again. - recovering = showing - runCatching { clear() } - throw error - } - } - - fun clear() { - if (!showing) return - recovering = true - send(BydStandalonePackets.clear()) - // sendBroadcast returning is dispatch success, not hardware acknowledgement. - rememberPendingClear(false) - showing = false - recovering = false - lastPacket = null - lastSendNs = 0L - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydStarterBridge.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydStarterBridge.kt deleted file mode 100644 index be610d4353..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydStarterBridge.kt +++ /dev/null @@ -1,120 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context -import java.net.Socket -import java.net.InetSocketAddress -import android.os.SystemClock -import android.util.Log -import java.io.DataInputStream -import java.io.DataOutputStream -import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit - -/** Test-only client of the user's explicitly ADB-started, navigation-only local bridge. */ -object BydStarterBridge { - private const val TAG = "BYD-Starter-Bridge" - private const val MAGIC = 0x42594431 - private data class Frame(val turn: Int, val distance: Int, val receivedMs: Long) - @Volatile private var latest: Frame? = null - @Volatile private var demoStartMs: Long? = null - @Volatile private var token: ByteArray? = null - private var started = false - private var socket: Socket? = null - private var output: DataOutputStream? = null - private var input: DataInputStream? = null - private var retryAfterMs = 0L - private var lastNotice: String? = null - - @Synchronized fun initialize(context: Context) { - if (context.packageName !in setOf("com.andrerinas.headunitrevived.bydhudtest", "com.shihab.diplay.hudtest") || started) return - val saved = context.getSharedPreferences("hud_starter", Context.MODE_PRIVATE).getString("token", null) - token = decodeToken(saved) - started = true - Executors.newSingleThreadScheduledExecutor { task -> - Thread(task, "byd-starter-client").apply { isDaemon = true } - }.scheduleWithFixedDelay(::tick, 0, 500, TimeUnit.MILLISECONDS) - } - - @Synchronized fun configure(context: Context, secret: String) { - check(context.packageName in setOf("com.andrerinas.headunitrevived.bydhudtest", "com.shihab.diplay.hudtest")) - val parsed = requireNotNull(decodeToken(secret)) { "Invalid starter token" } - context.getSharedPreferences("hud_starter", Context.MODE_PRIVATE).edit().putString("token", secret).apply() - initialize(context) - token = parsed - Log.i(TAG, "Temporary starter credentials received") - } - - private fun decodeToken(secret: String?): ByteArray? = secret?.takeIf { it.matches(Regex("[0-9a-f]{64}")) } - ?.let { value -> ByteArray(32) { value.substring(it * 2, it * 2 + 2).toInt(16).toByte() } } - - fun update(icon: Int, exit: Int, distance: Int) { - val turn = BydFactoryTurnCode.map(icon, exit) - latest = if (turn != null && distance in 0..16777214) Frame(turn, distance, SystemClock.elapsedRealtime()) else null - } - - fun clear(cancelDemo: Boolean = true) { latest = null; if (cancelDemo) demoStartMs = null } - - /** Called only by the DUMP-protected debug receiver after the parked-demo request. */ - fun demonstrate(context: Context) { - initialize(context) - demoStartMs = SystemClock.elapsedRealtime() - Log.i(TAG, "Parked demo requested: left 500m, right 800m, then clear") - } - - private fun tick() { - try { - val now = SystemClock.elapsedRealtime() - val demo = demoStartMs - val frame = if (demo != null) { - when { - now - demo < 8_000 -> Frame(1, 500, now) - now - demo < 16_000 -> Frame(2, 800, now) - now - demo < 20_000 -> null // Explicitly show cleanup before resuming phone guidance. - else -> { demoStartMs = null; null } - } - } else latest?.takeIf { now - it.receivedMs < 6_000 } - if (frame == null) { - if (socket != null) { - send(0, 0, 0) - notice("Guidance cleared") - close() - } - return - } - if (socket == null) { - if (now < retryAfterMs) return - val secret = token ?: return - val next = Socket() - try { - next.connect(InetSocketAddress("127.0.0.1", 42671), 1_000) - next.soTimeout = 1_500 - output = DataOutputStream(next.outputStream).also { it.write(secret); it.flush() } - input = DataInputStream(next.inputStream) - socket = next - } catch (error: Exception) { next.close(); throw error } - } - send(1, frame.turn, frame.distance) - notice("Connected to ADB starter; navigation writes acknowledged") - } catch (error: Exception) { - close() // EOF makes the helper clear any guidance it owns. - retryAfterMs = SystemClock.elapsedRealtime() + 3_000 - notice("Waiting for ADB starter (${error.javaClass.simpleName}: ${error.message})") - } - } - - private fun send(operation: Int, turn: Int, distance: Int) { - val out = checkNotNull(output) - out.writeInt(MAGIC); out.writeInt(operation); out.writeInt(turn); out.writeInt(distance); out.flush() - val result = checkNotNull(input).readInt() - check(result == 0) { "Starter rejected command: $result" } - } - - private fun close() { - try { socket?.close() } catch (_: Exception) { } - socket = null; input = null; output = null - } - - private fun notice(message: String) { - if (message != lastNotice) { Log.i(TAG, message); lastNotice = message } - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/BydWheelSpeed.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/BydWheelSpeed.kt deleted file mode 100644 index c5e36928e3..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/BydWheelSpeed.kt +++ /dev/null @@ -1,105 +0,0 @@ -package com.shilapi.xcertplay.hud - -import android.content.Context -import android.os.SystemClock -import android.util.Log -import com.shilapi.xcertplay.transport.VehicleGear -import com.shilapi.xcertplay.transport.VehicleSpeedReading -import com.shilapi.xcertplay.transport.VehicleSpeedSample -import com.shilapi.xcertplay.transport.VehicleSpeedSource -import java.util.concurrent.Executors -import java.util.concurrent.ScheduledExecutorService -import java.util.concurrent.TimeUnit - -/** - * Speed and gear through the adb shell (autoservice binder), where apps would need a BYD signature. - * The ids are BYD SDK 1.0.5's speed (km/h) and gearbox devices; on DiLink 5.0 they read 0.0 and 1 - * while parked. - */ -internal object BydWheelSpeed { - const val SPEED = "service call autoservice 7 i32 1013 i32 -1807745016" // float km/h - const val GEAR = "service call autoservice 5 i32 1011 i32 555745336" // 1 P, 2 R, 3 N, 4 D - - fun metersPerSecond(output: String?): Double? { - val kmh = BydParcel.value(output)?.let { java.lang.Float.intBitsToFloat(it).toDouble() } ?: return null - return if (kmh in 0.0..300.0) kmh / 3.6 else null - } - - fun gear(output: String?): VehicleGear? = when (BydParcel.value(output)) { - 1 -> VehicleGear.PARK - 2 -> VehicleGear.REVERSE - 3 -> VehicleGear.NEUTRAL - 4 -> VehicleGear.DRIVE - else -> null - } -} - -/** - * Optional, needs ADB over network: wheel speed for the iPhone's dead reckoning in tunnels. Reads the - * speed four times a second and the gear once a second, only while the iPhone asks for location. - */ -internal object BydWheelSpeedSource : VehicleSpeedSource { - private const val TAG = "DiPlay-BYD-Speed" - private const val READ_MILLIS = 250L - private const val GEAR_EVERY_READS = 4 - private const val MAX_SAMPLES = 40 - - private val shell = BydAdbShell(TAG) - private var context: Context? = null - private var executor: ScheduledExecutorService? = null - private val samples = ArrayList() - private var gear: VehicleGear? = null - private var reads = 0 - private var firstSampleLogged = false - - fun attach(appContext: Context) = apply { context = appContext.applicationContext } - - @Synchronized - override fun start() { - if (executor != null) return - samples.clear() - gear = null - reads = 0 - firstSampleLogged = false - executor = Executors.newSingleThreadScheduledExecutor { runnable -> - Thread(runnable, "diplay-wheel-speed").apply { isDaemon = true } - }.also { it.scheduleWithFixedDelay(::poll, 0, READ_MILLIS, TimeUnit.MILLISECONDS) } - Log.i(TAG, "wheel speed started") - } - - override fun stop() { - val running = synchronized(this) { executor.also { executor = null } } ?: return - // Close adb on the reader thread, after any read in flight, then let the thread end. - running.execute { shell.close() } - running.shutdown() - Log.i(TAG, "wheel speed stopped") - } - - @Synchronized - override fun drain(): VehicleSpeedReading? { - val current = gear ?: return null - if (samples.isEmpty()) return null - return VehicleSpeedReading(current, samples.toList()).also { samples.clear() } - } - - private fun poll() { - val app = context ?: return - if (reads++ % GEAR_EVERY_READS == 0) { - BydWheelSpeed.gear(shell.run(app, BydWheelSpeed.GEAR))?.let { next -> - val changed = synchronized(this) { (gear != next).also { gear = next } } - if (changed) Log.i(TAG, "gear $next") - } - } - val before = SystemClock.elapsedRealtime() - val speed = BydWheelSpeed.metersPerSecond(shell.run(app, BydWheelSpeed.SPEED)) ?: return - val sample = VehicleSpeedSample((before + SystemClock.elapsedRealtime()) / 2, speed) - synchronized(this) { - if (samples.size == MAX_SAMPLES) samples.removeAt(0) - samples += sample - } - if (!firstSampleLogged) { - firstSampleLogged = true - Log.i(TAG, "first wheel speed ${"%.1f".format(speed * 3.6)} km/h") - } - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/hud/NavigationOutputWorker.kt b/shared/src/main/java/com/shilapi/xcertplay/hud/NavigationOutputWorker.kt deleted file mode 100644 index 917b8a0b9d..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/hud/NavigationOutputWorker.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.shilapi.xcertplay.hud - -import java.util.concurrent.ArrayBlockingQueue -import java.util.concurrent.ThreadPoolExecutor -import java.util.concurrent.TimeUnit - -/** Each output owns a worker: a blocked vendor service cannot block the phone or the other output. */ -internal class NavigationOutputWorker(name: String, private val clearOutput: () -> Unit) { - private val executor = ThreadPoolExecutor(1, 1, 0, TimeUnit.MILLISECONDS, - ArrayBlockingQueue(128), { task -> Thread(task, name).apply { isDaemon = true } }) - private var accepting = false - - @Synchronized fun start(initialize: () -> Unit) { - if (accepting) return - accepting = true - executor.queue.clear() - executor.execute { runCatching { clearOutput(); initialize() } } - } - - @Synchronized fun submit(action: () -> Unit) { - if (!accepting) return - try { - executor.execute { runCatching(action) } - } catch (_: java.util.concurrent.RejectedExecutionException) { - // Incremental protocol frames cannot safely be dropped individually. Stop this output - // until the next session, and clear after any in-flight vendor call returns. - clear() - } - } - - @Synchronized fun clear() { - accepting = false - executor.queue.clear() - executor.execute { runCatching(clearOutput) } - } -} diff --git a/shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayController.kt b/shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayController.kt index 90e6b6ebca..06021d52a6 100644 --- a/shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayController.kt +++ b/shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayController.kt @@ -27,8 +27,6 @@ import com.shilapi.xcertplay.airplay.AirPlayMediaHandler import com.shilapi.xcertplay.airplay.AirPlaySession import com.shilapi.xcertplay.airplay.AirPlaySessionListener import com.shilapi.xcertplay.airplay.PairingStore -import com.shilapi.xcertplay.airplay.VideoInCar -import com.shilapi.xcertplay.hud.BydNavigationOutputs import com.shilapi.xcertplay.iap2.session.Iap2Session import com.shilapi.xcertplay.mfi.Iap2MfiAuthenticationClient import com.shilapi.xcertplay.mfi.MfiAuthenticationClient @@ -151,8 +149,6 @@ class CarPlayController( require(!config.locationReportingEnabled || locationProvider != null) { "A location provider is required when location reporting is enabled" } - BydNavigationOutputs.start(context.applicationContext) - BydNavigationOutputs.setClusterStreamControl(::applyClusterUi) } private enum class Phase { IDLE, MFI, WIRELESS, IPHONE, REENUMERATION, DATAPATHS, CONTROL } @@ -193,17 +189,12 @@ class CarPlayController( @Volatile private var mux: Iap2UsbMuxHost? = null @Volatile private var csm: Iap2Session? = null @Volatile private var activeSession: AirPlaySession? = null - private val clusterUiLock = Any() - private var clusterUiStream: Pair? = null - private var clusterUiShown = true private val playbackStatus = com.shilapi.xcertplay.media.CarPlayPlaybackStatus() /** Told when the iPhone starts or stops playing media; may run on any thread. */ @Volatile var playbackListener: ((Boolean) -> Unit)? = null /** Video in car; set before [start] to offer it to the iPhone (with AirPlayConfig.videoInCar). */ - @Volatile var videoListener: CarPlayVideoListener? = null - @Volatile private var videoGate: VideoInCarGate? = null /** Answers the iPhone on a video in car remote control session; a network write, any thread. */ fun sendVideoMessage(streamId: Long, message: Map): Boolean = @@ -245,11 +236,6 @@ class CarPlayController( private val sessionListener = object : AirPlaySessionListener { override fun onSessionActive(session: AirPlaySession) { - if (activeSession !== session) { - BydNavigationOutputs.start(appContext) - // The gear may have changed since /info. - if (videoListener != null) session.setVideoPlaybackAllowed(VideoInCar.allowed) - } activeSession = session debugLog( "AirPlay session active controller=${session.controllerId ?: "unknown"} " + @@ -261,8 +247,6 @@ class CarPlayController( override fun onSessionEnded(session: AirPlaySession) { if (activeSession === session) { activeSession = null - BydNavigationOutputs.endNow() - videoListener?.onVideoSessionEnded() synchronized(playbackStatus) { playbackStatus.clear() }?.let { playing -> playbackListener?.invoke(playing) } } debugLog("AirPlay session ended peer=${session.host}") @@ -295,15 +279,6 @@ class CarPlayController( uiListener?.onHostUiRequested(session) } - override fun onRemoteControlMessage(session: AirPlaySession, streamId: Long, message: Map) { - if (activeSession === session) videoListener?.onVideoMessage(streamId, message) - } - - override fun onVideoPlaybackUiRequested(session: AirPlaySession) { - debugLog("CarPlay requested the car's video player") - if (activeSession === session) videoListener?.onVideoUiRequested() - } - override fun onCommand(session: AirPlaySession, type: String, params: Map) { debugLog( "AirPlay command type=$type params=${params.keys.sorted().joinToString(",")}", @@ -351,13 +326,6 @@ class CarPlayController( synchronized(this) { if (closed) return } - videoListener?.let { listener -> - videoGate = VideoInCarGate(listener::readParked) { allowed -> - val sent = activeSession?.setVideoPlaybackAllowed(allowed) - debugLog("video in car allowed=$allowed sent=${sent ?: "no session"}") - listener.onVideoAllowedChanged(allowed) - }.also { it.start() } - } if (config.transport == CarPlayTransport.WIRED) { permissionCloseable = iphoneHost.registerPermissionReceiver(::onIphonePermission) attachCloseable = iphoneHost.registerAttachReceiver(::onIphoneAttached) @@ -424,9 +392,6 @@ class CarPlayController( if (closed) return closed = true } - videoGate?.close() - BydNavigationOutputs.endNow() - BydNavigationOutputs.clearClusterStreamControl(::applyClusterUi) closeReceivers() availabilityPollGeneration.incrementAndGet() wirelessGeneration.incrementAndGet() @@ -471,21 +436,6 @@ class CarPlayController( } } - // Each new cluster stream starts with the map drawn (its initialURL); send only real changes. - private fun applyClusterUi(shown: Boolean) = synchronized(clusterUiLock) { - val session = activeSession ?: return@synchronized - val stream = session.clusterStream.takeIf { it > 0 } ?: return@synchronized - if (clusterUiStream != session to stream) { - clusterUiStream = session to stream - clusterUiShown = true - } - if (shown == clusterUiShown) return@synchronized - if (session.setClusterUiShown(shown)) { - clusterUiShown = shown - debugLog("Cluster map: ${if (shown) "showUI, the cluster shows the map" else "stopUI, the cluster hides the map"}") - } - } - /** Waits for USB, iAP2, MFi and VPN teardown; intended for a non-main lifecycle thread. */ fun awaitClosed(timeoutMillis: Long): Boolean { require(timeoutMillis >= 0) { "timeoutMillis must not be negative" } @@ -497,9 +447,7 @@ class CarPlayController( } } - // HUD (SOME/IP) and cluster (AMap broadcast) keep separate state so one failing cannot stall the other. private fun onRouteFrame(frame: com.shilapi.xcertplay.iap2.wire.Iap2Frame) { - BydNavigationOutputs.onFrame(frame) synchronized(playbackStatus) { playbackStatus.accept(frame) }?.let { playing -> playbackListener?.invoke(playing) } } diff --git a/shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayVideoListener.kt b/shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayVideoListener.kt deleted file mode 100644 index 129dd6b01d..0000000000 --- a/shared/src/main/java/com/shilapi/xcertplay/orchestration/CarPlayVideoListener.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.shilapi.xcertplay.orchestration - -import com.shilapi.xcertplay.airplay.VideoInCar -import java.io.Closeable - -/** iOS 27 video in car, played by the host in the car's own player (see [VideoInCar]). */ -interface CarPlayVideoListener { - /** Whether the car is in P, or null when it cannot tell. Blocking; read once a second while CarPlay runs. */ - fun readParked(): Boolean? - - /** Video became allowed or not; when not, the player must close. Any thread. */ - fun onVideoAllowedChanged(allowed: Boolean) - - /** A playback message from the iPhone, e.g. insertPlayQueueItem, setRate, seek, stop. Any thread. */ - fun onVideoMessage(streamId: Long, message: Map) - - /** The iPhone asks the car to show its video player (requestUI "videoplayback:"). Any thread. */ - fun onVideoUiRequested() - - /** The CarPlay session ended; the player must close. Any thread. */ - fun onVideoSessionEnded() -} - -/** - * Keeps [VideoInCar.allowed] in step with the car: allowed only while the gear reads P, so an unknown - * gear (no ADB) keeps video off. Changes go to [onChanged]. - */ -internal class VideoInCarGate( - private val readParked: () -> Boolean?, - private val onChanged: (Boolean) -> Unit, -) : Closeable { - @Volatile private var closed = false - - fun start() { - Thread({ - while (!closed) { - update(runCatching(readParked).getOrNull()) - try { - Thread.sleep(POLL_MILLIS) - } catch (_: InterruptedException) { - return@Thread - } - } - }, "diplay-video-gate").apply { isDaemon = true }.start() - } - - internal fun update(parked: Boolean?) { - val allowed = parked == true - if (allowed == VideoInCar.allowed || closed) return - VideoInCar.allowed = allowed - onChanged(allowed) - } - - override fun close() { - closed = true - VideoInCar.allowed = false - } - - private companion object { - const val POLL_MILLIS = 1_000L - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/adb/LocalAdbTest.kt b/shared/src/test/java/com/shilapi/xcertplay/adb/LocalAdbTest.kt deleted file mode 100644 index a4717f1728..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/adb/LocalAdbTest.kt +++ /dev/null @@ -1,130 +0,0 @@ -package com.shilapi.xcertplay.adb - -import java.io.ByteArrayInputStream -import java.math.BigInteger -import java.net.ServerSocket -import java.nio.ByteBuffer -import java.nio.ByteOrder -import java.security.KeyPairGenerator -import java.security.Signature -import java.security.interfaces.RSAPublicKey -import java.util.Base64 -import java.util.concurrent.CopyOnWriteArrayList -import kotlin.concurrent.thread -import org.junit.Assert.assertArrayEquals -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Assert.assertTrue -import org.junit.Test - -class LocalAdbTest { - private val key = KeyPairGenerator.getInstance("RSA").apply { initialize(2048) }.generateKeyPair() - - @Test - fun packetsRoundTripWithChecksumAndMagic() { - val bytes = AdbPacket(AdbPacket.OPEN, 1, 0, "shell:id\u0000".toByteArray()).encode() - val header = ByteBuffer.wrap(bytes, 0, 24).order(ByteOrder.LITTLE_ENDIAN) - - assertEquals(AdbPacket.OPEN, header.int) - header.int; header.int - assertEquals(9, header.int) - assertEquals("shell:id\u0000".toByteArray().sumOf { it.toInt() }, header.int) - assertEquals(AdbPacket.OPEN.inv(), header.int) - val read = AdbPacket.read(ByteArrayInputStream(bytes)) - assertArrayEquals("shell:id\u0000".toByteArray(), read.payload) - } - - @Test - fun publicKeyUsesTheAdbdLayout() { - val message = String(AdbKeys.publicKeyMessage(key.public), Charsets.UTF_8) - assertTrue(message.endsWith(" diplay@headunit\u0000")) - val blob = ByteBuffer.wrap(Base64.getDecoder().decode(message.substringBefore(' '))).order(ByteOrder.LITTLE_ENDIAN) - val n = (key.public as RSAPublicKey).modulus - - assertEquals(524, blob.capacity()) - assertEquals(64, blob.int) - // n0inv * n == -1 (mod 2^32) - val r32 = BigInteger.ONE.shiftLeft(32) - assertEquals(r32 - BigInteger.ONE, BigInteger.valueOf(blob.int.toLong() and 0xffffffffL).multiply(n).mod(r32)) - assertEquals(n, littleEndian(blob, 256)) - assertEquals(BigInteger.ONE.shiftLeft(4096).mod(n), littleEndian(blob, 256)) - assertEquals(65537, blob.int) - } - - @Test - fun knownKeyRunsShellCommands() { - val adbd = FakeAdbd(knowsKey = true, output = "Result: Parcel(00000000 00000002 '........')") - LocalAdb(key, port = adbd.port).use { adb -> - assertEquals(LocalAdb.Access.READY, adb.connect(mayAsk = false)) - assertEquals("Result: Parcel(00000000 00000002 '........')", adb.shell("service call autoservice 5")) - } - assertEquals(listOf("shell:service call autoservice 5"), adbd.opened) - } - - @Test - fun unknownKeyIsOfferedOnlyWhenAsking() { - val quiet = FakeAdbd(knowsKey = false, approves = true) - LocalAdb(key, port = quiet.port).use { assertEquals(LocalAdb.Access.NOT_APPROVED, it.connect(mayAsk = false)) } - assertFalse(quiet.offeredKey) - - val asking = FakeAdbd(knowsKey = false, approves = true) - LocalAdb(key, port = asking.port).use { assertEquals(LocalAdb.Access.READY, it.connect(mayAsk = true)) } - assertTrue(asking.offeredKey) - } - - @Test - fun closedPortIsReportedAsUnreachable() { - val port = ServerSocket(0).use { it.localPort } - LocalAdb(key, port = port).use { assertEquals(LocalAdb.Access.UNREACHABLE, it.connect(mayAsk = true)) } - } - - private fun littleEndian(buffer: ByteBuffer, size: Int): BigInteger { - val bytes = ByteArray(size).also { buffer.get(it) } - return BigInteger(1, bytes.reversedArray()) - } - - /** One-connection adbd: token auth with [key], then answers each OPEN with [output]. */ - private inner class FakeAdbd(knowsKey: Boolean, approves: Boolean = false, output: String = "") { - private val server = ServerSocket(0) - val port = server.localPort - val opened = CopyOnWriteArrayList() - @Volatile var offeredKey = false - - init { - thread(isDaemon = true) { - server.accept().use { socket -> - val input = socket.getInputStream() - val out = socket.getOutputStream() - fun send(packet: AdbPacket) = out.write(packet.encode()) - AdbPacket.read(input) // CNXN - val token = ByteArray(20) { it.toByte() } - send(AdbPacket(AdbPacket.AUTH, AdbPacket.AUTH_TOKEN, 0, token)) - val signature = AdbPacket.read(input) - val valid = Signature.getInstance("NONEwithRSA").run { - initVerify(key.public) - update(byteArrayOf(0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14) + token) - verify(signature.payload) - } - if (!(valid && knowsKey)) { - send(AdbPacket(AdbPacket.AUTH, AdbPacket.AUTH_TOKEN, 0, token)) - val offer = runCatching { AdbPacket.read(input) }.getOrNull() ?: return@use - offeredKey = offer.arg0 == AdbPacket.AUTH_PUBLIC_KEY - if (!approves) return@use - } - send(AdbPacket(AdbPacket.CNXN, AdbPacket.VERSION, AdbPacket.MAX_PAYLOAD, "device::\u0000".toByteArray())) - while (true) { - val open = runCatching { AdbPacket.read(input) }.getOrNull() ?: break - if (open.command != AdbPacket.OPEN) continue - opened += String(open.payload, Charsets.UTF_8).trimEnd('\u0000') - send(AdbPacket(AdbPacket.OKAY, 77, open.arg0, ByteArray(0))) - send(AdbPacket(AdbPacket.WRTE, 77, open.arg0, output.toByteArray())) - AdbPacket.read(input) // OKAY - send(AdbPacket(AdbPacket.CLSE, 77, open.arg0, ByteArray(0))) - AdbPacket.read(input) // CLSE - } - } - server.close() - } - } - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/airplay/CarPlayClusterDisplayTest.kt b/shared/src/test/java/com/shilapi/xcertplay/airplay/CarPlayClusterDisplayTest.kt deleted file mode 100644 index 1f6a12374b..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/airplay/CarPlayClusterDisplayTest.kt +++ /dev/null @@ -1,108 +0,0 @@ -package com.shilapi.xcertplay.airplay - -import org.junit.Assert.assertEquals -import org.junit.Assert.assertTrue -import org.junit.Test - -class CarPlayClusterDisplayTest { - @Test - fun defaultClusterIsAdvertisedAsAnInputlessMapScreen() { - val info = AirPlayInfoPlist.build( - AirPlayConfig( - deviceName = "test", - deviceId = "02:00:00:00:00:02", - btMac = "02:00:00:00:00:02", - sourceVersion = "366.0", - main = AirPlayDisplayConfig(widthPixels = 1280, heightPixels = 720), - cluster = CarPlayClusterDisplay.config(1920, 720), - ), - ) - - val displays = info["displays"] as List<*> - assertEquals(2, displays.size) - val alt = displays[1] as Map<*, *> - assertEquals(111, alt["type"]) - // 83 % of the 1920x720 panel, same 8:3 aspect. - assertEquals(1600, alt["widthPixels"]) - assertEquals(600, alt["heightPixels"]) - assertEquals(0, alt["features"]) - assertEquals(0, alt["primaryInputDevice"]) - assertEquals("maps:/car/instrumentcluster/map", alt["initialURL"]) - assertEquals(292, alt["widthPhysical"]) - assertEquals(110, alt["heightPhysical"]) - - val view = (alt["viewAreas"] as List<*>).single() as Map<*, *> - assertEquals(1600, view["widthPixels"]) - assertEquals(600, view["heightPixels"]) - val safe = view["safeArea"] as Map<*, *> - // The centre area clear in both cluster navi modes: left 35 %, right 36 %, top 16 %, bottom 25 %. - assertEquals(560, safe["originXPixels"]) - assertEquals(96, safe["originYPixels"]) - assertEquals(464, safe["widthPixels"]) - assertEquals(354, safe["heightPixels"]) - assertEquals(true, safe["drawUIOutsideSafeArea"]) - - // The main screen keeps its touch and knob features. - assertEquals(0x0A, (displays[0] as Map<*, *>)["features"]) - } - - @Test - fun theDashboardCanAskForTheTurnCardInstead() { - val card = CarPlayClusterDisplay.config(1920, 720, content = CarPlayClusterDisplay.Content.TURN_CARD) - - assertEquals("maps:/car/instrumentcluster/instructioncard", card.initialUrl) - // The three contents the iPhone lists in altScreenURLs. - assertEquals( - listOf("maps:/car/instrumentcluster/map", "maps:/car/instrumentcluster/instructioncard", "maps:/car/instrumentcluster"), - CarPlayClusterDisplay.Content.entries.map { it.url }, - ) - } - - @Test - fun scaledStreamsKeepThePanelAspect() { - val sizes = (CarPlayClusterDisplay.scalePresets + 50).map { - CarPlayClusterDisplay.config(1920, 720, scalePercent = it).let { c -> c.widthPixels to c.heightPixels } - } - - assertEquals(listOf(1920 to 720, 1600 to 600, 1280 to 480, 960 to 360), sizes) - assertTrue(CarPlayClusterDisplay.STREAM_SCALE_PERCENT in CarPlayClusterDisplay.scalePresets) - } - - @Test - fun markerStepsMoveTheWholeSafeArea() { - val centre = CarPlayClusterDisplay.config(1920, 720, scalePercent = 100).safeArea!! - val farLeftHigher = CarPlayClusterDisplay.config(1920, 720, scalePercent = 100, horizontalStep = -2, verticalStep = -1).safeArea!! - - // Two 10 % steps left (384 px) and one 10 % step up (72 px), same size as the centred area. - assertEquals(centre.left - 384, farLeftHigher.left) - assertEquals(centre.right + 384, farLeftHigher.right) - assertEquals(centre.top - 72, farLeftHigher.top) - assertEquals(centre.bottom + 72, farLeftHigher.bottom) - } - - @Test - fun markerStepsAreBounded() { - val beyond = CarPlayClusterDisplay.config(1920, 720, scalePercent = 100, horizontalStep = 9, verticalStep = -9).safeArea - val limit = CarPlayClusterDisplay.config(1920, 720, scalePercent = 100, horizontalStep = 4, verticalStep = -3).safeArea - - assertEquals(limit, beyond) - } - - @Test - fun nearAnEdgeTheSafeAreaShrinksAroundTheMarker() { - val top = CarPlayClusterDisplay.config(1000, 1000, scalePercent = 100, verticalStep = -3).safeArea!! - - // Marker at 15.5 % from the top: the area reaches the top edge and stays centred on it. - assertEquals(0, top.top) - assertEquals(310, 1000 - top.top - top.bottom) - assertEquals(15.5, CarPlayClusterDisplay.markerPercent(0, -3).second, 0.001) - } - - @Test - fun theCarSitsNearThePanelCentre() { - val safe = CarPlayClusterDisplay.SAFE_AREA_PERCENT - val centreX = (safe.left + 100 - safe.right) / 2.0 - - assertTrue("centre x $centreX", centreX in 48.0..52.0) - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/airplay/CarPlayMediaButtonTest.kt b/shared/src/test/java/com/shilapi/xcertplay/airplay/CarPlayMediaButtonTest.kt index 36504011b3..1d2d55c87f 100644 --- a/shared/src/test/java/com/shilapi/xcertplay/airplay/CarPlayMediaButtonTest.kt +++ b/shared/src/test/java/com/shilapi/xcertplay/airplay/CarPlayMediaButtonTest.kt @@ -12,22 +12,18 @@ class CarPlayMediaButtonTest { fun steeringWheelKeysMapToCarPlayMediaPresses() { assertEquals(CarPlayMediaButton.NEXT, CarPlayMediaButton.forKeyCode(KeyEvent.KEYCODE_MEDIA_NEXT)) assertEquals(CarPlayMediaButton.PREVIOUS, CarPlayMediaButton.forKeyCode(KeyEvent.KEYCODE_MEDIA_PREVIOUS)) - // BYD rewrites its play/pause key into PLAY or PAUSE from the session state; both toggle. + // A head unit may rewrite its play/pause key into PLAY or PAUSE; both toggle. assertEquals(CarPlayMediaButton.PLAY_PAUSE, CarPlayMediaButton.forKeyCode(KeyEvent.KEYCODE_MEDIA_PLAY)) assertEquals(CarPlayMediaButton.PLAY_PAUSE, CarPlayMediaButton.forKeyCode(KeyEvent.KEYCODE_MEDIA_PAUSE)) assertEquals(CarPlayMediaButton.PLAY_PAUSE, CarPlayMediaButton.forKeyCode(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)) assertEquals(CarPlayMediaButton.PLAY_PAUSE, CarPlayMediaButton.forKeyCode(KeyEvent.KEYCODE_HEADSETHOOK)) - assertEquals(CarPlayMediaButton.PLAY_PAUSE, CarPlayMediaButton.forKeyCode(353)) } @Test fun theVoiceKeyOpensSiri() { - // Recorded on DiLink 5.0: short press 304 (scan 290), long press 312 (scan 312). - assertTrue(CarPlayMediaButton.opensSiri(304)) - assertTrue(CarPlayMediaButton.opensSiri(312)) assertTrue(CarPlayMediaButton.opensSiri(KeyEvent.KEYCODE_VOICE_ASSIST)) assertFalse(CarPlayMediaButton.opensSiri(KeyEvent.KEYCODE_MEDIA_NEXT)) - assertNull(CarPlayMediaButton.forKeyCode(304)) + assertNull(CarPlayMediaButton.forKeyCode(KeyEvent.KEYCODE_VOICE_ASSIST)) } @Test diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydBatteryReadinessTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydBatteryReadinessTest.kt deleted file mode 100644 index 423b1eb785..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydBatteryReadinessTest.kt +++ /dev/null @@ -1,80 +0,0 @@ -package com.shilapi.xcertplay.hud - -import com.shilapi.xcertplay.transport.Iap2IdentificationConfig -import com.shilapi.xcertplay.transport.withVehicleStatusFrom -import org.junit.Assert.* -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment -import org.robolectric.annotation.Config -import org.robolectric.shadows.ShadowSystemClock -import java.time.Duration - -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [29], manifest = Config.NONE) -class BydBatteryReadinessTest { - private val context get() = RuntimeEnvironment.getApplication() - private val reading = BydBatteryReading(25.0, 150, 25.1, false) - private val identification = Iap2IdentificationConfig( - name = "test", modelIdentifier = "test", manufacturer = "test", serialNumber = "test", - firmwareVersion = "1", hardwareVersion = "1", carPlayUsbInterfaceNumber = 3, - vehicleStatusEnabled = true, - ) - - @Test - fun delayedAdbApprovalPrimesTheNextConnectionFromTheSettingsCheck() { - val unavailable = BydAdbAccess.readStatus(context) { null } - assertNull(unavailable.batteryPercent) - assertFalse(identification.withVehicleStatusFrom(BydBatteryStatus).vehicleStatusEnabled) - - // A successful settings check after approval must prime the provider, not just its label. - val ready = BydAdbAccess.readStatus(context) { command -> - val bits = when (command.substringAfterLast(' ')) { - "1246777400" -> "41c80000" - "1246765118" -> "00000096" - "882901008" -> "41c8cccd" - "876609560" -> "0000000f" - else -> "00000003" - } - "Result: Parcel(00000000 $bits '........')" - } - assertEquals(25.0, ready.batteryPercent!!, 0.001) - assertTrue(identification.withVehicleStatusFrom(BydBatteryStatus).vehicleStatusEnabled) - assertEquals(150, BydBatteryStatus.snapshot()!!.rangeKm) - reconnectAfterIdleRefreshesWithoutWaitingForThePeriodicTick() - } - - private fun reconnectAfterIdleRefreshesWithoutWaitingForThePeriodicTick() { - BydBatteryStatus.readBattery = { reading } - ShadowSystemClock.advanceBy(Duration.ofMinutes(4)) - BydBatteryStatus.start(context) - awaitReading() - ShadowSystemClock.advanceBy(Duration.ofMinutes(4)) - assertNull(BydBatteryStatus.snapshot()) - assertFalse(identification.withVehicleStatusFrom(BydBatteryStatus).vehicleStatusEnabled) - - BydBatteryStatus.start(context) - awaitReading() - assertTrue(identification.withVehicleStatusFrom(BydBatteryStatus).vehicleStatusEnabled) - } - - @Test - fun staleReadingBecomesUsableAgainOnlyAfterFreshDataIsPublished() { - var clock = 0L - val cache = BydBatteryCache { clock } - cache.accept(reading) - clock += 181_000 - assertNull(cache.snapshot(20)) - cache.accept(BydBatteryReading(10.0, 60, 10.0, false)) - val fresh = cache.snapshot(20)!! - assertEquals(10.0, fresh.batteryPercent, 0.001) - assertEquals(100_400L, fresh.maxChargeWh) - } - - private fun awaitReading() { - val deadline = System.nanoTime() + 2_000_000_000L - while (BydBatteryStatus.snapshot() == null && System.nanoTime() < deadline) Thread.sleep(5) - assertNotNull("refresh should complete before the 30-second periodic tick", BydBatteryStatus.snapshot()) - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydBatteryTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydBatteryTest.kt deleted file mode 100644 index f6fed38fef..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydBatteryTest.kt +++ /dev/null @@ -1,65 +0,0 @@ -package com.shilapi.xcertplay.hud - -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Assert.assertNull -import org.junit.Assert.assertTrue -import org.junit.Test - -class BydBatteryTest { - // Replies from the car on 2026-09-28: 25 %, 150 km, 25.1 kWh left, not charging (BMS state 15). - private val car = mapOf( - "1246777400" to "Result: Parcel(00000000 41c80000 '.......A')", - "1246765118" to "Result: Parcel(00000000 00000096 '........')", - "882901008" to "Result: Parcel(00000000 41c8cccd '.......A')", - "876609560" to "Result: Parcel(00000000 0000000f '........')", - ) - - private fun shell(replies: Map): (String) -> String? = { command -> - replies.entries.firstOrNull { command.endsWith(" ${it.key}") }?.value - } - - @Test - fun readsTheCarsReplies() { - val reading = BydBattery.read(shell(car))!! - - assertEquals(25.0, reading.percent, 0.001) - assertEquals(150, reading.rangeKm) - assertEquals(25.1, reading.remainingKwh, 0.001) - assertFalse(reading.charging) - } - - @Test - fun noAdbAccessGivesNoReading() { - // BydAdbShell answers null while adbd is off, refuses DiPlay's key or waits for approval. - assertNull(BydBattery.read { null }) - } - - @Test - fun aMissingOrRejectedValueGivesNoReading() { - assertNull(BydBattery.read(shell(car - "1246765118"))) - assertNull(BydBattery.read(shell(car + ("1246777400" to "Result: Parcel(ffffd8e5 '....')")))) - } - - @Test - fun theIphoneGetsWattHoursAndAWarningAtTheThreshold() { - val reading = BydBatteryReading(percent = 25.0, rangeKm = 150, remainingKwh = 25.1, charging = false) - - val above = BydBattery.snapshot(reading, lowPercent = 20, fullKwh = null) - assertFalse(above.rangeWarning) - assertEquals(25_100L, above.currentChargeWh) - assertEquals(100_400L, above.maxChargeWh) - assertEquals(600, above.maxRangeKm) - - assertTrue(BydBattery.snapshot(reading, lowPercent = 25, fullKwh = null).rangeWarning) - } - - @Test - fun aLowChargeKeepsTheEarlierFullChargeEstimate() { - val high = BydBatteryReading(percent = 80.0, rangeKm = 480, remainingKwh = 80.0, charging = false) - val low = BydBatteryReading(percent = 5.0, rangeKm = 30, remainingKwh = 5.6, charging = false) - - assertNull(BydBattery.fullKwh(low)) - assertEquals(100_000L, BydBattery.snapshot(low, lowPercent = 20, fullKwh = BydBattery.fullKwh(high)).maxChargeWh) - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterFrameTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterFrameTest.kt deleted file mode 100644 index feeca4b896..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterFrameTest.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.shilapi.xcertplay.hud - -import org.junit.Assert.assertEquals -import org.junit.Test - -class BydClusterFrameTest { - @Test - fun `maps basic turns to amap icons`() { - assertEquals(BydClusterFrame(2, 0, 53), frame(type = 1, distance = 53)) - assertEquals(BydClusterFrame(3, 0, 53), frame(type = 2, distance = 53)) - assertEquals(BydClusterFrame(9, 0, 53), frame(type = 3, distance = 53)) - assertEquals(BydClusterFrame(4, 0, 53), frame(type = 49, distance = 53)) - assertEquals(BydClusterFrame(5, 0, 53), frame(type = 14, distance = 53)) - } - - @Test - fun `numbered roundabout exit carries exit number`() { - assertEquals(BydClusterFrame(11, 2, 120), frame(type = 29, distance = 120)) - assertEquals(BydClusterFrame(17, 2, 120), frame(type = 29, distance = 120, drivingSide = 1)) - } - - @Test - fun `u-turn follows driving side and arrival is destination`() { - assertEquals(8, frame(type = 4).icon) - assertEquals(19, frame(type = 4, drivingSide = 1).icon) - assertEquals(15, frame(type = 12).icon) - } - - @Test - fun `negative distance is clamped`() { - assertEquals(0, frame(type = 1, distance = -5).distanceMeters) - } - - @Test fun `unknown maneuver is not advertised as straight`() { - for (type in listOf(0, 15, 16, 17, 54, 255)) assertEquals(0, frame(type).icon) - for (type in listOf(3, 5, 8, 9, 11, 51)) assertEquals(9, frame(type).icon) - } - - private fun frame(type: Int, distance: Int = 0, drivingSide: Int = 0) = - BydClusterFrame.from(BydAppleManeuver(distance, type, drivingSide)) -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterMapPauseTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterMapPauseTest.kt deleted file mode 100644 index 5e8f298c75..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterMapPauseTest.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.shilapi.xcertplay.hud - -import org.junit.After -import org.junit.Assert.assertTrue -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.RuntimeEnvironment -import org.robolectric.annotation.Config -import java.util.concurrent.CountDownLatch -import java.util.concurrent.TimeUnit -import kotlin.concurrent.thread - -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [29], manifest = Config.NONE) -class BydClusterMapPauseTest { - private val context get() = RuntimeEnvironment.getApplication() - private val release = CountDownLatch(1) - - @After - fun tearDown() { - release.countDown() - BydClusterMapPause.streamControl = null - BydClusterMapPause.clusterMapShown = false - } - - @Test - fun initializationDoesNotWaitForAPendingAdbRead() { - val reading = CountDownLatch(1) - // An adbd that accepted the read and has not answered yet. - BydClusterMapPause.readMode = { - reading.countDown() - release.await() - null - } - BydOutputSettings.setClusterStreamPause(context, true) - BydClusterMapPause.clusterMapShown = true - BydClusterMapPause.streamControl = {} - BydClusterMapPause.initialize(context) - assertTrue("the ticker should start reading", reading.await(5, TimeUnit.SECONDS)) - - val initialized = CountDownLatch(1) - thread { BydClusterMapPause.initialize(context); initialized.countDown() } - - assertTrue("initialize() waited for the adb read", initialized.await(1, TimeUnit.SECONDS)) - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterNaviModeTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterNaviModeTest.kt deleted file mode 100644 index 48bdbe602e..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydClusterNaviModeTest.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.shilapi.xcertplay.hud - -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNull -import org.junit.Test - -class BydClusterNaviModeTest { - @Test - fun readsTheModeFromServiceCallOutput() { - assertEquals(BydClusterNaviMode.TURN_ON_BY_NAVI, BydClusterNaviMode.parseRead("Result: Parcel(00000000 00000002 '........')")) - assertEquals(BydClusterNaviMode.FULL, BydClusterNaviMode.parseRead("Result: Parcel(00000000 00000004 '........')")) - // An exception code in the first word, an unknown value, or no parcel at all. - assertNull(BydClusterNaviMode.parseRead("Result: Parcel(ffffffff 00000002 '........')")) - assertNull(BydClusterNaviMode.parseRead("Result: Parcel(00000000 00000009 '........')")) - assertNull(BydClusterNaviMode.parseRead(null)) - } - - @Test - fun onlySmallAndFullShowTheMap() { - assertEquals( - listOf(BydClusterNaviMode.SMALL, BydClusterNaviMode.FULL), - BydClusterNaviMode.entries.filter { it.showsMap }, - ) - } - - @Test - fun readsTheVerifiedId() { - assertEquals("service call autoservice 5 i32 1007 i32 1086337074", BydClusterNaviMode.READ_COMMAND) - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydFactoryTurnCodeTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydFactoryTurnCodeTest.kt deleted file mode 100644 index 49e3f0f9e8..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydFactoryTurnCodeTest.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.shilapi.xcertplay.hud - -import org.junit.Assert.* -import org.junit.Test - -class BydFactoryTurnCodeTest { - @Test fun factoryUsesDifferentCodesFromBroadcasts() { - assertEquals(1, BydFactoryTurnCode.map(2, 0)) - assertEquals(2, BydFactoryTurnCode.map(3, 0)) - assertEquals(5, BydFactoryTurnCode.map(5, 0)) - assertEquals(11, BydFactoryTurnCode.map(9, 0)) - assertEquals(48, BydFactoryTurnCode.map(15, 0)) - } - @Test fun roundaboutDirectionAndBounds() { - assertEquals(25, BydFactoryTurnCode.map(11, 1)) - assertEquals(34, BydFactoryTurnCode.map(12, 10)) - assertEquals(35, BydFactoryTurnCode.map(17, 1)) - assertEquals(44, BydFactoryTurnCode.map(18, 10)) - assertEquals(13, BydFactoryTurnCode.map(11, 11)) - assertEquals(14, BydFactoryTurnCode.map(17, 0)) - } - @Test fun invalidInstructionsAreNotMadeIntoStraightArrows() { - assertNull(BydFactoryTurnCode.map(-1, 0)) - assertNull(BydFactoryTurnCode.map(0, 0)) - assertNull(BydFactoryTurnCode.map(29, 0)) - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydHudPayloadTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydHudPayloadTest.kt deleted file mode 100644 index 33763a7350..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydHudPayloadTest.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.shilapi.xcertplay.hud - -import org.junit.Assert.assertArrayEquals -import org.junit.Test - -class BydHudPayloadTest { - @Test - fun guidanceMatchesFixedFieldTwoWireFixture() { - assertArrayEquals( - byteArrayOf( - 0x0a, 0x15, 0x10, 0x02, 0x30, 0x01, 0x3a, 0x00, 0x42, 0x00, - 0x48, 0x35, 0x52, 0x00, 0x80.toByte(), 0x01, 0x02, - 0xd2.toByte(), 0x01, 0x00, 0xe0.toByte(), 0x01, 0x01, - ), - BydHudPayload.guidance(distanceMeters = 53, maneuver = 1), - ) - } - - @Test - fun shortDistanceIsLiftedAndTextIsCarried() { - val payload = BydHudPayload.guidance(distanceMeters = 4, maneuver = 11, road = "A", eta = "14:36") - val hex = payload.joinToString("") { "%02x".format(it) } - assert(hex.contains("480b")) { hex } // field 9 = 11 m - assert(hex.contains("520141")) { hex } // field 10 = "A" - assert(hex.contains("d20105" + "31343a3336")) { hex } // field 26 = "14:36" - } - - @Test - fun clearMatchesBydDirectClear() { - assertArrayEquals( - byteArrayOf(0x0a, 0x08, 0x10, 0x02, 0x30, 0xff.toByte(), 0x01, 0x80.toByte(), 0x01, 0x01), - BydHudPayload.clear(), - ) - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydHudProtocolTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydHudProtocolTest.kt deleted file mode 100644 index 9ba6bf7dfc..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydHudProtocolTest.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.shilapi.xcertplay.hud - -import org.junit.Assert.* -import org.junit.Test - -class BydHudProtocolTest { - @Test fun onlyStartAcceptsAlreadyStarted() { - assertTrue(BydHudProtocol.serviceStarted(0)) - assertTrue(BydHudProtocol.serviceStarted(13)) - assertTrue(BydHudProtocol.eventAccepted(0)) - assertFalse(BydHudProtocol.eventAccepted(13)) - } - @Test fun positiveGatewayErrorsAreNotSuccess() { - for (code in listOf(-1, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 15)) { - assertFalse("start=$code", BydHudProtocol.serviceStarted(code)) - assertFalse("event=$code", BydHudProtocol.eventAccepted(code)) - } - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydHudRouteStateTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydHudRouteStateTest.kt deleted file mode 100644 index bc0e49803d..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydHudRouteStateTest.kt +++ /dev/null @@ -1,173 +0,0 @@ -package com.shilapi.xcertplay.hud - -import java.io.ByteArrayOutputStream -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNull -import org.junit.Test - -class BydHudRouteStateTest { - @Test - fun `combines maneuver and route updates`() { - val state = BydHudRouteState() - state.accept( - BydHudRouteState.ROUTE_GUIDANCE_MANEUVER_UPDATE, - tlvs(tlv(0x01, 0, 7), tlv(0x03, 1), tlv(0x08, 0)), - ) - - val change = state.accept( - BydHudRouteState.ROUTE_GUIDANCE_UPDATE, - tlvs(tlv(0x01, 1), tlv(0x0a, 0, 0, 0, 150), tlv(0x0d, 0, 7)), - ) - - assertEquals(BydHudRouteChange.GUIDANCE, change) - assertEquals(BydHudGuidance(distanceMeters = 150, maneuver = 1, gaode = 1), state.current()) - } - - @Test - fun `maps right-hand u-turn`() { - val state = BydHudRouteState() - state.accept( - BydHudRouteState.ROUTE_GUIDANCE_MANEUVER_UPDATE, - tlvs(tlv(0x01, 0, 3), tlv(0x03, 4), tlv(0x08, 1)), - ) - state.accept( - BydHudRouteState.ROUTE_GUIDANCE_UPDATE, - tlvs(tlv(0x01, 1), tlv(0x0a, 0, 0, 0, 50), tlv(0x0d, 0, 3)), - ) - - assertEquals(BydHudGuidance(distanceMeters = 50, maneuver = 8, gaode = 10), state.current()) - } - - @Test - fun `route end clears guidance`() { - val state = populatedState() - - val change = state.accept(BydHudRouteState.ROUTE_GUIDANCE_UPDATE, tlvs(tlv(0x01, 2))) - - assertEquals(BydHudRouteChange.CLEAR, change) - assertNull(state.current()) - } - - @Test - fun `malformed frame does not alter active guidance`() { - val state = populatedState() - val before = state.current() - - val change = state.accept( - BydHudRouteState.ROUTE_GUIDANCE_UPDATE, - byteArrayOf(0, 8, 0, 1, 1), - ) - - assertEquals(BydHudRouteChange.NONE, change) - assertEquals(before, state.current()) - } - - - @Test - fun `carries after-maneuver road and arrival time`() { - val state = BydHudRouteState() - state.accept( - BydHudRouteState.ROUTE_GUIDANCE_MANEUVER_UPDATE, - tlvs(tlv(0x01, 0, 2), tlv(0x03, 2), tlv(0x04, *utf8z("Am Wehr")), tlv(0x08, 0)), - ) - state.accept( - BydHudRouteState.ROUTE_GUIDANCE_UPDATE, - tlvs( - tlv(0x01, 1), tlv(0x03, *utf8z("Hauptstraße")), tlv(0x05, 0, 0, 0, 0, 0x68, 0xd5, 0x2a, 0x40), - tlv(0x0a, 0, 0, 1, 44), tlv(0x0d, 0, 2), - ), - ) - - val guidance = state.current()!! - assertEquals("Am Wehr", guidance.road) - assertEquals(0x68d52a40L, guidance.arrivalEpochSeconds) - assertEquals(300, guidance.distanceMeters) - } - - @Test - fun `brief empty maneuver list keeps guidance and a lasting one hides it without losing maneuvers`() { - var now = 0L - val state = populatedState { now } - - assertEquals(BydHudRouteChange.NONE, state.accept(BydHudRouteState.ROUTE_GUIDANCE_UPDATE, tlvs(tlv(0x01, 5), tlv(0x0d)))) - now = 2_000_000_000L - assertEquals(2, state.current()!!.maneuver) // a blip does not blank the outputs - now = 3_100_000_000L - assertNull(state.current()) - - // The iPhone lists the same maneuver again without resending its 0x5202 details. - val resumed = state.accept( - BydHudRouteState.ROUTE_GUIDANCE_UPDATE, - tlvs(tlv(0x01, 1), tlv(0x0a, 0, 0, 0, 20), tlv(0x0d, 0, 1)), - ) - assertEquals(BydHudRouteChange.GUIDANCE, resumed) - assertEquals(2, state.current()!!.maneuver) - } - - @Test - fun `falls back to current road`() { - val state = BydHudRouteState() - state.accept(BydHudRouteState.ROUTE_GUIDANCE_MANEUVER_UPDATE, tlvs(tlv(0x01, 0, 0), tlv(0x03, 1))) - state.accept( - BydHudRouteState.ROUTE_GUIDANCE_UPDATE, - tlvs(tlv(0x01, 1), tlv(0x03, *utf8z("Hauptstraße")), tlv(0x0d, 0, 0)), - ) - assertEquals("Hauptstraße", state.current()!!.road) - } - - @Test - fun `roundabout exit has blank arrow and exit icon`() { - val state = BydHudRouteState() - state.accept(BydHudRouteState.ROUTE_GUIDANCE_MANEUVER_UPDATE, tlvs(tlv(0x01, 0, 0), tlv(0x03, 29))) - state.accept(BydHudRouteState.ROUTE_GUIDANCE_UPDATE, tlvs(tlv(0x01, 1), tlv(0x0d, 0, 0))) - val guidance = state.current()!! - assertEquals(99, guidance.maneuver) - assertEquals(26, guidance.gaode) - } - - @Test - fun `silent route expires and fresh update restores cached maneuver`() { - var now = 0L - val state = populatedState { now } - now = 30_000_000_000L - assertNull(state.current()) - state.accept(BydHudRouteState.ROUTE_GUIDANCE_UPDATE, tlvs(tlv(0x0a, 0, 0, 0, 20))) - assertEquals(20, state.current()!!.distanceMeters) - } - - @Test - fun `clear prevents a keepalive from restoring guidance`() { - val state = populatedState() - state.clear() - assertNull(state.current()) - assertNull(state.currentApple()) - } - - private fun utf8z(value: String): IntArray = - (value.toByteArray(Charsets.UTF_8).map { it.toInt() and 0xff } + 0).toIntArray() - - private fun populatedState(nanoTime: () -> Long = System::nanoTime): BydHudRouteState = - BydHudRouteState(nanoTime).also { state -> - state.accept( - BydHudRouteState.ROUTE_GUIDANCE_MANEUVER_UPDATE, - tlvs(tlv(0x01, 0, 1), tlv(0x03, 2), tlv(0x08, 0)), - ) - state.accept( - BydHudRouteState.ROUTE_GUIDANCE_UPDATE, - tlvs(tlv(0x01, 1), tlv(0x0a, 0, 0, 0, 25), tlv(0x0d, 0, 1)), - ) - } - - private fun tlv(type: Int, vararg value: Int): ByteArray = ByteArrayOutputStream().apply { - val length = value.size + 4 - write(length ushr 8) - write(length) - write(type ushr 8) - write(type) - value.forEach(::write) - }.toByteArray() - - private fun tlvs(vararg values: ByteArray): ByteArray = ByteArrayOutputStream().apply { - values.forEach(::write) - }.toByteArray() -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydParkedStateTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydParkedStateTest.kt deleted file mode 100644 index 9fc5dc239f..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydParkedStateTest.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.shilapi.xcertplay.hud - -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNull -import org.junit.Test - -class BydParkedStateTest { - @Test - fun readsTheGearboxReply() { - assertEquals(true, BydParkedState.parked("Result: Parcel(00000000 00000001 '........')")) - assertEquals(false, BydParkedState.parked("Result: Parcel(00000000 00000004 '........')")) - assertEquals(false, BydParkedState.parked("Result: Parcel(00000000 00000002 '........')")) - } - - @Test - fun unknownGearIsNotParked() { - assertNull(BydParkedState.parked(null)) - assertNull(BydParkedState.parked("Result: Parcel(00000000 00000000 '........')")) - assertNull(BydParkedState.parked("Result: Parcel(ffffffff 00000001 '........')")) - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydStandaloneSessionTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydStandaloneSessionTest.kt deleted file mode 100644 index d82e991824..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydStandaloneSessionTest.kt +++ /dev/null @@ -1,119 +0,0 @@ -package com.shilapi.xcertplay.hud - -import org.junit.Assert.* -import org.junit.Test - -class BydStandaloneSessionTest { - private class Rig(recovery: Boolean = false) { - var now = 0L - var failPacket: String? = null - var journalFails = false - val events = mutableListOf() - val session = BydStandaloneSession( - send = { packet -> - events += packet - if (packet == failPacket) throw IllegalStateException("dispatch failed") - }, - rememberPendingClear = { dirty -> - if (journalFails) throw IllegalStateException("disk failed") - events += "pending=$dirty" - }, - needsRecovery = recovery, - nanoTime = { now }, - ) - } - - @Test fun startsOnceUpdatesTurnAndClearsOnRouteEnd() { - val r = Rig() - r.session.update(2, 0, 500) - r.session.update(3, 0, 800) - r.session.clear() - assertEquals(listOf("pending=true", BydStandalonePackets.start(), - BydStandalonePackets.guidance(2, 0, 500), BydStandalonePackets.guidance(3, 0, 800), - BydStandalonePackets.clear(), "pending=false"), r.events) - r.session.clear() - assertEquals(6, r.events.size) - } - - @Test fun unchangedGuidanceIsRateLimitedButKeptAlive() { - val r = Rig() - r.session.update(9, 0, 0) - repeat(9) { r.now += 100_000_000L; r.session.update(9, 0, 0) } - assertEquals(3, r.events.size) - r.now = 1_000_000_000L - r.session.update(9, 0, 0) - assertEquals(4, r.events.size) - } - - @Test fun unknownManeuverEndsGuidanceInsteadOfInventingStraight() { - val r = Rig() - r.session.update(2, 0, 500) - r.session.update(0, 0, 500) - assertEquals(listOf(BydStandalonePackets.clear(), "pending=false"), r.events.takeLast(2)) - val count = r.events.size - r.session.update(999, 0, 500) - assertEquals(count, r.events.size) - } - - @Test fun invalidDistanceEndsGuidance() { - val r = Rig() - r.session.update(2, 0, 500) - r.session.update(2, 0, 16777215) - assertEquals(BydStandalonePackets.clear(), r.events[r.events.lastIndex - 1]) - assertNull(BydStandalonePackets.guidance(2, 0, -1)) - assertNotNull(BydStandalonePackets.guidance(2, 0, 16777214)) - } - - @Test fun failedGuidanceAfterStartSendsEndAndNextUpdateStartsAgain() { - val r = Rig() - r.failPacket = BydStandalonePackets.guidance(2, 0, 500) - assertThrows(IllegalStateException::class.java) { r.session.update(2, 0, 500) } - assertEquals(listOf(BydStandalonePackets.clear(), "pending=false"), r.events.takeLast(2)) - r.failPacket = null - r.events.clear() - r.session.update(3, 0, 800) - assertEquals(listOf("pending=true", BydStandalonePackets.start()), r.events.take(2)) - } - - @Test fun failedEndIsRetriedBeforeAnyNewGuidance() { - val r = Rig() - r.session.update(2, 0, 500) - r.failPacket = BydStandalonePackets.clear() - assertThrows(IllegalStateException::class.java) { r.session.clear() } - r.events.clear() - assertThrows(IllegalStateException::class.java) { r.session.update(3, 0, 800) } - assertEquals(listOf(BydStandalonePackets.clear()), r.events) - r.failPacket = null - r.events.clear() - r.session.update(3, 0, 800) - assertEquals(listOf(BydStandalonePackets.clear(), "pending=false", "pending=true", - BydStandalonePackets.start(), BydStandalonePackets.guidance(3, 0, 800)), r.events) - } - - @Test fun interruptedSessionClearsBeforeItStartsAnotherRoute() { - val r = Rig(recovery = true) - r.session.update(2, 0, 500) - assertEquals(listOf(BydStandalonePackets.clear(), "pending=false", "pending=true", - BydStandalonePackets.start()), r.events.take(4)) - } - - @Test fun cannotStartIfRecoveryJournalCannotBeSaved() { - val r = Rig() - r.journalFails = true - assertThrows(IllegalStateException::class.java) { r.session.update(2, 0, 500) } - assertTrue(r.events.isEmpty()) - } - - @Test fun fixedWireVectorsAndRoundaboutMapping() { - assertEquals("43,E0,00,3A,01,02", BydStandalonePackets.start()) - assertEquals("43,E0,00,3A,01,01", BydStandalonePackets.clear()) - assertEquals("43,F0,10,18,04,00,00,01,F4,43,F0,10,10,04,00,00,00,01,43,F0,10,30,04,00,00,00,01", - BydStandalonePackets.guidance(2, 0, 500)) - assertEquals("43,F0,10,18,04,00,00,03,20,43,F0,10,10,04,00,00,00,02,43,F0,10,30,04,00,00,00,02", - BydStandalonePackets.guidance(3, 0, 800)) - val bytes = BydStandalonePackets.guidance(11, 10, 0)!!.split(',') - assertEquals(27, bytes.size) - assertEquals("22", bytes[17]) // Factory right-roundabout exit 10 = 34. - assertEquals("22", bytes[26]) - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydStandaloneStreetTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydStandaloneStreetTest.kt deleted file mode 100644 index 6b9a45861f..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydStandaloneStreetTest.kt +++ /dev/null @@ -1,65 +0,0 @@ -package com.shilapi.xcertplay.hud - -import org.junit.Assert.* -import org.junit.Test - -class BydStandaloneStreetTest { - private fun content(road: String): ByteArray { - val bytes = BydStandalonePackets.streetName(road).split(',').map { it.toInt(16).toByte() } - assertTrue(bytes.size <= 182) - return bytes.chunked(13).flatMapIndexed { index, record -> - assertEquals(13, record.size) - assertEquals(0x43, record[0].toInt() and 255) - assertEquals(0xFA, record[1].toInt() and 255) - assertEquals((index + 1) shl 4, record[2].toInt() and 255) - assertEquals(8, record[3].toInt() and 255) - assertEquals(8, record[4].toInt() and 255) - assertEquals(0xA1 + index, record[5].toInt() and 255) - record.drop(6) - }.toByteArray() - } - private fun decoded(road: String): String { - val data = content(road) - val size = data[0].toInt() and 255 - val text = data.copyOfRange(1, size + 1) - assertEquals(text.sumOf { it.toInt() and 255 } and 255, data[size + 1].toInt() and 255) - assertTrue(data.drop(size + 2).all { it == 0xFF.toByte() }) - return text.toString(Charsets.UTF_16LE) - } - @Test fun matchesActualArm64EncoderEnglishAndArabicVectors() { - assertEquals("43,FA,10,08,08,A1,16,4D,00,75,00,73,00,43,FA,20,08,08,A2,63,00,61,00,74,00,20,43,FA,30,08,08,A3,00,52,00,6F,00,61,00,43,FA,40,08,08,A4,64,00,13,FF,FF,FF,FF", BydStandalonePackets.streetName("Muscat Road")) - assertEquals("43,FA,10,08,08,A1,12,34,06,27,06,31,06,43,FA,20,08,08,A2,39,06,20,00,45,06,33,43,FA,30,08,08,A3,06,42,06,37,06,06,FF", BydStandalonePackets.streetName("شارع مسقط")) - } - @Test fun textIsBoundedWithoutBreakingUnicodePairs() { - assertEquals("A".repeat(48), decoded("A".repeat(500))) - assertEquals("A".repeat(47), decoded("A".repeat(47) + "🚗End")) - assertEquals("A".repeat(46) + "🚗", decoded("A".repeat(46) + "🚗End")) - assertEquals("AB", decoded("A\uD800B\uDC00")) - } - @Test fun blankAndControlsReplacePriorTextWithSafeWhitespace() { - assertEquals(" ", decoded("")) - assertEquals(" ", decoded("\n\u0000\t")) - assertEquals("A B C", decoded("A\u0000B\nC")) - } - @Test fun everyBoundaryHasCorrectLengthChecksumPaddingAndReceiverBound() { - for (length in 1..48) { - val road = "R".repeat(length) - assertEquals(road, decoded(road)) - assertTrue(BydStandalonePackets.guidance(2, 0, 500, road)!!.split(',').size <= 252) - } - } - @Test fun changedStreetIsPublishedAndMissingStreetReplacesIt() { - val sent = mutableListOf() - val session = BydStandaloneSession(sent::add, {}, nanoTime = { 0L }) - session.update(2, 0, 500, "First Road") - session.update(2, 0, 500, "Second Road") - assertEquals(BydStandalonePackets.guidance(2, 0, 500, "Second Road"), sent.last()) - val count = sent.size - session.update(2, 0, 500, "Second Road") - assertEquals(count, sent.size) - session.update(2, 0, 500, "") - assertEquals(BydStandalonePackets.guidance(2, 0, 500, ""), sent.last()) - session.clear() - assertEquals(BydStandalonePackets.clear(), sent.last()) - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/BydWheelSpeedTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/BydWheelSpeedTest.kt deleted file mode 100644 index 2bb6ff8e6c..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/BydWheelSpeedTest.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.shilapi.xcertplay.hud - -import com.shilapi.xcertplay.transport.VehicleGear -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNull -import org.junit.Test - -class BydWheelSpeedTest { - @Test - fun readsSpeedInMetersPerSecond() { - // The car's reply while parked on 2026-09-29, then 36.0 km/h. - assertEquals(0.0, BydWheelSpeed.metersPerSecond("Result: Parcel(00000000 00000000 '........')")!!, 1e-9) - assertEquals(10.0, BydWheelSpeed.metersPerSecond("Result: Parcel(00000000 42100000 '.......B')")!!, 1e-6) - } - - @Test - fun rejectsMissingOrImpossibleSpeed() { - assertNull(BydWheelSpeed.metersPerSecond(null)) - assertNull(BydWheelSpeed.metersPerSecond("Result: Parcel(ffffffff 00000000 '........')")) - assertNull(BydWheelSpeed.metersPerSecond("Result: Parcel(00000000 bf800000 '........')")) // -1.0 - assertNull(BydWheelSpeed.metersPerSecond("Result: Parcel(00000000 7fc00000 '........')")) // NaN - } - - @Test - fun mapsGears() { - assertEquals(VehicleGear.PARK, BydWheelSpeed.gear("Result: Parcel(00000000 00000001 '........')")) - assertEquals(VehicleGear.REVERSE, BydWheelSpeed.gear("Result: Parcel(00000000 00000002 '........')")) - assertEquals(VehicleGear.NEUTRAL, BydWheelSpeed.gear("Result: Parcel(00000000 00000003 '........')")) - assertEquals(VehicleGear.DRIVE, BydWheelSpeed.gear("Result: Parcel(00000000 00000004 '........')")) - assertNull(BydWheelSpeed.gear("Result: Parcel(00000000 00000000 '........')")) - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/hud/NavigationOutputWorkerTest.kt b/shared/src/test/java/com/shilapi/xcertplay/hud/NavigationOutputWorkerTest.kt deleted file mode 100644 index d7382d1758..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/hud/NavigationOutputWorkerTest.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.shilapi.xcertplay.hud - -import java.util.concurrent.CountDownLatch -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicInteger -import org.junit.Assert.* -import org.junit.Test - -class NavigationOutputWorkerTest { - private fun await(latch: CountDownLatch) = assertTrue(latch.await(3, TimeUnit.SECONDS)) - - @Test fun `blocked HUD does not block caller or independent cluster`() { - val entered = CountDownLatch(1) - val release = CountDownLatch(1) - val clusterRan = CountDownLatch(1) - val hud = NavigationOutputWorker("test-hud") {} - val cluster = NavigationOutputWorker("test-cluster") {} - hud.start {} - cluster.start {} - try { - hud.submit { entered.countDown(); release.await(3, TimeUnit.SECONDS) } - await(entered) - cluster.submit { clusterRan.countDown() } - await(clusterRan) - } finally { release.countDown(); hud.clear(); cluster.clear() } - } - - @Test fun `clear discards pending guidance and rejects late frames until restart`() { - val entered = CountDownLatch(1) - val release = CountDownLatch(1) - val cleared = CountDownLatch(1) - val starts = AtomicInteger() - val frames = AtomicInteger() - val worker = NavigationOutputWorker("test-cleanup") { if (starts.get() > 0) cleared.countDown() } - worker.start { starts.incrementAndGet() } - try { - worker.submit { entered.countDown(); release.await(3, TimeUnit.SECONDS) } - await(entered) - worker.submit { frames.incrementAndGet() } - worker.clear() - worker.submit { frames.incrementAndGet() } - release.countDown() - await(cleared) - assertEquals(0, frames.get()) - val resumed = CountDownLatch(1) - worker.start {} - worker.submit { resumed.countDown() } - await(resumed) - } finally { release.countDown(); worker.clear() } - } - - @Test fun `overflow clears incremental stream instead of replaying partial route`() { - val entered = CountDownLatch(1) - val release = CountDownLatch(1) - val cleared = CountDownLatch(1) - val initialized = CountDownLatch(1) - val frames = AtomicInteger() - val worker = NavigationOutputWorker("test-overflow") { if (initialized.count == 0L) cleared.countDown() } - worker.start { initialized.countDown() } - await(initialized) - try { - worker.submit { entered.countDown(); release.await(3, TimeUnit.SECONDS) } - await(entered) - repeat(140) { worker.submit { frames.incrementAndGet() } } - release.countDown() - await(cleared) - assertEquals(0, frames.get()) - } finally { release.countDown(); worker.clear() } - } -} diff --git a/shared/src/test/java/com/shilapi/xcertplay/orchestration/VideoInCarGateTest.kt b/shared/src/test/java/com/shilapi/xcertplay/orchestration/VideoInCarGateTest.kt deleted file mode 100644 index 18395f7953..0000000000 --- a/shared/src/test/java/com/shilapi/xcertplay/orchestration/VideoInCarGateTest.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.shilapi.xcertplay.orchestration - -import com.shilapi.xcertplay.airplay.VideoInCar -import org.junit.After -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Test - -class VideoInCarGateTest { - @After - fun reset() { - VideoInCar.allowed = false - } - - @Test - fun videoIsAllowedOnlyWhileTheGearReadsPark() { - val changes = mutableListOf() - val gate = VideoInCarGate({ null }) { changes += it } - - gate.update(null) // no ADB: stays off - gate.update(false) - gate.update(true) - gate.update(true) - gate.update(null) // unreadable while parked: off again - gate.update(false) - - assertEquals(listOf(true, false), changes) - assertFalse(VideoInCar.allowed) - } - - @Test - fun closingTheGateTurnsVideoOff() { - val gate = VideoInCarGate({ true }) {} - gate.update(true) - gate.close() - gate.update(true) - - assertFalse(VideoInCar.allowed) - } -} From 0373e4cb0cd4ada829ce89b894b985a69ccaaf0a Mon Sep 17 00:00:00 2001 From: umarz317 <61620968+umarz317@users.noreply.github.com> Date: Thu, 1 Oct 2026 15:49:08 +0500 Subject: [PATCH 2/2] Rebrand the app as LoopLink Rename the app LoopLink with application ID io.loopbreak.looplink so it installs alongside DiPlay. The head unit, notification, diagnostic reports, hotspot name and the iPhone's CarPlay screen show LoopLink in all five languages; the About text credits DiPlay and xcertplay. Replace the bundled CarPlay launcher icon and the BYD car icon shown in CarPlay with the LoopLink mark, and move the settings, startup and menu screens to a dark and orange palette. Update the README, changelog and third-party notices. Unit tests, lint and the debug build pass, and the UI was checked in a head-unit emulator; not yet tested on a head unit or with an iPhone. --- CHANGELOG.md | 9 +++ README.md | 58 +++++++----------- asset/looplink-logo.svg | 10 +++ asset/looplink-mark.svg | 9 +++ .../shilapi/xcertplay/AirPlayPersistence.kt | 4 +- .../shilapi/xcertplay/CarPlayHostActivity.kt | 30 ++++----- .../com/shilapi/xcertplay/DiPlayActivity.kt | 28 ++++----- .../shilapi/xcertplay/DiPlaySessionService.kt | 6 +- .../xcertplay/DiagnosticExportStore.kt | 2 +- .../shilapi/xcertplay/SafeAreaEditorView.kt | 2 +- common/src/main/res/drawable/ic_carplay.png | Bin 35437 -> 0 bytes .../res/drawable/ic_diplay_notification.xml | 3 - .../res/drawable/ic_launcher_foreground.xml | 15 +++++ common/src/main/res/drawable/ic_looplink.xml | 13 ++++ .../res/drawable/ic_looplink_notification.xml | 13 ++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 ++ common/src/main/res/raw/ic_car_home.png | Bin 4218 -> 3828 bytes common/src/main/res/values-ar/strings.xml | 34 +++++----- common/src/main/res/values-es/strings.xml | 34 +++++----- common/src/main/res/values-ru/strings.xml | 34 +++++----- common/src/main/res/values-zh-rCN/strings.xml | 38 ++++++------ common/src/main/res/values/colors_brand.xml | 4 ++ common/src/main/res/values/strings.xml | 38 ++++++------ common/src/main/res/values/themes.xml | 8 +-- .../xcertplay/DiagnosticExportStoreTest.kt | 6 +- docs/THIRD_PARTY_NOTICES.md | 20 ++---- mobile/build.gradle.kts | 5 +- mobile/src/main/AndroidManifest.xml | 4 +- mobile/src/main/res/values/strings.xml | 2 +- .../network/LocalOnlyHotspotManager.kt | 2 +- 30 files changed, 244 insertions(+), 193 deletions(-) create mode 100644 asset/looplink-logo.svg create mode 100644 asset/looplink-mark.svg delete mode 100644 common/src/main/res/drawable/ic_carplay.png delete mode 100644 common/src/main/res/drawable/ic_diplay_notification.xml create mode 100644 common/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 common/src/main/res/drawable/ic_looplink.xml create mode 100644 common/src/main/res/drawable/ic_looplink_notification.xml create mode 100644 common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 common/src/main/res/values/colors_brand.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index e9b878979b..cb63e1616d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Unreleased — LoopLink + +- Fork DiPlay 0.2.8 as LoopLink with app ID `io.loopbreak.looplink`, so it installs alongside DiPlay. The head unit, notification, reports (Downloads/LoopLink) and the iPhone show the name LoopLink, in all five languages. +- New LoopLink logo for the launcher, the app and the car's icon in CarPlay (replacing the bundled CarPlay and BYD icons), and a dark and orange palette. +- Remove BYD-specific features: windshield HUD and instrument-cluster navigation, the dashboard map and ADB map pause, ADB battery, wheel-speed and parked-video reporting, the BYD steering-wheel keycodes and the BYD HUD icons. +- Unit tests, lint and the debug build pass, and the UI was checked in a head-unit emulator. Not yet tested on a head unit or with an iPhone. + +The entries below are the history inherited from DiPlay. + # DiPlay 0.2.8 — 2026-09-30 - Keep iPhone location reporting active across the wireless Bluetooth-to-Wi-Fi CarPlay handoff; limit location updates to one per second on wireless and USB. diff --git a/README.md b/README.md index 4303272e41..7eec66ee96 100644 --- a/README.md +++ b/README.md @@ -1,59 +1,45 @@ -# DiPlay +LoopLink -**CarPlay for compatible BYD Android head units.** Wired and wireless, with the familiar DiAuto interface. Independent app: `com.shihab.diplay`. +**CarPlay for Android head units.** LoopLink turns an Android head unit into a wired or wireless CarPlay receiver. App ID: `io.loopbreak.looplink`, so it installs alongside DiPlay instead of replacing it. -> **BYD support scope:** These projects focus on BYD cars. They may work on other brands, but other brands are unsupported and there are no plans to add support or fix brand-specific incompatibilities. +> **Fork notice.** LoopLink is a fork of [DiPlay](https://github.com/shihabal3amri/DiPlay) by shihabal3amri, which is itself based on [xcertplay](https://github.com/shilapi/xcertplay) by shilapi; its settings layout adapts [DiAuto](https://github.com/shihabal3amri/DiAuto). LoopLink removes DiPlay's BYD-specific features and rebrands the app. It is an independent project and is not affiliated with or endorsed by the DiPlay, xcertplay or DiAuto authors. -[Download & website](https://shihabal3amri.github.io/DiPlay/) · [Release](https://github.com/shihabal3amri/DiPlay/releases/tag/v0.2.8) · [Report a problem](https://github.com/shihabal3amri/DiPlay/issues/new/choose) +## What it does -![DiPlay home](site/assets/home.png) +- Wired USB and wireless CarPlay (Wi-Fi Direct or the car's existing hotspot) with local authentication. +- CarPlay size, resolution, frame rate, audio routing and optional iPhone location reporting. +- Standard Android media and voice keys control CarPlay playback and Siri. +- Local diagnostic reports, saved to `Downloads/LoopLink`; nothing is sent automatically. -## 0.2.8 — public preview +Compared with DiPlay, LoopLink has **no** BYD features: no windshield HUD or instrument-cluster navigation, dashboard map, ADB battery, wheel-speed or parked-video reporting, and no BYD steering-wheel keycodes. -Install on the **car**, not the iPhone. No jailbreak, dongle, Mac, account or authentication server is required for use. Core CarPlay does not require ADB; optional dashboard, battery, wheel-speed and parked-video features do. Your head unit must permit APK installation. Wireless supports Wi-Fi Direct or the car’s existing hotspot; Wi-Fi Direct requires Android 10+; the APK supports Android 9+ for wired use. +## Status -- Wired USB and wireless CarPlay with local authentication. -- BYD HUD navigation with arrows, distance and street names on verified firmware. -- Car hotspot support, improved audio buffering and saved receive diagnostics. -- Automatic address discovery, fixed-channel Wi-Fi fallbacks and successful-configuration memory. -- Icon/text size, resolution and frame rate; applying a display change reconnects CarPlay. -- Local diagnostic export. Reports are sent only if you choose to share them. -- Separate installation alongside DiAuto. Run one projection app at a time. +Not yet tested on a head unit or with an iPhone. The build passes its unit tests and lint, and the app UI was checked in an Android head-unit emulator, which cannot run a CarPlay session. Behaviour on real head units is inherited from DiPlay 0.2.8 but has not been revalidated after the BYD removal. This is **not an Apple-certified product**. -This is **not an Apple-certified product**. The APK bundles an experimental accessory identity recovered from public Carlinkit firmware, not a newly provisioned MFi identity for DiPlay. A bundled private key is extractable. Acceptance after future iOS updates, reliability across head units and suitability of that identity for general distribution are unresolved. This release invites community testing; it is not a guarantee of universal compatibility. +## Build -Earlier releases were tested on the development DiLink5.1 car: live windshield guidance and street names work, Car hotspot now starts CarPlay, and Wi-Fi Direct performance is substantially improved. Occasional audio cutouts remain and are deferred to a later update. The new features were tested on a BYD Tang with DiLink 5.0 and an iPhone 15 Pro on iOS 27; wheel-speed dead reckoning in tunnels remains unverified. Broader head-unit and iOS compatibility is not guaranteed. The HUD firmware scope and cleanup limits are documented in [BYD navigation](docs/BYD_NAVIGATION.md). +Requirements: JDK 25, Android SDK 37, NDK 28.2.13676358. -## What’s new in 0.2.8 +```sh +./gradlew :shared:testDebugUnitTest :common:testDebugUnitTest :mobile:lintDebug :mobile:assembleDebug +``` -- App interface in English, Simplified Chinese, Arabic, Russian and Spanish; synchronized Android app-language settings. -- Steering-wheel media controls and long-press Siri on supported BYD firmware while CarPlay is on screen. -- Dashboard display choices: map, turn card, or both; corrected dashboard keyframe recovery. -- Optional ADB feature on supported DiLink 5.0: pause the dashboard map stream when its display mode hides the map. -- Optional ADB battery reporting for Apple Maps, with warning threshold, charging-connector selection and a checked reconnect action. -- Wireless location reporting continues across the Bluetooth-to-Wi-Fi handoff; USB and wireless updates are limited to one per second. -- Optional ADB wheel-speed and gear reporting lets iPhone navigation estimate movement when GPS is unavailable. Tunnel use still needs validation. -- Optional iOS 27 video playback on the car screen while parked, with iPhone, touchscreen and steering-wheel controls. Playback closes when the car leaves P. -- DRM-protected video such as Apple TV+ is not supported; DiPlay is not a licensed FairPlay receiver. Netflix does not support AirPlay. +A plain debug build has no accessory identity and cannot connect to an iPhone. A build that can authenticate needs an accessory identity supplied with `DIPLAY_AUTH_ASSETS_DIR` (`offline-mfi/identity.pk8` and `offline-mfi/certificate.p7b`); those files are never part of this repository, and `scripts/check_public_tree.py` fails if one is tracked. ## Documentation +The guides below are inherited from DiPlay and may still refer to it; they describe the same receiver. + - [Install and connect](docs/INSTALL.md) - [Compatibility and troubleshooting](docs/COMPATIBILITY.md) - [Privacy and diagnostic reports](docs/PRIVACY.md) - [Build from source](docs/BUILD.md) -- [Validation](docs/VALIDATION.md) - [Release notes](CHANGELOG.md) - [Credits and licenses](docs/THIRD_PARTY_NOTICES.md) -The website is available in English, Arabic, Russian, Spanish and Simplified Chinese. The app interface supports those same five languages. Choose the app language in Settings; on Android 13+, it stays synchronized with Android’s per-app language setting. - -## Source and credits - -Based on [xcertplay](https://github.com/shilapi/xcertplay), GPL-3.0. The home/settings UI and website adapt [DiAuto](https://github.com/shihabal3amri/DiAuto), AGPL-3.0; that license is included in `docs/licenses`. Preserve those notices when distributing modifications. CarPlay and its icon belong to Apple Inc.; no Apple or BYD affiliation or endorsement is implied. - -This repository starts with a clean public source snapshot. Local research, tester reports and release-signing secrets are excluded. The complete source corresponding to the APK is provided with every release; experimental runtime identity assets are described separately in the build instructions and notices. +## License -## Local release packaging +LoopLink is free software under the **GNU General Public License v3.0**; see [LICENSE](LICENSE). The settings screen adapts DiAuto and is marked AGPL-3.0-only; its license is in `docs/licenses/`. As a derivative of GPL-3.0 code, LoopLink must stay under the same terms: distributed copies and modifications must keep this license and make their source available. -The release APK intentionally contains the experimental accessory identity. The Git repository and source archive exclude all accessory and Android signing keys; tests generate synthetic identities at runtime. Source/CI builds omit runtime identity assets by default. Local release builds explicitly select an external asset directory. Publishing the APK makes its bundled identity extractable; building locally does not preserve that identity's confidentiality. +Copyright © 2026 Loopbreak for LoopLink's changes; the original code remains copyright its respective authors. CarPlay and iPhone are trademarks of Apple Inc.; no Apple affiliation or endorsement is implied. diff --git a/asset/looplink-logo.svg b/asset/looplink-logo.svg new file mode 100644 index 0000000000..d794930461 --- /dev/null +++ b/asset/looplink-logo.svg @@ -0,0 +1,10 @@ + + + + + + + + + LoopLink + diff --git a/asset/looplink-mark.svg b/asset/looplink-mark.svg new file mode 100644 index 0000000000..5e74db7950 --- /dev/null +++ b/asset/looplink-mark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/common/src/main/java/com/shilapi/xcertplay/AirPlayPersistence.kt b/common/src/main/java/com/shilapi/xcertplay/AirPlayPersistence.kt index 183f629012..2d4634ecf6 100644 --- a/common/src/main/java/com/shilapi/xcertplay/AirPlayPersistence.kt +++ b/common/src/main/java/com/shilapi/xcertplay/AirPlayPersistence.kt @@ -72,8 +72,8 @@ object AirPlayPersistence { private const val SAFE_AREA_KEY_PREFIX = "safe_area_" private const val CUSTOM_ICON_FILE = "airplay-icon.png" - const val DEFAULT_MANUFACTURER = "DiPlay" - const val DEFAULT_MODEL = "DiPlay" + const val DEFAULT_MANUFACTURER = "LoopLink" + const val DEFAULT_MODEL = "LoopLink" const val DEFAULT_OEM_LABEL = "BYD" const val DEFAULT_MFI_I2C_PATH = "/dev/i2c-1" diff --git a/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt b/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt index d3fc6bdb33..f201df01bc 100644 --- a/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt +++ b/common/src/main/java/com/shilapi/xcertplay/CarPlayHostActivity.kt @@ -631,7 +631,7 @@ class CarPlayHostActivity : ComponentActivity() { } private fun buildContentView(): View { - val root = FrameLayout(this).apply { setBackgroundColor(Color.rgb(12, 17, 27)) } + val root = FrameLayout(this).apply { setBackgroundColor(Color.rgb(7, 9, 13)) } val video = TextureView(this).apply { isOpaque = false surfaceTextureListener = textureListener @@ -646,26 +646,26 @@ class CarPlayHostActivity : ComponentActivity() { orientation = LinearLayout.VERTICAL gravity = Gravity.CENTER setPadding(dp(32), dp(32), dp(32), dp(32)) - setBackgroundColor(Color.rgb(12, 17, 27)) + setBackgroundColor(Color.rgb(7, 9, 13)) isClickable = true } panel.addView(ImageView(this).apply { - setImageResource(R.drawable.ic_carplay); contentDescription = getString(R.string.carplay) + setImageResource(R.drawable.ic_looplink); contentDescription = getString(R.string.carplay) }, LinearLayout.LayoutParams(dp(88), dp(88))) panel.addView(TextView(this).apply { - text = getString(R.string.diplay); textSize = 34f; setTextColor(Color.rgb(241, 245, 252)) + text = getString(R.string.diplay); textSize = 34f; setTextColor(Color.rgb(232, 236, 243)) gravity = Gravity.CENTER; setPadding(0, dp(18), 0, dp(14)) typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL) }) val stage = TextView(this).apply { text = getString(R.string.getting_carplay_ready); textSize = 22f; gravity = Gravity.CENTER - setTextColor(Color.rgb(241, 245, 252)) + setTextColor(Color.rgb(232, 236, 243)) } panel.addView(stage) panel.addView(TextView(this).apply { text = if (wirelessEnabled) getString(R.string.keep_your_iphone_nearby_with_bluetooth_and_wi_fi_on_allow) else getString(R.string.use_a_usb_data_cable_and_unlock_your_iphone_allow_trust_an) - textSize = 17f; gravity = Gravity.CENTER; setTextColor(Color.rgb(168, 182, 202)) + textSize = 17f; gravity = Gravity.CENTER; setTextColor(Color.rgb(139, 148, 167)) setPadding(0, dp(14), 0, dp(24)) }) panel.addView(Button(this).apply { @@ -676,13 +676,13 @@ class CarPlayHostActivity : ComponentActivity() { }, LinearLayout.LayoutParams(dp(300), dp(64)).apply { bottomMargin = dp(12) }) panel.addView(Button(this).apply { text = getString(R.string.back_to_diplay); isAllCaps = false; textSize = 18f - setTextColor(Color.rgb(12, 17, 27)) - background = GradientDrawable().apply { setColor(Color.rgb(166, 200, 255)); cornerRadius = dp(20).toFloat() } + setTextColor(Color.rgb(43, 18, 6)) + background = GradientDrawable().apply { setColor(Color.rgb(244, 122, 58)); cornerRadius = dp(20).toFloat() } setOnClickListener { showDiPlayHome() } }, LinearLayout.LayoutParams(dp(300), dp(64))) panel.addView(TextView(this).apply { text = getString(R.string.in_carplay_swipe_down_with_three_fingers_to_open_diplay_se) - textSize = 13f; gravity = Gravity.CENTER; setTextColor(Color.rgb(168, 182, 202)); setPadding(0, dp(20), 0, 0) + textSize = 13f; gravity = Gravity.CENTER; setTextColor(Color.rgb(139, 148, 167)); setPadding(0, dp(20), 0, 0) }) root.addView(panel, FrameLayout.LayoutParams(-1, -1)) videoView = video @@ -3486,12 +3486,12 @@ class CarPlayHostActivity : ComponentActivity() { const val THREE_FINGER_SWIPE_DISTANCE_DP = 72 const val THREE_FINGER_SWIPE_DIRECTION_RATIO = 1.15f const val MAX_SETTINGS_MENU_WIDTH_PX = 1200 - val MENU_BACKGROUND = Color.rgb(12, 16, 19) - val MENU_SECONDARY = Color.rgb(170, 180, 190) - val MENU_ACCENT = Color.rgb(127, 205, 154) - val MENU_ACCENT_TRACK = Color.rgb(78, 143, 102) - val MENU_TRACK_OFF = Color.rgb(64, 74, 80) - val MENU_BUTTON_TEXT = Color.rgb(8, 17, 11) + val MENU_BACKGROUND = Color.rgb(17, 21, 29) + val MENU_SECONDARY = Color.rgb(139, 148, 167) + val MENU_ACCENT = Color.rgb(244, 122, 58) + val MENU_ACCENT_TRACK = Color.rgb(150, 72, 32) + val MENU_TRACK_OFF = Color.rgb(35, 43, 56) + val MENU_BUTTON_TEXT = Color.rgb(43, 18, 6) val MENU_DANGER = Color.rgb(190, 45, 45) val NO_VIDEO_BACKGROUND = Color.rgb(0x16, 0x16, 0x18) } diff --git a/common/src/main/java/com/shilapi/xcertplay/DiPlayActivity.kt b/common/src/main/java/com/shilapi/xcertplay/DiPlayActivity.kt index 6f07a70f49..3636623260 100644 --- a/common/src/main/java/com/shilapi/xcertplay/DiPlayActivity.kt +++ b/common/src/main/java/com/shilapi/xcertplay/DiPlayActivity.kt @@ -139,7 +139,7 @@ class DiPlayActivity : ComponentActivity() { val content = column().apply { setPadding(dp(32), dp(24), dp(32), dp(32)) } scroll.addView(content) val header = row().apply { gravity = Gravity.CENTER_VERTICAL } - header.addView(ImageView(this).apply { setImageResource(R.drawable.ic_carplay); contentDescription = getString(R.string.carplay) }, LinearLayout.LayoutParams(dp(36), dp(36))) + header.addView(ImageView(this).apply { setImageResource(R.drawable.ic_looplink); contentDescription = getString(R.string.carplay) }, LinearLayout.LayoutParams(dp(36), dp(36))) header.addView(label(getString(R.string.diplay), 26, TEXT, true).apply { setPadding(dp(12), 0, 0, 0) }, LinearLayout.LayoutParams(0, dp(56), 1f)) header.addView(button(if (page == "home") getString(R.string.car_home) else getString(R.string.back), false) { if (page == "home") startActivity(Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME)) @@ -191,7 +191,7 @@ class DiPlayActivity : ComponentActivity() { card.addView(disconnectButton, matchButton(10, 56)) val right = column().apply { gravity = Gravity.CENTER_HORIZONTAL } val logo = ImageView(this).apply { - setImageResource(R.drawable.ic_carplay) + setImageResource(R.drawable.ic_looplink) contentDescription = getString(R.string.carplay_icon) scaleType = ImageView.ScaleType.FIT_CENTER } @@ -729,7 +729,7 @@ class DiPlayActivity : ComponentActivity() { } connectButton?.isEnabled = setupError == null } - private fun reportFileName() = "DiPlay-${SimpleDateFormat("yyyyMMdd-HHmmss-SSS", Locale.US).format(Date())}.txt" + private fun reportFileName() = "LoopLink-${SimpleDateFormat("yyyyMMdd-HHmmss-SSS", Locale.US).format(Date())}.txt" private fun chooseReportDestination() { // Some head units omit or disable DocumentsUI. Launch itself can throw, before @@ -750,7 +750,7 @@ class DiPlayActivity : ComponentActivity() { Thread({ val result = runCatching { val report = buildString { - appendLine("DiPlay ${version()} · private beta diagnostic report") + appendLine("LoopLink ${version()} · diagnostic report") appendLine("Android ${Build.VERSION.RELEASE} / API ${Build.VERSION.SDK_INT}") appendLine("Head unit: ${Build.MANUFACTURER} ${Build.MODEL}") appendLine("Connection: ${if (AirPlayPersistence.loadWirelessEnabled(appContext)) "wireless" else "USB"}") @@ -785,7 +785,7 @@ class DiPlayActivity : ComponentActivity() { if (result.isSuccess) { val savedUri = result.getOrThrow() AlertDialog.Builder(this).setTitle(getString(R.string.diagnostic_report_saved)) - .setMessage(if (uri == null) "Downloads/DiPlay/$fileName" else getString(R.string.your_report_was_saved_to_the_selected_location)) + .setMessage(if (uri == null) "Downloads/LoopLink/$fileName" else getString(R.string.your_report_was_saved_to_the_selected_location)) .setPositiveButton(getString(R.string.done), null) .setNeutralButton(getString(R.string.share)) { _, _ -> runCatching { @@ -854,7 +854,7 @@ class DiPlayActivity : ComponentActivity() { target.isSelected = selected target.setTextColor(if (selected) BG else TEXT) target.background = android.graphics.drawable.RippleDrawable( - ColorStateList.valueOf(0x336F9FD9), + ColorStateList.valueOf(0x33F47A3A), rounded(if (selected) ACCENT else SURFACE, if (selected) ACCENT else BORDER), null ) @@ -957,7 +957,7 @@ class DiPlayActivity : ComponentActivity() { private fun button(title: String, primary: Boolean, click: () -> Unit) = Button(this).apply { text = title; isAllCaps = false; textSize = 18f; setTextColor(if (primary) BG else TEXT) typeface = Typeface.create("sans-serif-medium", Typeface.NORMAL) - background = android.graphics.drawable.RippleDrawable(ColorStateList.valueOf(0x336F9FD9), rounded(if (primary) ACCENT else SURFACE, if (primary) ACCENT else BORDER), null) + background = android.graphics.drawable.RippleDrawable(ColorStateList.valueOf(0x33F47A3A), rounded(if (primary) ACCENT else SURFACE, if (primary) ACCENT else BORDER), null) setPadding(dp(16), 0, dp(16), 0); minHeight = dp(56); stateListAnimator = null setOnClickListener { click() } } @@ -966,12 +966,12 @@ class DiPlayActivity : ComponentActivity() { private fun space(height: Int) = View(this).apply { layoutParams = LinearLayout.LayoutParams(1, dp(height)) } private fun dp(value: Int) = (value * resources.displayMetrics.density).toInt() companion object { - private val BG = Color.rgb(12, 17, 27) - private val SURFACE = Color.rgb(21, 30, 44) - private val BORDER = Color.rgb(42, 56, 75) - private val ACCENT = Color.rgb(166, 200, 255) - private val TEXT = Color.rgb(241, 245, 252) - private val MUTED = Color.rgb(168, 182, 202) - private val WARNING = Color.rgb(255, 196, 128) + private val BG = Color.rgb(7, 9, 13) + private val SURFACE = Color.rgb(17, 21, 29) + private val BORDER = Color.rgb(35, 43, 56) + private val ACCENT = Color.rgb(244, 122, 58) + private val TEXT = Color.rgb(232, 236, 243) + private val MUTED = Color.rgb(139, 148, 167) + private val WARNING = Color.rgb(251, 191, 36) } } diff --git a/common/src/main/java/com/shilapi/xcertplay/DiPlaySessionService.kt b/common/src/main/java/com/shilapi/xcertplay/DiPlaySessionService.kt index 6fa37bb52e..5ae9f0d8e4 100644 --- a/common/src/main/java/com/shilapi/xcertplay/DiPlaySessionService.kt +++ b/common/src/main/java/com/shilapi/xcertplay/DiPlaySessionService.kt @@ -27,8 +27,8 @@ class DiPlaySessionService : Service() { val open = PendingIntent.getActivity(this, 0, Intent(this, CarPlayHostActivity::class.java), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) val stop = PendingIntent.getService(this, 1, Intent(this, DiPlaySessionService::class.java).setAction(ACTION_STOP), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) val notification = Notification.Builder(this, CHANNEL) - .setSmallIcon(R.drawable.ic_diplay_notification) - .setContentTitle("DiPlay") + .setSmallIcon(R.drawable.ic_looplink_notification) + .setContentTitle(getString(R.string.app_name)) .setContentText("CarPlay connection running") .setContentIntent(open).setOngoing(true) .addAction(Notification.Action.Builder(null, "Disconnect", stop).build()).build() @@ -52,7 +52,7 @@ class DiPlaySessionService : Service() { stopSelf() } companion object { - const val ACTION_STOP = "com.shihab.diplay.DISCONNECT" + const val ACTION_STOP = "io.loopbreak.looplink.DISCONNECT" private const val CHANNEL = "diplay_connection" } } diff --git a/common/src/main/java/com/shilapi/xcertplay/DiagnosticExportStore.kt b/common/src/main/java/com/shilapi/xcertplay/DiagnosticExportStore.kt index 6939b0a136..da84585f00 100644 --- a/common/src/main/java/com/shilapi/xcertplay/DiagnosticExportStore.kt +++ b/common/src/main/java/com/shilapi/xcertplay/DiagnosticExportStore.kt @@ -16,7 +16,7 @@ internal object DiagnosticExportStore { val values = ContentValues().apply { put(MediaStore.Downloads.DISPLAY_NAME, fileName) put(MediaStore.Downloads.MIME_TYPE, "text/plain") - put(MediaStore.Downloads.RELATIVE_PATH, "${Environment.DIRECTORY_DOWNLOADS}/DiPlay") + put(MediaStore.Downloads.RELATIVE_PATH, "${Environment.DIRECTORY_DOWNLOADS}/LoopLink") put(MediaStore.Downloads.IS_PENDING, 1) } val uri = resolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, values) diff --git a/common/src/main/java/com/shilapi/xcertplay/SafeAreaEditorView.kt b/common/src/main/java/com/shilapi/xcertplay/SafeAreaEditorView.kt index bcfe34159b..56d5c14b60 100644 --- a/common/src/main/java/com/shilapi/xcertplay/SafeAreaEditorView.kt +++ b/common/src/main/java/com/shilapi/xcertplay/SafeAreaEditorView.kt @@ -22,7 +22,7 @@ class SafeAreaEditorView(context: Context) : View(context) { private val touchRadius = 40f * density private val dimPaint = Paint().apply { color = Color.argb(118, 0, 0, 0) } private val linePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - color = Color.rgb(127, 205, 154) + color = Color.rgb(244, 122, 58) strokeWidth = 3f * density style = Paint.Style.STROKE } diff --git a/common/src/main/res/drawable/ic_carplay.png b/common/src/main/res/drawable/ic_carplay.png deleted file mode 100644 index 1f7e3f07ed86214662ec3e55e1bc74aa31d27113..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35437 zcmb4rRX|)l&^DA7XK}X{iWDvG+G52D6j*d|cXzkq#hp@Qi@Q6EYjKxF7Z!KtWU4@t3Y&Cm61fK z7^m2OefVk$lrvLQL|}Stqaq-NTOz#uZ^&yQdo2hENWT#gkX|L?e|^8-{QtLIzmfj8 z{og=EA%S581aSnpuM$5z5D(iet5^nH*V9*hZ@kw#j6A!L!~@#AI zfzCV*70BbWUCm_wr_L9#vcUdzIOmgT+Je_eXT~Cz**O2W7FN4;mw?#-Qi;; zXPdpRjrIAnwzk&XWIEboySqyH&BdfWyLJ}iVgFWVY#NG|R>!ko#da3ll8r(IqAkT4 z$UmVU%$+^uz-2@tnk?xemCGbW^VNlI1?r>Hjjd!$t8S=KC7E2SO6Jw%g5aGiEnBc; zqi@Ufe%67D5JPLs>=tv(_@uP?oowl}AUB8T-Jw&Xz`7kfYXw_wnwaCm(FIiGhCP+& zS#&bk>OyArr9TD##ps1lO;e9|F{?=y#qPz5@9=~h5}GaD^m`SnwY9u|PMSnb%`zSa(~pJBJQcNSSx+0I&kTNU)OVPV&KZjBE=z|(#;%P`@&{RV2d zOA0keSNPUp;odvWlsMm7tmZ+&^*SGVxN7)_rTH|_K4SRTpI)ul7|mB?M`j&!qJ>&2 z#BHNkUh<1QG`R{VrM`S&-ASgppNEpf`ra+R+;Ez5#-inkV^z|K()K9&Gtkr=!3n8s zutaXaLpM3q^0gignakXg{%eYei zR+;b6_SkQIrMIY&jl1PxZ)fNO&jW2X7xahwB-xXbxr(jMv|`Lq;3fXF~-Tt(z!&A&xCeKD#GJ^K^Zx(ekxh%znCKoD)kDs4}?VqfYletIS zxsx+4u3LI6_nfpFKHOg4DApI*>tV(W1(WSz9|#_v9;7=oa8ai$VOVWpWCXAgVdaKV znO`q@iv2Tq%LKj(G?yaCb%{IW>({Bm74Qa%^yQ?Y&vVB0qBkXR61i}$H$;BA=6 zAI-rQS!@30|I51tTR!X?EHP0IGZW8K=KDYuSKwyRwwoD_2)%%>nX9W@@GMHt)bL4| z;>!s!(~|#RIrekxS;qbfktga3&;4!F7qb?go8wS3=j&<*e&JOC(%8D$)7e|0QuA4u zD^*q4gt$bo<|)!nHD&!~1W9o=r3vB0?#*y&teWUx#RwoLWCdXfbx!9;J%_0#I<>Un z+1MMuzs@=X!Rg6YgG&oN9mO=+Kg=lY{`5x9`LmWi@X1ytf5=A5D5hOVm)J;YD3+s~ z8ejaU{{(k%+vkH^-}uXD_`~wbBB^7~Af0XdbBgwNJ4aiso~B|a<^SSW%6J+-Ca znNwF3B^_WPl)bNiL%+P(1n|R2Y^069PonM-O(((|d_j!L%tLh8^`$(&F_IN5_{n;P zaQ4!NE}Jve6!9_tJIZaKw+4#7Y?>2*%KXi`_5s1x5`DjGTdNE=&%GFAF?k)k)$fH{ zzz^76dKPYUGRxo(FDf;wxa}swmMBqAq@aizWzqXOlG0I^4OJ7R zmPRzQwitt2JJW;dEDmbmkWK}@k?I8V=8sxThMDGB{IK+UA9ZrYhH`n2wO z=G4WXOfp7@9;8lDjk-%vwKqwogW1ebC%?cZB?IdNNl)G7nGode>smwCeNg!R`knLq zV{r89EOi#v>V*G^yx48$3EBExB{uIa12v2a6GbB~R83w+GPQp~c->BGGm_U{c1PAI zIYrlHiAm^;H@fdfvG{(TSGXYtD3N?uEOJF%=!}x`-?`?OU26(%G0Ab)#FCc@xHz1-tPS4LwWg8 zrGDlYcFC`_`YDSFe>#BJDYEw zFq|^59v(L}{}p>m2&XhSw%kTg;EP|DP9uOfNGkVq)+wFR1bs0)>93Jtu(FvmGP~xm zw27gJ4I8oPrC_`fThc(?Brd%x{l>k4<&}HS<8Wp8QK$2idgnh!wkeEq{;WsphL_>P zOh0#L>jCA}O7hJ0+4Q6Roi8m7A{1a@&zYO0Z`GO|LfeG9`*_E~aWaObC`;#g-}6e` zKWZS{)MH0+nm4Tp0w>fARHO!Xm_8p@J>dL$$IB6xT&jG6%3|gWXNQ-b*1On#0nW3w zySx#@ci=VnR@Zi)SJiadQML1w!Pa)#9eFKT+79dOT)i&Z*KGHP_l~=Z{qBFso;B~O zwR+6%`{FokOx%3%#5+Ye_hdjiVoi`{aq$CTz@rVfZ08qE=Pb-JsimXCgR-nO1|)zT zlFE!`;7Jnc8elYU$})iD7!kHHce1<#R_Ev^Oz35Jd5%U^6g<=i(JHmC$K~K-NR*yHK;GV`MR)p24#;T9xj>Mkuy1gRNEon znt}Z_CFY_wBVL=Ge_Mm5@lOEW4eeroZTp1TSDr(U5N<#sXU?@J_hVzmLhHW%9`rsk z(>Y(FCae^b$i$SL(KP&vkuAipPvt`0($$R;z%4%|kLGoC2~qL^a~yLHlY4FnzI;D; zg$F!r%-InYHC1JMcS+*r4c8{bTYRkLXPErpFESzxkMemNXKdxLD%d}= zFfDXfsJ(W*zqJRwd9n5#gbz>U!Jzi@`dMbdTnmYEM zaMy<5aKjkTHdhc)2$Yn{vpl1+;_cOmJ+K}>TnF!56gG z&q5kchTFRd!jWpYb3p>z`F&8zCRjl0YC7NPBQO~+c-_j1HHrQjZ)MrAiKlnWLJb@~NvX^$^{quYM;!erT z2UF54rD{I5S}Fb1FUC;_l~(hny-UJqJ_ZO|UI?jf$Y!#m5(^T-8^O219uxQ@wQoS` zR@M+SEThlQt3&&H6wsp!bZ@}(%AvAN=T-jLnIfNm`GbXr!+v^I-D$zDo%Zy! z=Dt41&_}H9-2lJ%VWb~MeSET^smz@{>!@yu%r&D!Cy{GRynNd=_ovCzyj~0aJs!@S z3KnSFUyX%fiVdHq)6i?jETb4Qwj@#Wg=CDEQtCJCr5eM9w0A|;XT7ntpM4u@afk@m z-97ig2P8A}l)jwF}Yo9tCF<#(SJ}Tf^~-arZp7Rf8IPf<-tlrx*i7RChOMOst?!(wKy9 z`pX1vh(F_8K|bG)4kHd};{BY9v0}u86w@c|sh4Q^alPOMext05Q<2{EQCHN@Z^0T% zFGj=$upA`q9dk0x+i`LJyQqq@9~5ou?S#<_%tOLytltyanWf3mOf?WHdg^A&-u&wE zEgKq`j06oVl&LGZmgTn{k>^K_w$Gv?&>H-@>Di6Z@#Vp22xWG@%D5Gmg^q_WLhAcz zo)_H~X?NQA8->uI6g+nJjt@5X!6>rAsi!Lw2>ztnsfxOf}0wEhr&Q<-{xkx&2q`^ zqv+Yt=aqEHD#$xO9$H)VYI3dT+18RhMf2Ft<8BpL#$SuRFO#MHy&=1g=&4ayv zfTaAh%OW1HOMw*68S(Ra`tl3%QBzHQ8L(#&Avgy4eH1RSu1+k~HkDshv+tE=w*0o( z&CD9WI{gg~c{Y`LIRbVx52;uNB%sgh^lcIm_hF_9)23yw;4a~J;y$0xflyEG5ca~c zP`*86^(+(nJzPD|v)^q)V$`^9*u;pG#;w;X-`P1nN)~Ds3>2m_O-xf&hPy6abSI>K zr?430VVa%cUg9Ie&zQ2o;#1Hg)fc%-aJXCWg!YYzK!ZLL^ICp`xR~jtt4M4`gHmzw z0){UInZa}43w1I zsVgK5?Bsz8^7m@bIT_ok$tMUm5!^1x%GXTx1aq!lYgd=_EF*ONSNs8mcw@UhKwTf1 zg~xEvSBP}5cWa&xpZm+|Ld6d8%j9kEwg36-H3T}@#~|tc{OL+5g*)FWL>mt6Ss3Jc z6V+0qB#V!H7IsFNX^iW3iVu0>DBSGUfY|T9xsDu)f-r+C&?4ne*y&7-lvQPFGwD2;X?f`8i%l?;9JCRr;|Jf; zRThY_3)7=e*aa;wq4Mss#HMi3F!SWfjln^pPYI{}#c)Urerjkbcm8_$K30BvKUM3? zX1*|0pMdW~e$Es%6`>H)JVtd`8uq^rO@6?C>ClktHtVOOStRIjAqs?e_XJIuje2HO zS^yYle^uO47nXC7!l+rv(Cb{*S1=OKMKCHM-20z5K&o;h`i_$JPwV%rE(@f z$#@vhmW9Z@say;N@m(dHHY}1u;Qf`Tsa9tG9Yq4s*TCIBNnuj?;LS}6z1}$SE(S8Q z==@6VXPCA8UYVjHc(}&iMyJW}Fu`Hu5(^p|YF|vdLQbXSrR%BQBh2$h^pEJZ^i9mv zjP&9MO!dRzEyO3JE;pBtOH7p51N5^POIs(2d06fU!pqyJQO~VIS5$W=>M(&7OV*3O_7WZL!b1hod0Z zV1-)mU3WS*&n~!sZ(QFcz08o{S^!<%YO%-dBEGQ9+0#n9Lo{NzC?F=QxcAR?^l!mQCbK^mH|*bu1ldqBI4AQy zO}k~!^I9&?t`O*R*D|zyo9EBXda-KS8r6gTwJW?9F~DDYV~!{UD5j5|8!yolGKLTs z&Z~a{y=6osB7IC^|MivQ_gitSvg~&uAl0EF`s>i+OY-D1<@_A4hZt9c@@pHO{&h!< zamrapYOE;ekL&oPR%>#^megrMA9oW0Z-^_MK&IOakuUu!$jG!fW@c ze*eLYIzTo>S*{OBVnV>&;)*{sa9yC+NysA2Wdmx zM3{WT;bhWjAM^`Ylrm@gUVMcAu<1=56S1Lru!{{B$P&i+QTC7kDdcVe4MsU?RfXSt$*ZhJuYY_~Uc#CsZ^e z)U?QU;eL4=NJK^ORah2tj*qIKY^8BIO(J#%+_sga5S6bz(4kvhQ@lx@0Nz2Cehg@&o7?O5|85&=w&0Yl*Zs)|RE<@bj zko^_S@xGgh>JeK#H-?UFX@;gA6zygKgr*V57_oBuzq=Fc7$qQAVuvoj;bm1;L(*2f zEPSybyKArWnf~k{6^YiKQT-*wYN1mf6BjE3F0U?itmi(e>T@RZ1YhFV zRq*6bYSFqlGbtRracwJAdcP7PoLg6(Y&1s_vpA;Bwz1EjKm7G7U`H^}6X~WEri~wS zWN2r@dAM4`s#{V>MJ?#)&7a33d-q0b;XM9oeS|$OYI^^6cPocr+eHwlLC90R7Mu2F zU+B(_7Zplm`HZs!54krFu(MDsQ&@HRks4N}ROk9ESXKSOXjqutCP68bjFI_w$t4M+ zhr065U}Pje9Nxv+Z&GUw!FMTRl~`gzH@l}xyM>0GMEL*y5fuani_*1>NBoqc-m%=c zS7;S+-5DyKv>Gj&6eulxZ+?aK^rb~=wB{770SE(Y0!q(v(amQNZ`bz!Aji@f!Vuiz zhQ@*C*)oskO?hd6F008;it=WeTn#}k&em%D_CAdbdR9rqVeNwXV}I|g45kjI(2`9@ z8!UMYV3x@&qJ?&!q>97Cfy5gy%o*}4&Qcu+amW~#J$h<%HudxEwoK0#4D2Cg9`f-w zMZXr}oTpBRN5TU4NMPr;DRm>fLF#@*ilSJ5sK^D8{+17ajBz&kyNcK#{4l|W-r9eY zGY3ghm-ZLcgJCtQJ_D(xBouPQxs|?BMYmJUnMRfyf*;ogj|6Fl{yJ>QH^uQ zJQz6gRe#^yS_fr;Jg5EY502>R-+jvJ(p5yZ?AAlhCz8I{X|ku~>u&86gkm&LC?je& zcA5}rvtuW2nLFo5dXi2rR5cJSWp3QoYPePgYjdx$gZc4x8w=V}rHN&rOUrv(AuXeH zzD-Rf&e`{q)|YH`b|d{w&ZPEJqBi&?#E#fcZv^9b{_kz?)HJl0Ng1*uLpGF;wrH7L zSxw&>JUT7Q!pNJTw>SsS~} zEo3Z%*LL>_iN~nO$K}nz2e!W0dD0;RQ12;PL-H{8x#TKSnuQ)&gI&A2d5#{G7Ho&@ zQz5#>)~DP61AQz)$-UFu%`vuI8_~{{EaX(4wnue>GdQ?&X+s_e4fo{ zw`g8W)74eU(>jipV76!CMr$qKp@)KldX{ir56c~8?>Qp1^J^B$&cqvMao7MS%lC0T z%k&j!n${f?{1cMZDOqV#e(j&IU58u)<1Xhm$|p;q^5@ZWlRobI95F#Rf1zR|N*5fU zm`g|PcxfkgK07Z$4+RxrlN|h{WlQk_v{S}Rqv3S>w_WqV^7Gv9=E8Zk{~9OOs71XF zYN282);-qd_Nbalx@B}rnGn)!T;Q;Td78@B^*)|!V2V`$@kBf(A@h=;q5GHS%)Rg% zJHOKQlT+}3SlPPmzuNbpZ-&PSiHc}ySr&Vw{cgCmMPm_q04(IWyS>n(o&I?_dP@*)4VSw8+jQ@H?0{4 zTE3r#mX|X_qAr_I*qg<7=ICSmPoc3TZBVXMaCNS_l3&(Vi1efR(ts=9_OZi!y0>j4 zgkWTN(4tbn1M?gr^e1jtIwAMz5n2QEJ~z2=cSFdBT3V|W2deTBoLb5pb}cI{xpU# zco}Yu=okEZa^*xox-WRRoj1-e=B$l*{rW<_d~O6_X-D312l++xmUOUUYLY+4$42Ql z6d=A6=mJN*r^T+*3x?77+}!4z#;1JGI=casps#?-SaD-Z8-nrn20Td`Mn`~#pbQNe z-F;!IiW46epN-GqZmZu*k!+r_K`V8(n{7AQcCKs!4P|l8tk#GW=5O2;lJSr*!BX0) zmO@QzPM(T372*@Amu5nnrDq^f*HE$-?;f503d~gQ2Ft0Q!tD|spWU`ab<>*wX=z_J zi@T@lg;V05$>YV-Bz?Zeo<;jGF|lht=rn^UzEU*|oAnNWDp%Jd&+VwBxgR2D^QU8@ z#UQ0F@N_1LK_^xs;z<&j`5_?MTd?$=Wd|R69C`waZYa#$49`4&i z<-WE0?c0aqRE-~yK2>M6oR$)5YP+5PotXXvL?RuvAe&d3{b*(KFh?d69HJoXs1i)GYFW_YT@H(3h`%3MpUUCC@ zL$rOpIp9%&g>2K=D*mxtg!~`c<^|rRW4J5^$1Iv#-6c9~n@W%TH6%N5v&S@8soZWw z+Ysms`biq~BwaOZmK{L93IvRJ$!v%T4|49fekr#OK&z(}DO;?qEAgz9)}dm#LWkb( z*m!ar9C8*3C#9n=;H3EIld5+4tP_-nMA5SYI$N&5J!9p>;TYsP+_BSjq<5aOy&pKO ziM(B%#r*Y2q@Ske5YzV9L%^;mb-s8pKJK5Jz1qIeS^~S(<-62;aj{AUDR6#7-k5Q^v`TiC{$N0g|9$4u-`;5#GU&%b!UO^?3D!P-xF?7kq>=hYXxZnXZD7(=q z9R*@W?|P-k{6Je@^$p^+(iOGD<`jw~y2wO<4xc*VV}c541h|s{tmj>~oU8(ERQut7X!Q*L09@WKosfNz%MD6(3$NL9u$_<5w znViM`>;94#7RyTwH^;6o(1>bTZ?vzX=4Eh(>!1cm!&x?znCHAxt5NU<{(!-4Lnd}p zDWJ$u*Qazr5wK2L1kK%+)Qric-g&5->+y%dWOxqXq8*Cv3G3YNtrey=q|W-2NzaE& z0J4@P{lIh_q!vt5vMM;vq9$m&*yvOK1wmqRK{g@5P3W7<34-C@3}exA{*ITyP!5qc z?}<5T4ED(qqoS{vbdGQT1f@2(cExg^*7HrV6}L;fKM4j4Y2WJ@;U5fNKhU& z@B0R5iEA!1YU4mw3Td5xnR}XuCG0LG$z)S830A z{tWNCnoqL1?ln9t*%WbhMXx(4CsY`A5Hd7patrnvyt*EOAG%6Oml7(PHg%3kd`QYq zp13jI0@d9;JMuguW$ZrAo+*b-WZ&wtkW+)0$c1;?Vnw6{NT!bQ+Bmm2O=;vx_a)MG z9Y2*$Re*!&(ve6woWiBPZ|4V->YL7;J(k#|i&nG>oUA?{pDyiN+kTx7w&1amzKzXR zA5dE*(k|=R`*GruN+^=OR(^xACVI2v&}jEwxHPUni)b8SbOLQnVywYB@{fL~;JWcP zonDd3M^dBVZQELFN`#G;y!rC^;27n@-*|#^5SPemkF+nUNiysg-}Xz+gE;Wy^#=yb zo?^%B0b&)dkDBfii6QJII%C#qb)7Vu=KuYYL6`9oC*DwVdXLksqa_IyvpBSLsso{ed~xV%#4wo9rSym;^=R(Z6_-!SS0G-g_emR1R_J_5h4yw)Gsn@Ce-JFyN%!~K z?p(qqc|M$T52>iYXvtV|c)hOjj35%j!YNP8R@x~2P8#A-+f@rjMPVvfCfe2d4c<)Nhd2lYS47oEcuVJ+{60wpB8ArCiwW59}OyjOh#S zIkDXK_d0uB)pgPXii?iFh{loUx(t7-S4;gIml@;gVep_(a|8_~en@BRey2AW!!q@b zDM8A&yt{{SLnBv+Kja)7XAKamy!Se3a1SGnIl^jnNsX9QQHbDOOrr*8RIE~` zIChT)wPt(CN((hgB*IawFFi^ra)waeE(n+yZpYWfqnTe0(9f}9e_XYF3g|A@rW7A> z=5wDZW%N0`8Nx}PBM#$7^M))GM9F5`web-8X~XY8;Kru$c_~q5j`X~mrl{e8R(+WE z78qK)*jEAAU2Q>mZnb(0C(4~#Novd*>{iN@>cxR={{9pxBy}2%$Q3%ZEA6>~vZH)h z@<|gEQ>*jEg;bvtKb6FSbjb8aMor@Gag5a^fEB!f`5?dSr#WR!hfjb?xS(o6FqS5L4Yk$ zraSk1$>u>kgE$^$Z@qN!Fn5~^i+ME3r|{cgrF6Z#q!Zv|c8?xqyz}YZXExq!Wg2M( z%xx#Bz4cu9jaC6MkuoBfJExb*nfK-CJ50b8OCb_s&w1DBbs%5zNBY)ub<6%BJK%Ty zS8k^aLHvB+3ky~B2t)wR2KS)+_l^hD+)!&twU6=A9)Fy9mt;f!${os##9a&pj4)T! zA^@r0uCjiV34OH|`?AeJ$@e?5E-GGvaWg#d{=U>;P4CFQATZF>{pHdWs^@HvK5wx$ zp{?ZmS(m|3qh$JaYh?x=Q2*?xI1$8Z%U?nKoeC(7<9D+thCTtqa9g>rMW+q6UD7g( zOAMY9$ip=QKMeW=FlvXPp18()`UZ3Z--mPvo3{M3?ov%55wJgBB*)oIP&%d1>PT7~ z9y4J0%s)$?IwsIk|#{VAOIv2SD}0S3(#D<81au+&fzA2bB1g$JLkoyNlh z*81~h2rPbpAgD2LSs1UpZ*#^s@T>#8Qr^yl%MrWPveP(` zVtBs&DpO1Gf~t>=mb-)3U8C4~D}+|NO+sjujkx`{NZiVfq(B15(o$wn`&RkwXAGJw zWa~ThMR69=u8Od1ZL0@k=huiG-u@#;ip|2u+*jHDATimxEpCK-d;wO80c!Vu;Lz*! zJ=#t!h>dC?@EKR;5^QBIs!Kp_&N6>4{)Ot+B5WY zFMCu9@oSGC+wx#*-prJ998Xu5>wiZQv(DzngYEl6K26MF8)7)AKR?~>2cU3cQ6gN` zT;Gk*qySvb2+i(Ur#JV~-wPOXgdM9gv`KhDD}$wMx?iD#+$Jjq!w6J*r8LggY!!i0 ztE=R8VwNd;Hk0HWiE8*4@F!ROH~2el--Bvvk|t_XeNIEE?DHvCi_3AXToGd0)NE}& zS6*W6a5KVfKV2iK-iJGD&@W4+j>=6Xs8>&|&+K1NX08+HFD+5??l&xJ#k`!!o1Il) znXG0iC7ljn-jA6#V?te27fPnx{NsPezL=PO?RKKP7h!C!(9IM0hZx5%k42S<(uG-K}m{{h<&#RN{ zUH;A^wj`k+?Swf+;~I~k;#mj()Dy)dcje)}?{vE^a+qBZZFd6Kf6{L2mqh7Y?Puki z??Pg?^Byln%9_&)2iLV+;A^im44aetrU!e{uHH$Kh!r5xy|pJ;^soA9A8_RcQ>_|o zk1VTyz%qC^jQjTx+@G<0_&G_EDm|I^m&pumw*gvat;ci7&q3UWka|=p_%;uRlPw@> z%p?R$G*pYZH(ar3Rmst=kBb4)+%>Mu0ghuSHIP>)dz#2><8SlarGNU|=N9vDHj63k zFWGj>ql%x~z~keen|ea%d(cY>h1RYov*z9pGP;eqac+bCOFx~l=m{EzsZvcw)SUbY zM@FnA!=01GOM9d@2ETPp8w@-sx#Gb|N)xjvd$7Y=$)=|-sQFIfaA+eQ7-l{?82+wu z(5mi>f~ZaEITmDBP+S0wk5d5@2U?*%g zFdI8peM_wQ(T3wH&*+em(Vf%Ea`L0zkE`a(p^F_))|_~O{Sgk9J(Z##N||n^UpBu8 z#hQFGPnkl3Gw;I^^CF{d2HWi@nNzTsdSR>w8Nz0@^hAW}>s-wHg)Bw*fAIs*mmd3y zJfvwEs7V?=2J01t8wIMLCp1JExWoXi1QB?JF>NsI%CKPqs=C7lo-M?nViac0{hQL; zVsu|=jV)1Xi>pa74Q$H5W-)Vwhm^S8XKYqVRFJ4A*u_aQQ4|o?nq-V>BLJ~%WLLQ! z+Q-AN2a2O)>eJ7&_u5(W&TjZ@&Cbvf@Q!@q2|3npfHw@YF!1^sD=5BGB zJ5TG?N^Hw3UfTUDJ*(Mq5*3a6D_VJiE?Y|S2q)sVec67e00PR52ZGhgITC@l(RXLtLjLO4KB3i2>l^!a$GA+&hkPpD2p$U zi>PV@qcc!zjgg*o8g5Xlgd}fk^bubr{3xHT*ZM$1c*{FlIftRov<2X%NVyTudwXoG zD#B8-h$!sMX&~J@f+f#QQ|dr*%H5WP3@5Y)nouo4-}oLswESe|xu3AG0j1D)IF7;M zkguzyn?7Gp`pZoh4O}AqTNf@*4%g4r|0#gY>vbomRrL+e6nUX=L$rm8Sn8sklYfoC zrAMb>1<%iOq#SBmE`KSpqy^8C8Bh*`UqO~C(>mCE9=E|g?e}GyC4yzHZ%dgQix)0O z(w4{WrP8qRZu@E_8V&=!LI`(TiI$fO~=W@%4f|I*0dLXNLM0V zjAi$vU%ld3IGXb#l+7 zQu!a^mbRE<%Y^H6erG(dIPYdcxz|sjas}jI&Oz}dCg}n`sx4YIl3nZEXv{Z&9_U1t7^oQ zBWi8oHaXe+Qf01HS<{bfZcOXAZlrCBVe&Ykdxa0BHQoa!Md4KF+Otc3fNjP(N=_uX z=&aU6$d4&R^X=XHqp~%NWdRuhP{BmiO0nhSUeB+>;1axeQPu=ouFC9LT3!N&?l0Lb zV^_MY7~j4luO|zNpv!BiX-EyJWovjFw3PChkAv{qZk1GD^rFV0Rn*vTZ-~8rUFSl| z#B4nKia(t$5`~82t-e|#@|(2JQcG3aax}qJE3auGoi#QRxxy2@U)*!=TB2(&=h*GeiZQoSf=$C6K=%Ma&lS9neuX3|pK4vY z@p&u08T|peE#4M}+$Mg>s^5%R)lxhw;+|dR6u`ee;a3(jb8PRBxc_+?AgXKK*}Oab z$42JsdiA0FR}h9fOXi)vDN}oq?&fSi(Uq}uDtu#1k zMfOK6(jYGSP*E@ojV;s9Ge#97DW>z%_J7q`BotAzK6t+rm!jI%`7+{fd*Y}Zkx zAETw8<-PWUY7tJd&ZAi3M!8azWN>s~Jepa1tB;&CZ%&!_-A7^bBn<46C+B`5KC1I56D%U> zhgMeG*JJK=xGSG`x_LQlCiU4o1kw_+A_r84_JU%PlWg*8s<=uzN`T7Vj^FtX`7!&5 zu7{LY7Z$Ude%SN`wt7(_==nD2dg5wwgeg0v?tD}37+loyEqS2BPt~H;nuIBTXu3Ue z4Y1(v2p;}pp-1=E;btHF^N_Y|k%KS6CG|Oje2Ca*knpH2X@ESnlq^hf(a4x)a+xOd zhJ(K^-9TFYzJFVcGVnZF{>AO7Xg=ESpUKUxEp%zWvrla;M}>t570Z0bSc5pzK`U-gO?NI4 zPK`5vfDmnt$-B#u+|A4QW07FclgRr`hlOi^?<*=#rHFQ`FM>gC@z`;Y*dL7EKW`fI zyz-_Hnl(8>ygvWfIil_I;7WAqbtLiNqhdlj+IB?K_&%n(qO*`@vKjClkFbxKXdH2J z?{5VI!`QOTqgy^`;(L*tB6NJ3ecpb`-b=5^Sh>mZ*vmKX_12W_>Aj5Ryr6HV+kv1r7m?8MrU01DQxJv>1H z>Wj@XgGLv1dcW#W>c2Tw$91_>EecmoPlqEt4D~Hn9KNH>O0G@DAt|~WJVQWa8@znePlEUSn86Q9}_eATX|M7STycJJd*mT*Z-M6!n6g z{MX02FwIZmi(D~w2RC-?Q%_Fqnk8a(fm5G1g#}}u54TF*OZ&UNdBP#1-1zI~&)4A> zE>yF}ZkA@etGEJX==PZf*sK#EeE7Xx`s_$gy=QCm)8~>nMEkBnwY}bv=-w-t5-IZq_ zh~3ArdWts47Dt&mCNU)UJpX0Cd?qzk7-n}-;^Pv6Hsp4Ys=1pnZFtjQ3-w~fdz=|k z4zJ99R=xj3GoD;yAgF41$p5vp8j+te4_I$tUmmjw|dU0+Aq3A+-*vKH6}3yP>Nx zSJ~=$BBn>WBx!A|7l=yM8!3&R`DXum5Avw(Df*3(c>MRz{utd4cpg&Cw%c!SMz#`C zL&M4pl0WRJsHOT<(slw)xf}9Vj{0H)H3Wm-Id@v7z9MsxN>v4%%j~PLLkB}^nS~6CTI!;w%Sl%licxqEj_J<2{Q!gk!s_zBo)FWIzUu;`q+d^l9o>shpqD8%ooc2p%A2N!js z9?7$RoPeJ%3b6svM1Q=GscSNT24Qs9;pw} zm(=!|vDQW;6R0b!n-Wlsr_ueoj>J0Ok!2U(Q@kg<5nCu6+)*}>0T0JGvJv-GO^^6P z{*$i%-xh7zJI;c~pZLjX`FQH4q)DjfmElsyA0~Z8o1;Alh?*aej&yj~_q+4_P~MBh zYD3eIaT6SA5)13LF!P0fki8Nu-ZXcNbSmcl+Z|)i;Pq$m&;LcPA!NXN9tEe|u=G7Q zNng%QxB`9bCc#-rokH271C8Z;QZqBMb*(N!>D;P|4_mo0Klcz3H#FkBAIh1`$(l@j zZujQPlU|*g&q#k}wYnEcu(tVs{{m<%fxorOJXT+|ox@f?S$6gFSS_0WOZy78x!;p( z+m@``@7^JzAO67q9{`^~V888I(Y)~{mJq@yVOUGSh+Ew{AlpW;skG51wo*y0ay(5; zNHX)!WnyP681db{Wz){fgm^@#*#QbIX2jDek$IVLK#a{{ky*^>K4xbCeoTSJ9q*oV z4xkBnfE(`#8AgKRx&ySTr4apr9I3JpSOr+E^hFkv>9iJ0H?c=jaA5D~6VkjysU zqyJtC;*vJC=ASx-XOyc?NtG;I60TgPUB z%J!)^3&g41i8Cy!*8$Q2V=Rk@+YO~;JzGUZ>3jdW=ebS}M4iOHNWq~TmQrMMeJ`Pv z4<`BZWiW}Df-nF2BpS(SzdS3M*62Q_=@9Qi@Gz~bFF0@2ouZlX$*^PV+rxD;*M!fX zx-)!6-|;-jtzxD{Wk)dmWd)cqoD{C)%MbH0`lJ2&VWZfJsiDfv-=Wfe0cGHLq`L1H z4o=nU0M)!!SnVhTo28-q5>dcuI0Hl`x}}4{cO|*lWBTJEPJz%(zBqk==Uv2pv0WF3 zaT&4aQk)MU&cwWKE1NgAc70fMAV`JCWl8)s*d8=iv~uGv@T9};`lQh)cIUNwg9>Bj zEWfTHQXV3sY51s3E*mMDI%}%_THGzNX;H@pk{zwNFf(59>OL{E+VGdRTBpwtgRyz}w75vFqk5u}2*ap-$m5f-n!(NT#04LH9qirTl!A+UEa?S9HJ^ z_3ioShwDaXY0J}Q98d~MXaB`A-@O2yzYaEGa#_(48?uf3qA5}C$dWo8&jh%U?7I1+ zlDdF}=h1sFL+S{|?@1GOv)i~{2{vAN+HHh}dk(rm%&A}0Fv*2X6L?r)#YWM@cJvjY^lvvRz% zT2SnsmT8>wd^C;ZBrNIR46vy=CkTJmL=5ax2iJ`xHZT1`mFE6SjAj<3++2`e8#%FU zjFc5QJOcbAv)GvZJH!@hV6zTkRhH;q%;&k?XSeMr(pg4!+&8=0Q@2D)+qcN9TojKS z5opg!MEfAi^#O0u@&3fJI>CxAk`d16mgz+kyL8+1RpG^2ZTkuR=GX1&2#b8gmg!@z zvuNFIOMvyXIc*O1?|@j?C^p$M8z?B#qWkogvh}d3eF32kEqI)gL!w$8z(y?dB^8!= zmiuNNr-boEyA!a}L5=o%PBErUYCaq9fO|8K`Yk&LNdJuf%>6k#tm*)->XdJSY&YV} zAF^k@$UYyF42-uPSOnumGA0spU91^PnLQT`HIDwVk!vrQO^M7%<|bnZ{Z5dYI8{g0 zx_@Rr7Q-%)EgjDjR<+W?GX%=X=L1^m2%Hg^7Ihjcrf1vOtlmEu4?nZxr^7CNZvIaX zzF!@s(h1z2T`SO-Jm8;bmly0<-xA`8g$-goW34umjMT#7u(q-o$-_aB-+CV;%RD%*T@0UIHtdWY!^wg)ea|^X89f zUmg-n7sjHDsUk8P6p-;}n5d7{rZXB?Cc5ehy3N$qpwUtTp3^ItZ_w@18#dh}RSY7j zg;*VmrrxASs@Dei2u!Zn>&x3gnPU{z1U$rodFD-9QKNE zW!UsEh+e~kp*24$T=_#6cHm3h6kdhkU|Z#D&p}_+d^b0I*KHLiK#r|e#Yn+%o+d7N z!)V73lKa7-A<3^e%A>aU6DIyeJ_j9D?Bj8dic?V~VW<&L!uWL99q3&H7$=ST@rnU> zqR6Vo&L7hvTWzZPYOl7%@7S5(is=`Juj?C1ZO)|euCrnpwDMqB8+}7jUx=gdBNVdW^9fQN@#9iZQ1l(_+~CDPD|Z^=?d9uJ-ubo`5>T}(U5 zVnGd&T8LdF=j>)AnH9}}^OocobD{7n`&eM}kxu%&3?s34=!Tr`m8a~uJ_U+sFSV7> z$``4gpH>Vya}g|Q<>|FeL#Q(}vM_e6)Qxmzph~b8YuNpWew#4WpDXUSnS}CUSbY@^ z)~YY?$(Gd}bh1grG4!;k(O59#)y8Ke(f}R=gt$o zN$62n!K{1?mk}Gigoc6-Byx?0FEJec(+(o?6x(Q?%5DNUR{of>J#Hs#pUmmr- z)=g=Np)QJfi;my$ns2X!hxGB__Uc)U`n+vsPAH}hNEU`m|2WPj(yp(*ER!-4lCDu$ zHRVe=twTUNAkprF$7_6ru>mYCxe}~ln-)>#cLdnkz~Bi{ z$lydzE_)IHbycIVF83I_!}L1F<2BeMaQo($c(Ca_HA2k}kd!h~xDius zmZBN>b_%OnO?h*rA=kmui!Dp~IU_FOsCW(@7r9L}U~2@ZmcSxNQ7zWR@D2c@klS;A z?0BV`Ad{snqvg$tz?-}e;J|v=vMi<#g?LRPjJ|br03s~%LBQb8NMcC2k*)}gk5`-p z&_m2Wa;pi1Mu}szWs#hVT{V235UUn#*|-{iTt40oCss~}PwAo9XO4a(eu9PDpvn^) z34U-ffI=KnD0EvP%+Hb;VR@gj)xw&Mq>BnF3z8K&VTNO3C{`G=&(1GuihQnWNL;f6 zP$zCkn#>v3Xx3AuB|1g9PAM;&@uQH3UuQZx6^jWcHVqn38KT5FpU#gj3UAEurz3s?H!h>hN6&cEWpSRzQFD(!5=%w}D?*}EWV}AT8^m(l*=mNG9e_iEQZ|}sGBC zR|jCe%1sDHJZKx6ya3i1$Yz=K>R?lMGNz+_cvK)F4xmqcEG-@ZnqU>J*wY@HFzuXI z2WweU2K-3=##*9&)cnP>IzwFi;e+M0Jh1@Tq=iwDA|^edV7>WqJtYb2VIu&LZQkh3FVz#}F`0Du1u+-`u{Uu`%N;zjKygGwBz&m&8wp$^t!Q+o zu`|D4QN!nhVSFfHUcZg}wNqaWpVg@U#MuXxQS)KdQ;ac?EflnL!#0t2R$lX>w_CRk z$mpIzqR)BohtWOtu}hcfYQ9poUi(V<@S(2;%lvEUS{(qDy@D#WrlKMuSAaR8EM9)H zLl>3R?JjA#t~!7Y-i%JoXz+_*LrMo{Y@?Mqs_KSq<2&@-h;dy&Yf+rKP7KL@1SeZ0 z3I~8Bedb3_izw+eIx6xi7JON*L^JMt=yhp2L-NWxh9P77w(gm*pwr*mO8 zfJL1Jlqi@E?4~p}U9SNQ6sdvO1S);S!FoRunOjgcHJFe>^N(HHh|F1Xm@qQDAn=S% zo*4vQ!s`rhLcgH0ppKyT!b}$(fVC`+@udOwD*?(!H`zOJewffb>?JOsIV0f&qn+s` znVrgd43o?fWxqU6mcc0f9flRo^A_bzlO2gf!Pf@N_Ry9`v6=8r-Sd~*nsC8W49*-h zcN%${25+N2Ps7#l+nsPwKM8faraE6g{&}4N^aCLrPNqCo2U6g3eo1oUH`_1>a>(n; z+%N~lPN0+=USCm#tBNt1l;88hbUKM*+L>UTR$P#FC@k&FDi(h76+2``7h4)&jJ?jz zhtPE(QEyg=P5091GV2;f51V0*>Dm;mt}?QyQtzeW%{SYIYD_ zBX)q*lVNp27r#1iJQicRfa`YWCzl}-taITFvI{2ng=gl!FBRA|a4K&~N3Qm+pyD5V zW0ic*RPqwNE|z?;fdey&1~1=8b5P z%mBSZvF-~o`G`^+Q$zPPJ3vxsN^utDRRc=<5w*ieBLm}1kCQKI$h_Zsx_wF`-AZWc z)js=eFr5Wh+iuMVmFeJdyr6j+eCf>P;qGIfmLiRO%=HwRoxX!AR$nEQzC?H|f|?vQ z5a%+D!WuZ~PqgLs#vYe&qY<6XTzcf4O_}!>-woz1tJW%k;FDWmYnZc;^aZDCvzxz6=f(%=}eaO)((k_b70WV=w&h?_29l#G3s*(ZI3SERUnHyhnCZ~mm z)&V)IFCZV)56N*IFssi(k)7)Rp9iBE%M=YE{FV;-K7ALbsp|l{<5C`2(+ikjxgzOF zmlI>m1L-o5brja~q}Z~UxA8Eb&YuNX?U_5#C)V%8!_CMapMTgChYq0W4)cA^hCJOp zp~n7Y{Q&qKM?M~oE)V`dqyUL^Ubc(&NpFY zHwtU=0wiCVy2U>zrZS0R^%eD7N04DR%{<@c_`=cwI0G`>AdMI=cocpk*wWA_y>+o}A4l!RNM@88 z2GTV<0C`dBiajoLmKEw^=aDYyoUIWan}1lp_7c|wF~y-F@bv?-cs5r@%K)=ow?Z$R z+8++-_Fw37*8_z@(Q^DC=iJFysmy&zqAE0}J&)sv;pIR=8&j{ur;*zWDrs7i1w{qW zHJH;|qqoM-s2}I~@E=i~eD>(a!ac{opl2g|0-lDi&h35^TRCwA`$^z(*aWK&2nmpp z9u^Rl`91A%nXk(8w8!gVOIg((vXWO9>vpYtN~~ATQm5#89Y6}>-5D$;16HA~tuGOo zC99-83wjjzhRt!E=Fc17Wz(CLhMsTgf+&9^H^MBUMa^+_hnoZik*+JuGIL`dH(LdhH0B(^BYa zlD58xR%#WTqET3HfE8S9-q92zJdN7}QzFtdc}95V__}|iO|$(+H8WZ=|Pl?nLzbi`axCDn!*>hAka>&e#DNOIAq_ zatOKm+J{}^@w$xK9l&f*sn%fJB5|rX%v6&7ev>!(;tf^tiXLb^H2>W&uU}c;qMr*w z6gxoDmy~khh$Vjs{5)L)TsC`Exc9_oHSlv`D5>dJ4AA^cbTVs^H4FeL7?~V%|6Dc{ z>p)_ib%cwZHBNuxCtgs@A~r^ME^6a6$L@4#)bD5nUe+hxA3FQD;S+~G5FXTgpDq%o zJIOyP!|DoE&ciwQiDzv5Nb*<-DGASg73rZYSI(MnRd|Udf41k!intaw8;lt%$wHgR zim;OGFIp1f0|JZtwGB$u>Hw%TrMZqHXJ}<4vB^u?J-|8V>z?-keeV3=%HgniY({5+ zmM#pJY|6ti@A6)sHU2n}U{J>mZil{n%WJ|nbce(mUwKM*KS7oik@?BKr}3qv@zc{* znMFEdlMabuvlcc5?7I)S z@h67!%{L`1ogGugL{oOh!XkLu@q1`AIZ@zC`5GFA zHfs+>o*`td4v;;v#*_@WLU&+Lx+-%_Stvco;X2@{lqGUbKh|ON}dd>4~^p_7%bO3IPp3=)HUpn!b@C7YlIAXUobqJW}6WmW?3Yyae zZ8&y=f;%gj`&Y0mho?P;>9ofN9KbK-B|S(-DKF^~TeUMvR+U%vGCERjHs~6mRtJc> zQ0N<)MVF)QP-CeXI~En*itQljgRiS6Y#Q{^nXC2r?@e~#xkJKN4WdP^K~kd-L(NB`R2KSct|>tQ-kXEI%QCHrs7YR=DCW zX9lJ`xVF$<4iB99rsnw{3XhzYzjO(fFL=O&ZS0(mWUepgCwAm#X9{qY=NYOoww@1m zSpGr$#PfDgb)_%;9I@7(P(+!~F*?-h0H)A-ffSn&45W&)hKC_{x<|t8KS;{c=a=hf zg?sgl`?u=ju1tekoCUPJH+N#ee41g|QNyOhwVPfZK0Uc7oLbh!aF^nUX-|h0oB9OA z7t*Ex8Dnxv8y_Cn$X*wlATerc-TkxSPW^`0UR{?=>!ZKjCJN<-^zjt;@r46+KmVJ@ zzZh3*+JZH@aSB|&5NzZx>Bx>U=`^*-qyFeDbipgj5Hk)b7iyF@nKLMflIN<8KcK$M zkL1gSux>Z`?RhQsvXD^7{tUn(hn?$#JZVeWk**i&cYsnMPFe7nglJC^=W>+Hf)5ys z&G8%IDc$|}-s1Pdo{61dd~8f#GYD!dadoKOf<=w%g|v$4hCP#e!}U4~d|r1@G?&np zLdHr__7_@m>phB1r*gHX%i(*QP#ZJPKT9vH0e%MDDZuf}G7<^Zb_Rxht{BH-yDz%4hYi zM7E8>6wKr(Z1Tsli1sA0*>DDc3hl{^1yVB0JkEzVJk;s{QI+;)jFfM9oRX31?JW~K zuekwOtIU{xMQ?}Qqu2Ltn0>i^JbF$)0NDzwnl=#PnLy_NsY6R_AN-(R*A~aUZtGja zy?SVLTFa~Lmm_VGWLdQ%lXAH$u%XM)SBdNROP&&IdeBclUe&z*!{HvijkQ%T?Xa@- z=+Z%5;GR+@jrKOrN4J6%pooi;K~H8#?W7+&vCxs}cGs(0LmDvZcpTvc#wnGgLvy=$xs|Gvn3vJs%o;Y7s{$1j?0Be%Cq-4kTy5&={^jq2VoOGIr}}m zxc&Ij0lQZ|rfCo_dU5#}ZzVDb;zl7pM0I9TdC#A^FuZ2R+XU8E<6xGX;l(o>h0K-o z#qOua3Ezhi&(dIu09zyc*_C7Asrd(WKmQ?3WAW9&OkJUZ0t0O+YYOS;^=@}1{t;*tmL zJjcM()ZpmS6I%arw|)ccto?F)qt#Sri1$!p;}@-|1$1;tv8GVmIeLwz9^0q(rB0yv zs?G74w+e%PO{Xlj(+T+#-*lz4^GbhR?tTwSBa5f0cm`sQ&s{0q(zTNjb9@`YQ%r*< zZ5y`aE`gnXY07VM?Ckokv{ibH3v|uJS$Y`5jm4a^5g3 zHy5%@!Q7I(E1FOg)T%T7TN-YZ!kn#Aw&4;$h? zDAMqO>5QPw+Kgq31>UU-;n(l@2Zi3Gv#h*q2U%ek+A3DDDRx;kPWfD?)d83k2Bs5} znr1Wo+EuaUn=2y5mN^-Hb(=|K{v$R$$*(Lc^Cp?uO#t#GGL}0rHd+T{TcbDGbN|7V zdb8unfi>ky`Mq3*ABIJ@wkp||E5Y@VM?oXv z(|Xb6Yx;?wCC&fGbXI7NX@#hC#0N`pIz$J^X9Ar8x*FZ}Izf2dwp+rBH{Ylpvm~?V zPPUCsw(MY}GMG_l-xA)+h7f;;Va4aHlJkNW&l`lF5j>5UUdJEq`thg-_;( zgWM*uwtO5?I%D1M6nkBmnvG&z7n$9!s$R!LYa51uacX1U9%*i?>O2g>X1 zGw1a@gX3BqKut_)aZH;Z*sKq}hlH_Y$xm`~&asL!M1(aAJ?_$vV0={%iVo_o3HScT z#yAV`cqvYO;y!vr7PF{^2)%iHQ@Ca4yTjy|o+ap_G*$+>4dv))3s!c(5-^G&UZ1~? z@mNsv+0!ZZB$|*{H~0k03*i|QI~F!!jr{@}5xxByY){lrNyqcX;)nZ!c61UYUP<@i zz!DNJ)1LO&1Zh|DpgrwziFH~P8GlK{8AIb*9YFJNtw``*D8m%g3X2m3?YvT6(zsD# za>FzMJB3zwTx)~AbLQSKzp|(o;PvY#V=X%ic;ol00`9Y;g6`R2G}c3>7tdW2UbX%0 zVyXk+TRsycKTCf~U(B{JWqC3WqLh*Jv}h{_7=rkH>BwEX7Y-E`oPd`$7n&V`vb{oH z2b=X5`QQ!GI}Gc-SnPU|4)ehjTJG#8*wR0Y5fkGRRvw@F z5VOFH%{r#?wcDB`DIVAD)3@*ZN8yr9FVj>=w^8Z1bPnslsS`uH?HngwPRp0M}aoZ;Me2UF?;*wX;CBBOFvU*;Rt!za(JdNBjWjsia z@i^0J5uef2Q)M%~NvG>B^}3wceJFYBVyksvwMxb6zo9leI@Ia_T8XLES{N$>g(}k{ z=wVpnCt+?pt?;B?{{FI7dM>T5=w5$IQ=#;G!q#Y*DlsYZKiO8gqfS8Cw@+>l@7(kA zVMag0n$H9{>(>J2s?uJ$eXb{8`goqG%FvNyr7n2hxQzw_p^eCC$YH^7!-N(7Kx~y+ zO_w^VvO#I_D5GtvXRTz_PSXh_#Hu*qRp*DW9t*UDCM@1kL=YIq#E-T6LST=p*3_w27`H&8G3#RfNtb zCRly9!&aWYZ+cz0X72j@)cf$tp>U6GUVKNNYiV;6g0EFr@XTJgWW$qS`syIbJ#U#@ zgEdfZhfXWA;%=yQ25>KXN(NB!;dJldU_~6Oi~@|K9;`r0xbvkfWp`*SJlGN>TKCY8 z=%Lsh`qbZ^$$zGI1?Ix|xV{Ldhh1?Xcf7x>lh%u>lTi6BO@&^&{ViH{d?4I;=)=8R zklrw@u_qngVf%bY{^Mx&S$Jp*qTPjp<)jJgVn@|iwlD1)!U}JBD~^(c->28p1F#as z!gj(-wd~}lcK>3yeCl#LCN155WAWda_I!B7=2wR=&)pF|^6VdIZPpRx(Q^>1XBl$8 z-Dt&3Po8Y8k;6~Hb$K})3*UJiwb>e>RtIQwd8ApaT*Od$^xc8dpz}O-Sv3tG9vcUw z)T^n_mydoTykyf2;gzk|gh^cstY}`pvaD0B9XzH$MdfR)U{IIkmKfG!{?xCceM?8o>h&Kvb%~MU6`Kz*Oy2L`4p*B`Pu)3-6 znw{?q@7euJ;R=0~V|r{-Eo?rV?4Gvku*P^xXM>sW#_hLgLEv=wlPCV8ev*|Z;hcFf z%#KaU@|hNX5eE5$co5%t9)mMGVpvD$%J}F|>l#3_>r>v5lND)BhGOkRqfTeLc$YTs zoz;9*Y^tNk=8ds=y)pG)^aThlCezT*1u;*E?ZtC}?1Gq^q`LUBTcwKIn)0mZ+JUDB znHwP5owm+}=BT{qC=O?*6K%Y7hXEH{ZZD{m4m)008-Xjj$g5NAfin;2D+wP7 zrWRYc`*6J>NDZk;_smVfZk&}j z`Q^5ZSF>&%OJ0Jd6?<7}qaB@^YJ^%HpxbDl>^o~=7bDe>{OL6i0dUT-E+?PUxiPsi z1WD*J9n8<^`#ATXx;Lz>w8NynmM}IRXKz%tJs%L3cZuW1?NP18U(qk8tSsq_(GBO% z>*X}_+Ewezd`mX! zV$lWGbS8S3UdLKJxYIQL)o|68SBLkW_s_#sn)A2xJm#tPv*G08DZ3d#UE7)0>s@Ew zwmJl7-aX@d#8^LOV)pUF9VuhkB1u?NE*C_x?VYs-oASHr2-fHGMu%D*pwnheuh$;2 zEad{JqGBm~u{SE`XRLcz#A~oPo#aFWEhbymMb?L(`2(%Ad{TFMx?yr+QV+;96%y7u z0SCkXWRK;@93V!d#bwn*B(r0q_ryA#S z4XA^SVAs?E1s}3KSFD$dGOf{FtplZXx9w$HZw^0y{=W>@OkWwMbv;GnKeljE*J0d< zh=Yy2`bpgv8^?oI!jGNw%t>eIgVFfHrm_w#SCW@L55iJi9&EIJ0jEHn&hl|@{%)gJ ziEz@v@&;ie&wvBya_~+M!lphJ^(OV=J*^K$eeBSmg;PtXRJqMCIjMWlTo33kE|-XB z0Y5l&0)C8-PQaOf<8i_4#o-q(`X9p;n{UW;$ll3y(L57wnm_XCIGd(Tt?g@+3Ve-`9P= zr=vUfJ-ugZY^S1@?mOM*oIZWJ@9FjS?JK=1koj`=EBJw{IFti$S7Bq}jcfkUw!!%G z*p9NleArHmoeV=BU%oW<&=UZ1S(--|P~;GfyP25cHypfEx(UwT=W6*1tcsVwTD&sU z@(j<5pV!sb1I*wQTMCwN7AAAaE6Y!uloTJK$0=T#S9tRB5}jFrwmVMVX?Gs~u1%Cm z){4z?ZEbD%awI;h1o`}<3#}0<1#b*rN#wHw_5$PBTEU)RZE;=Qqs2Pot1sQF!8%b+t;6DOjw5LlTEPr&@WG8ckA4dk1(kzp(iTECl5`OaF3DQdDZz;)z$A|<12TGi zE#8GFFP~P>AuE08sI;Vy@``--;C0kDul!wmJ>Jb;hlgDg&69R$3S<7U;n0YLg$87b z`^-Xg{LmcYA!da1HQ6XW#QosFU9l`tDFSmyN9D%YL{I>6_>o@1hXf)^g*P%gUdBzF zmcSVd{^^CQ0GR#s^BaWmNh&o?lozD(AtQ;_1R+dq=!5{Qm$ywG*PXp5~rRw3dWV{u~4JHVU58y6cFcGsLB$Ua(^j`_wC^AJ zk{ugA6ndG8x=h;VOJSFt*dS!&D^WY%Qq;FUbFRTM~gi4U!2j2?9ovm#gHB|UNJ zG9@V?Z|%C&-oEmEb}^prF3T^qq1*_*Ky%cF#z(>tHKDC%d|t`DW!ci$_`XjQesZ{) zW}59j9N~WO^zPZRWF_z}q&X`mmI)Yw+(1mYi9ooLWlvbA`{qj=&?!sB>r?7-M= zd@JAr>%kF;T%q7Fh}~|e1mI(oxLpD*7UWeX%;@s@tRRO;G#{?5$#1Z&#fxoZ`m`Mx z+n>Y)pblw0fC|pj(s@;wjOqBI3C}S7X*}b4Cmuo4B*XIwFS!hRzvl(M4G*ubUjDYQ z%z07gc3YC~vg39NPtg1AG>pH@C-3~jurQo>2VoUe(fl{zL01!uj>AxX$9dQ3N9MA!LS59sbvd<3T;Zbc@R|RPM z#6|FAMGnl=h|*4H%~8{tpLdchnaakoNgS`V&TyN4wVM% z=;SjvC2m_%3F43^Y>Yz*W9X0Hiuof_tQ5SV{48sDkb~B(1(m1JTCff6TkNI9i?EZb zWXDQ}<3vvBg+ybz!ArcqiD^FZzmU+E8}&fAGrz=MxBPm$Vburi5)65kw_(WBG-3zw zUEu+&^pvJ>G9Md?qyZt+A4P5%FTO_a#lfp09XGSwxvAK!WRRJb{XS_MrvFy5;mfSfuj@F;cTV?IXfk0+b z1)cUYJsF9I#5clAe(xAJamU6E+W~xNV{6An*aF>&;ZQtTI^IMMh~i&d9ZEu#n~Q^M zF>K=ZcR6i?7#=VH?K5n3D2X4N9Rjbh^$d3-UEm2J`Wz(`DF| zc?(|De`ViwF#MbB^}W~H#=`ngR)?mK;uH&x_lL2@&z>_5d1CpYsR;8A2txXt^m4ev z*Hvl!dF&B80^|Skp1-w2!x;C|qNr!Bi+XuSUX>~F49hwF1IqJ?k369Qw3`)B0j8TC zv5`Yxwa?GLBebpxU~d?ow)JbTwtVx&u>xS9QF3OF^gKg3BD}Kca4lLEuQE%Rj*Av$ zV7%Y@C!VpFpeN{PEry3=!PL>p$Ciw3e&X1oK?eJR&=cT>^K(RDyETSR+-uZ*c z>(CoqY-Ejwhw&FWFhsX|?6H&Iwp(#C=W+E_ z00_$c$?8k-Ws29@DCYp|0kA6cLOB+KFW5wnV`GQH_UFxo^TR%MzDmi~OE=R`;#fIC zl}NgG-gH)iDf9%B=-tYQ$6-+?3}sE*M!Tf@S1?alfe-re1K$H!1E^6ER4&p{;e~|0 z3}h7EAgCT%>T_ZE*RJ?2d)ulTZCi1ht!VGF@#YD8CK>Awqeq`Wek%}U(XotR z$7uHX{pJ=bjU#}xC4<5s@n%2b%F#SDy z6&@JX;p%!0KsnQsQ+x5*LX-w_%8QB4mQzehO8c8biVrJJy}aU+oS4#?zvP2jPYyn8 zU!3}+{r36~+qxpQ?P5~IZW~X|pa%>bx0K7E(Xn@kKKAl_)rP~N2~+|;JsxWvLr+k! zV!p%r^1XIV`&;dbrLVCAcp`m2PJnxS=s{ElJR(uAz;v?oCC-;YOfpG0p)n-BNSXgv zWl2t2D#K{fx?6hf{O-%`N^E7=+HoG%^w(ksXETnQoV0!AXY6EY&_+vflB-sq4MK9B7Dkay`Qoh)_=&(!#3!4ERW^#Shv8mWhTsB_>Hd6(Z^&F zKZsy0z(2>pW$b@1fwzQRjwAU|RD=#IVv^j46RDTBFR^p6f^r=18T`-Sec`F+L42@! z0859#5T$FPPo<0)WV5X+?aP>VyJR=f?!VNV{*ocv7Hj)5QB z_YeLv4lTeIG1d^}2j1XUSde%*;E) z;96jadAy6uA=xHO)Xyz$w{?Y0cyn$wo@_42_)001 zq49G#NEb&t^wW}K^2~2Ed`xu1c)t}Nv2DdrsbqH?`L^BF|L?FdEE;&@kI|z5>YmP< z!b&8auQXoy7bM*~k4Nuj1-$>=xeV!c9JW(WzsfEi+~e7+`Mp}zcq0Cru!Sow*kMi6 zm)S60cN;&23V=e$%1D+ZuW%OKZv;&!JBqmHh-x==kozFWKWK?w>V$mJctw`6>W;#7loYj{LrCs>R{^ zA%$Ly|ChriTOP9eAHLGwi7eOQ>K_78;O_Aqm~32zJH)#b#Y;hDE*&P9aPl|8%Q&9j z`$@}kyctXrkOubSBj3YWLr>Y;*1Qid#cU4e4DnM;O_0)`!{NPv^j(A%)0g$jTkCKw)~a!4QWA&$E$Bs}I9(M#X;Y)B_mu ze8rBB9*%}CV;7_tUUY(4{+MW@gX0Z4xiI6>5uc`|!%PpoRQRYM8Uvdi-BGXcGl}{u z0J$f}?!Z#$?+2q$1t31{s8m|fG>^jd@={)!mpGq}{DMjYH|pu3$LyBzzp`sqzQeBU zy&A1IT1>n*++6155GI7vByunqexW^%k2xlW_|Rm|3gp7+6oOnC$+03}HLMvE%CHpx zW6(T$2O2K-C(&5*Se?kDQgq>OsiB+37@FVDpuq>-6IrqxWs#6Fqe1a_Nc1lFWeY!q z%ES4|IEEy=_~42wIa6H2$Anz1eN4g|J_`g1LTLPD&xTeXzwFsK!EM9wGu+a^R(}jb zyStA4z)Z4ohwor;gu{ExC)2R`;*3f`_ilI z+EwqgRd^6o##p%oBccIuUJwiky#^=AG@aNZuyP<2dIJcAZfrd%niYYL6GnQQ(K?60 z5{x%KFv1g4uAU$qFPIx?jDg{X;>EijTV|$7+3X#-d5dwEgvI8B$unv`$r|@y2OWpRIe$s9`^bOlP^vkFkqh?)E z;4F=b$7E(9dCr#On}J0PeTu7~b^d5u^NE*@t=oOD-sBqV0VW2HqL04=&ja3VX$_&S%vi4;tfBPJLeS54w_A`L$JsT6UvM^=JamzXY- zV1?sfl70*m&&ok#k2J<*I6?-bQ9uQn|GpY4C=J{Xci2l|od*;9Hmnq#u%8~g9Y@Lh z5UoBMIH|{SOkYfbIJz{9*t7e~G`Rt;xnQ|M(VE9fcZ?10o_7PBS4wJoTy6hjOW%VT z*H>%|55vaCFf2lWYq}w6{vHs=a28}r_40Z?#>{c< zU5LjUFn<2AH^5cG7@e)}WEe}wX9zUJ=m?>Nf(bUZve6`I;G{4qKzJQaV zknqhI`*K+H%4Kh|O*lD%ONd+{no6DpaGww_4vSP7Vml0>k}Ev}0r^f3+gL}3`l7N3TW)}K#tIm}@X(2k{48vd@K zN3gVc8@^uoI0Ql>Mfi&#-$Q`L;J0P0Pp7H=(DItOW9hUu~(alB9|@>s>WaLE-o z0O}gNIKKsY<7IsH2pkr%61a*GCYu@1NX68GogSA2}qs2ruEG}BNri5D$Ygm$}V$ty5F zcr}(yw_s(Y-Nus-VaMJ8Jpn2Ndx$U*hUGkuaD+aa^wWvg(}?%sEZ%nP{VA@-@P7@y3(+%CKDFo7 zL)&)lVAMvOl5ZrA*^kh)^fi4M{m#2=7}~J{a2UkhL1UP!NbLDx{xEnNKaHMG zjlH?cz^=wQgaF|isT&0y#;#J8|w4-khr ztPmXfsFDm~8FTmWW0=@JiX$a=+sQF((2K%?=rjBwy+{hQTH%B(@KM)iZ#|MU3+t7~ zl^?A8=Q`He@}6~;9~t?VgZKT{dmDNBJDccp&B8-=0S1?M;b!(#<^rq;>CE_W+D~nK zLDr(rNAt3>cuA*YdZc@&a2k?_IFDx~hik?Do37R#%oAP`D#O~2jiF~KVCzB~)~0F5 z{D3xxNU>tXY7!r=p+3cKAPU28EQVXLL;}I{uv_DI(=OvvzS4StV zb=KLn-ukR?VtC}K*9>fZ49i!~&MAp!7n`wuVSj{WRG7r_?YDu_F*`YV+>VVsgP{)gw|2W4&0H)P_5yl1mK7(Bt5uk_XpP9p;>|J|@v*?^#N%P4L__d54Lm2t zkJyRPBas8NRvhHZt;_kaF9@6Fu%V47SQMILFVVyn9amVIL{AZ)GjN~JSU6yc<94?4 z+&IUp#Eo=(8;`vZ)8<7(C!`as=2x7+JP$wfOsBlZP;KKEf4#ioOULtg`dg97_NCU; zzRZ?)F1MDE(vMF+@x&L>Y>kF}aWxuumj5BU9KG^wxR5j$lK=n-zez+vR1wR=P{_{* z7AA$+w9ckaH{7R@#wqL}^Oy{aLR8TtN8vOi-ItH(#CgBuh@UhcPk0Zj`F%Y31sTUX z;j_~7d}rIwaX^J8<*H4ku0@w*X zW75gv%QrERr!V~uvhRwZL8Up2#n0l~RLe}?iRdCmWPmdLclKAyt*BcYne&xrcFqe%=WIUv?)H4LnZ@ zDjKwO=&3UVV))QB-KiR1&EQDfUof=p&RY@T2{g5JJ3x38=r_5!+7ezv>}-zTNTVM{ zCJC)qSq`oGfEDYk4EFbZ;N3fJ$Qh!C*U+@qi&cQ#p>U>@bs*N@1e!rdE!WIfv(XS_ zUF$_``vjCtiY65YY}2JkUiRHcRlz zg|K2DdS(L3(Sy59k3=owRCWC3zB!9!j7EVsxsn74)GbdiZYaS}J&gTy9NCJppfeX8V2RMRIjg5ju|x>LQ;uWTPT;J!_NA z8{<^Bqtr*hkh1AdWNR?X~Hrhd5OuPdoIH z3f8YDZ<@Y<;ybjP2@h7o)r(Ux57l^eAy*@;(@Lh4DP;0(-Z+&y?lll%=&%X$+3Gh5 zv`Q=Kvk7*LDcXLgkLT@)-Z*)e!&tQ%yvwjSiB7JOqUe!^MCY&e!%f$+PKMH_uLRv| z&Z8mb#~zn|-nlyo50BO7ydvHh!QUQ6A1l~yVgL|(2xe4Rv0;>X)s$;p^E&m7DC-z} z4$87fE%*F{G;-kj@KOlRtBvOXW+>H~ip6ixUXyw|@54muQUMX1+l4kdE*5%0gqzY_ zM9H}J7Y>3G#v9Q4sF#Mgtfa*0*W@+xU7}hT;9L=B7b{_{)bA=*_Wrqn&U# z_3P_wOmyh2k-p;xM<^XiN&?{5om%;{^nC|l?dby4fj8$JF{dA%x)7D7GtRd(zymQ3 zl<+07kRY2{`=*5+B<7EM1oUw>@zw&YR0X4As>Ce+vOP%(?8W86|wwciC!n zktutrc+DYobOUm-|Q_|u^88t?Qzm1q( z8gnj>9QKYPG8CQ8#k!?4_Jb;{)N-Kk8Ff*iD~LI5FDukJ{5|zWi3Whv9vSEulxH`@ zX%eWMi21ZOKZaZk!*@j#7%whQA!(XPX(dG(@PlaXvugn4jxzgnB?nxdP14I&Qvxl1 zqQzZBlR;do>IG3x!`pmbn_SN8)K`|Mzo2ASai;s?aO=@}J$}%O z3&yx>ADu?)w3P`#A>E{y>wd)!M}i+ZcLI}xgvtc8FsCRRz(nXz$)Gt%;tJnX^Y*vK zB12KN4D_Ocr*K#4M6#2dC#llE{z*28?-Qkzh@EY|92N~IkNj)W@gglgT=d?`op=Y9 z`Q)ckn%?`P7LZ!)chY_WbG|s`wT}D zJ#@dpSrwjKprJ_Oy=D`SN*gl!i?Ek6b);Sh_=Dc5^pS`!>2ut*wxn{$tA|w)hafaL zKU+*fZkTyN^H#LZ{WQQamZDm|ZH3)O`CUgaED@pqv?|2J$e@zzEf{*QZhAe&MT4pJ z9k=<)p}*F1L+ZK5Rp#68MTE9tVYQ$`3G-9}v((1Q<&|$&#JMY&?;jR488^txBZzT_ zdg>D)tNR*7sRvinxM+>t=zia&dmoP1?B4leHwKSx(EwwW)Vf@{f5oj1a+}mZRhlln zzs@AZVLGt4nWU5U^^RlZ0IZGEenA=1$58&h^{a$GbjpI%nio-L(OhEL&^aY$uGn#q zb0tTfBw09@=Rn6h^Pn0y14WkylI)9Uli%HyHRqH8$-D0qvB%cW(W{c>8n&>>mNVwC z%+Xlip-S5<%>x3@GdIb3vmT1p;SgG{c7SF2|I_pkD%%kCza9P~R@s*O*Iu1F?c>qt H7LxG~!&qBv diff --git a/common/src/main/res/drawable/ic_diplay_notification.xml b/common/src/main/res/drawable/ic_diplay_notification.xml deleted file mode 100644 index 397c3c7b3c..0000000000 --- a/common/src/main/res/drawable/ic_diplay_notification.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/src/main/res/drawable/ic_launcher_foreground.xml b/common/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000000..c2d00176fb --- /dev/null +++ b/common/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/common/src/main/res/drawable/ic_looplink.xml b/common/src/main/res/drawable/ic_looplink.xml new file mode 100644 index 0000000000..da94e41557 --- /dev/null +++ b/common/src/main/res/drawable/ic_looplink.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/common/src/main/res/drawable/ic_looplink_notification.xml b/common/src/main/res/drawable/ic_looplink_notification.xml new file mode 100644 index 0000000000..f90c4d511e --- /dev/null +++ b/common/src/main/res/drawable/ic_looplink_notification.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000000..0fbdeec8b3 --- /dev/null +++ b/common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/common/src/main/res/raw/ic_car_home.png b/common/src/main/res/raw/ic_car_home.png index 8739e0f582abd59df6b4c8efaa36640abd9bac14..f7ae8147ed9746e3201a0179757ee24736fc3af4 100644 GIT binary patch literal 3828 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 MP|r*kr|p*TKfjg_!~g&Q literal 4218 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 diff --git a/common/src/main/res/values-ar/strings.xml b/common/src/main/res/values-ar/strings.xml index 0828c08bfd..ad3846fdb4 100644 --- a/common/src/main/res/values-ar/strings.xml +++ b/common/src/main/res/values-ar/strings.xml @@ -10,7 +10,7 @@ تم حفظ البيانات · تأكد من تشغيل نقطة اتصال السيارة قبل الاتصال. تقرير التشخيص مشاركة تقرير التشخيص - تعذّر تحميل مصادقة CarPlay. ثبّت نسخة DiPlay الكاملة فوق هذا التطبيق. لا حاجة لإلغاء التثبيت أو تغيير إعدادات نقطة الاتصال. + تعذّر تحميل مصادقة CarPlay. ثبّت نسخة LoopLink الكاملة فوق هذا التطبيق. لا حاجة لإلغاء التثبيت أو تغيير إعدادات نقطة الاتصال. متوقفة مُغلقة نقطة اتصال لاسلكية:\u0020 @@ -52,7 +52,7 @@ معاينة عامة ·\u0020\u0020 اختر iPhone ·\u0020 معاينة عامة ·\u0020 - يتصل DiPlay عبر نقطة اتصال السيارة «%1$s». شغّلها في إعدادات السيارة ثم اتصل. + يتصل LoopLink عبر نقطة اتصال السيارة «%1$s». شغّلها في إعدادات السيارة ثم اتصل. تعديل نقطة الاتصال المحفوظة ·\u0020 جاهز لـ\u0020 نوع البث %1$d غير متاح هنا (الحالة=%2$s) @@ -64,21 +64,21 @@ اللغة لغة التطبيق إعدادات النظام الافتراضية - اختر لغة DiPlay. «إعدادات النظام» يتبع لغة الجهاز. + اختر لغة LoopLink. «إعدادات النظام» يتبع لغة الجهاز. تطبيق إلغاء رحلة مألوفة. ما زال اتصال Wi-Fi Direct السابق قيد التشغيل. أعد ضبطه للاتصال. حول - حول DiPlay + حول LoopLink نشط تعيين متقدم لقنوات الصوت أيقونة AirPlay السماح بواجهة CarPlay خارج المنطقة الآمنة اسمح بـ «الأجهزة القريبة» وعلى إصدارات Android الأقدم بـ«الموقع» قبل إعادة ضبط واي فاي CarPlay. - اسمح بـ «الأجهزة القريبة» لـ DiPlay في أذونات تطبيق وحدة القيادة. - اسمح بـ «الأجهزة القريبة» ليتمكن DiPlay من الاتصال بـ iPhone المقترن. - اسمح بـ«الموقع الدقيق» لـ DiPlay في أذونات تطبيق وحدة القيادة. + اسمح بـ «الأجهزة القريبة» لـ LoopLink في أذونات تطبيق وحدة القيادة. + اسمح بـ «الأجهزة القريبة» ليتمكن LoopLink من الاتصال بـ iPhone المقترن. + اسمح بـ«الموقع الدقيق» لـ LoopLink في أذونات تطبيق وحدة القيادة. اسمح بإذن الاتصال للمتابعة مستقبل CarPlay مستقل لوحدات قيادة Android. تعمل الاتصالات السلكية واللاسلكية على وحدة القيادة مع مصادقة محلية. يمكن لأي iPhone عادي الاتصال دون جيلبريك أو Mac أو جهاز إضافي أو تسجيل دخول.\n\nتستخدم هذه المعاينة هوية ملحق تجريبية. لا تزال التوافقية مع كل iPhone وكل وحدة قيادة قيد الاختبار. هذا المنتج غير معتمد من Apple. توافق Android 9 @@ -93,7 +93,7 @@ اتصال تلقائي تعتمد التوفر على إعدادات بدء وحدة القيادة. رجوع - العودة إلى DiPlay + العودة إلى LoopLink النطاق إعدادات بلوتوث إلغاء @@ -125,7 +125,7 @@ إغلاق اتصال اتصال بالهاتف - الاتصال عند فتح DiPlay + الاتصال عند فتح LoopLink الاتصال عبر USB وصّل iPhone بكابل USB جارٍ الاتصال بالبلوتوث @@ -140,7 +140,7 @@ تعذّر إعادة ضبط Wi-Fi Direct. أغلق تطبيق العرض الآخر وحاول مجدداً. تعذّر حفظ الصورة تعذّر حفظ التقرير - تعذّر بدء CarPlay. عد إلى DiPlay وتحقق من أذونات التطبيق. + تعذّر بدء CarPlay. عد إلى LoopLink وتحقق من أذونات التطبيق. أيقونة مخصصة 1:1 سجلات تصحيح الأيقونة الافتراضية @@ -189,7 +189,7 @@ مسار جهاز I2C مطلوب الهوية والمظهر الصورة غير جاهزة - في CarPlay، اسحب لأسفل بثلاثة أصابع لفتح إعدادات DiPlay. + في CarPlay، اسحب لأسفل بثلاثة أصابع لفتح إعدادات LoopLink. أبقِ البلوتوث وواي فاي مُفعّلين على iPhone. اقرن الهاتف مع بلوتوث السيارة، ثم اختر iPhone هنا. اسمح بـ«الأجهزة القريبة» عند الطلب. أبقِ iPhone قريبًا مع تشغيل البلوتوث وواي فاي.\nاسمح بـ CarPlay إن طلب iPhone ذلك. لاحقاً @@ -201,7 +201,7 @@ أقصى ارتفاع جارٍ البحث عن iPhone المقترن… ممكن بفضل المصدر المفتوح - اجعل DiPlay مناسبًا لسيارتك. + اجعل LoopLink مناسبًا لسيارتك. نقطة اتصال يدوية الشركة المصنّعة مصادقة MFi جاهزة @@ -213,7 +213,7 @@ «الأجهزة القريبة» تربط iPhone. الميكروفون يمكّن Siri والمكالمات. تتطلب إصدارات Android الأقدم أيضًا الموقع للإعداد اللاسلكي. قد يطلب وضع USB اتصال VPN محلي. لا يُرسل شيء تلقائياً. تُستبعد حمولات البروتوكول وبيانات الاعتماد. وسم OEM - على iPhone، افتح الإعدادات ← البلوتوث واقترن بالسيارة. ثم عد إلى DiPlay واختر «اتصال بالهاتف». + على iPhone، افتح الإعدادات ← البلوتوث واقترن بالسيارة. ثم عد إلى LoopLink واختر «اتصال بالهاتف». فتح الفتح بعد تشغيل السيارة فتح البلوتوث @@ -240,7 +240,7 @@ جارٍ تجهيز مصادقة MFi جاهز جاهز عندما تكون مستعداً - مستقبل مبني على xcertplay، مرخّص بموجب GPL-3.0. تتبع واجهة DiPlay تصميم DiAuto، مرخّص بموجب AGPL-3.0.\n\nيتضمن AndroidX وBouncy Castle وJmDNS وSLF4J. يرافق هذا الإصدار الشفرة المصدر وإشعارات الترخيص.\n\n‏CarPlay وأيقونة CarPlay ملك لشركة Apple Inc. DiPlay مشروع مستقل. + LoopLink نسخة متفرعة من DiPlay ومبنية على xcertplay، مرخّصة بموجب GPL-3.0. تتبع واجهة LoopLink تصميم DiAuto، مرخّص بموجب AGPL-3.0.\n\nيتضمن AndroidX وBouncy Castle وJmDNS وSLF4J. يرافق هذا الإصدار الشفرة المصدر وإشعارات الترخيص.\n\n‏CarPlay وأيقونة CarPlay ملك لشركة Apple Inc. LoopLink مشروع مستقل. جارٍ إعادة الاتصال بـ iPhone… عن بُعد عنوان الخادم البعيد يحتوي على U+0000 @@ -250,7 +250,7 @@ إرسال موقع Android إلى iPhone إرسال الموقع إلى iPhone تم حفظ التقرير. افتحه من مدير الملفات لمشاركته. - تُحفظ التقارير في Downloads/DiPlay.\u0020 + تُحفظ التقارير في Downloads/LoopLink.\u0020 جارٍ طلب إذن USB لـ iPhone جارٍ طلب إذن USB لـ MFi إعادة ضبط @@ -258,13 +258,13 @@ إعادة ضبط واي فاي CarPlay إعادة ضبط واي فاي CarPlay؟ الدقة - عد من إعدادات السيارة إلى DiPlay ثم اتصل. اقبل مطالبة CarPlay على iPhone. لا يلزم باقة إنترنت للسيارة؛ يعتمد توفر البيانات الجوالة على إعدادات شبكة هاتفك. + عد من إعدادات السيارة إلى LoopLink ثم اتصل. اقبل مطالبة CarPlay على iPhone. لا يلزم باقة إنترنت للسيارة؛ يعتمد توفر البيانات الجوالة على إعدادات شبكة هاتفك. مراجعة أذونات التطبيق قيادة يمنى قيد التشغيل 1000 مللي ثانية · الأكثر استقراراً 1 · اختر اتصالك - 1. افتح إعدادات نقطة اتصال السيارة، وشغّل نقطة الاتصال واختر 5 GHz إن توفر.\n2. انسخ الاسم وكلمة المرور أدناه كما هما تماماً.\n3. أبقِ نقطة اتصال السيارة مُشغّلة عند الاتصال. يرسل DiPlay البيانات عبر البلوتوث؛ وينضم iPhone تلقائياً. + 1. افتح إعدادات نقطة اتصال السيارة، وشغّل نقطة الاتصال واختر 5 GHz إن توفر.\n2. انسخ الاسم وكلمة المرور أدناه كما هما تماماً.\n3. أبقِ نقطة اتصال السيارة مُشغّلة عند الاتصال. يرسل LoopLink البيانات عبر البلوتوث؛ وينضم iPhone تلقائياً. 2 · اقرن iPhone الخاص بك 300 مللي ثانية · الافتراضي 30 إطاراً/ث · حمل أخف diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml index 0b9ae5b1f1..c1e08a1e7a 100644 --- a/common/src/main/res/values-es/strings.xml +++ b/common/src/main/res/values-es/strings.xml @@ -10,7 +10,7 @@ Datos guardados · Comprueba que el punto de acceso del coche esté activado antes de conectarte. Informe de diagnóstico Compartir informe de diagnóstico - No se pudo cargar la autenticación de CarPlay. Instala la compilación completa de DiPlay sobre esta aplicación. No es necesario desinstalar ni cambiar la configuración del punto de acceso. + No se pudo cargar la autenticación de CarPlay. Instala la compilación completa de LoopLink sobre esta aplicación. No es necesario desinstalar ni cambiar la configuración del punto de acceso. detenido apagado Punto de acceso inalámbrico:\u0020 @@ -52,7 +52,7 @@ VISTA PREVIA PÚBLICA ·\u0020\u0020 Elegir iPhone ·\u0020 Vista previa ·\u0020 - DiPlay se conecta a través del punto de acceso del coche «%1$s». Actívalo en la configuración del coche y luego conéctate. + LoopLink se conecta a través del punto de acceso del coche «%1$s». Actívalo en la configuración del coche y luego conéctate. Editar punto de acceso guardado ·\u0020 Listo para\u0020 El tipo de flujo %1$d no está disponible aquí (estado=%2$s) @@ -64,21 +64,21 @@ Idioma Idioma de la aplicación Predeterminado del sistema - Elige un idioma para DiPlay. «Sistema» sigue el idioma del dispositivo. + Elige un idioma para LoopLink. «Sistema» sigue el idioma del dispositivo. Aplicar Cancelar Un trayecto familiar. Hay una conexión Wi-Fi Direct anterior todavía en ejecución. Restablécela para conectarte. Acerca de - Acerca de DiPlay + Acerca de LoopLink Activo Asignación avanzada de canales de audio Icono de AirPlay Permitir la interfaz de CarPlay fuera de la zona segura Permite «Dispositivos cercanos» y, en versiones antiguas de Android, «Ubicación» antes de restablecer el Wi‑Fi de CarPlay. - Permite «Dispositivos cercanos» para DiPlay en los permisos de la aplicación de la unidad principal. - Permite «Dispositivos cercanos» para que DiPlay pueda conectarse a tu iPhone emparejado. - Permite «Ubicación precisa» para DiPlay en los permisos de la aplicación de la unidad principal. + Permite «Dispositivos cercanos» para LoopLink en los permisos de la aplicación de la unidad principal. + Permite «Dispositivos cercanos» para que LoopLink pueda conectarse a tu iPhone emparejado. + Permite «Ubicación precisa» para LoopLink en los permisos de la aplicación de la unidad principal. Permite el permiso de conexión para continuar Un receptor de CarPlay independiente para unidades principales Android. Las conexiones con cable e inalámbricas se ejecutan en la unidad principal, con autenticación local. Un iPhone estándar puede conectarse sin jailbreak, Mac, dongle ni inicio de sesión.\n\nEsta versión preliminar usa una identidad de accesorio experimental. La compatibilidad con cada iPhone y cada unidad principal sigue en pruebas. No es un producto certificado por Apple. Compatibilidad con Android 9 @@ -93,7 +93,7 @@ Conexión automática La disponibilidad depende de los ajustes de inicio de tu unidad principal. Atrás - Volver a DiPlay + Volver a LoopLink Banda Ajustes de Bluetooth Cancelar @@ -125,7 +125,7 @@ Cerrar Conectar Conectar teléfono - Conectar al abrir DiPlay + Conectar al abrir LoopLink Conectar por USB Conecta tu iPhone con un cable USB Conectando Bluetooth @@ -140,7 +140,7 @@ No se pudo restablecer Wi-Fi Direct. Cierra la otra aplicación de proyección e inténtalo de nuevo. No se pudo guardar la imagen No se pudo guardar el informe - No se pudo iniciar CarPlay. Vuelve a DiPlay y comprueba los permisos de la aplicación. + No se pudo iniciar CarPlay. Vuelve a LoopLink y comprueba los permisos de la aplicación. Icono personalizado 1:1 Registros de depuración Icono predeterminado @@ -189,7 +189,7 @@ Se requiere la ruta del dispositivo I2C Identidad y apariencia La imagen no está lista - En CarPlay, desliza hacia abajo con tres dedos para abrir los ajustes de DiPlay. + En CarPlay, desliza hacia abajo con tres dedos para abrir los ajustes de LoopLink. Mantén activos el Bluetooth y el Wi‑Fi en tu iPhone. Empareja el teléfono con el Bluetooth del coche y luego selecciona tu iPhone aquí. Permite «Dispositivos cercanos» cuando se te pida. Mantén tu iPhone cerca con el Bluetooth y el Wi‑Fi activados.\nPermite CarPlay si tu iPhone lo pide. Más tarde @@ -201,7 +201,7 @@ Altura máxima Buscando tu iPhone emparejado… Hecho posible por el código abierto - Haz que DiPlay encaje con tu coche. + Haz que LoopLink encaje con tu coche. Punto de acceso manual Fabricante Autenticación MFi lista @@ -213,7 +213,7 @@ «Dispositivos cercanos» conecta tu iPhone. El micrófono activa Siri y las llamadas. Las versiones antiguas de Android también requieren Ubicación para la configuración inalámbrica. El modo USB puede pedir una conexión VPN local. No se envía nada automáticamente. Las cargas del protocolo y las credenciales quedan excluidas. Etiqueta OEM - En tu iPhone, abre Ajustes → Bluetooth y empareja con el coche. Después vuelve a DiPlay y elige «Conectar teléfono». + En tu iPhone, abre Ajustes → Bluetooth y empareja con el coche. Después vuelve a LoopLink y elige «Conectar teléfono». Abrir Abrir después de arrancar el coche Abrir Bluetooth @@ -240,7 +240,7 @@ Preparando autenticación MFi Listo Listo cuando tú lo estés - Receptor basado en xcertplay, con licencia GPL-3.0. La interfaz de DiPlay sigue el diseño de DiAuto, con licencia AGPL-3.0.\n\nIncluye AndroidX, Bouncy Castle, JmDNS y SLF4J. El código fuente y los avisos de licencia acompañan a esta versión.\n\nCarPlay y el icono de CarPlay pertenecen a Apple Inc. DiPlay es un proyecto independiente. + LoopLink es una bifurcación de DiPlay basada en xcertplay, con licencia GPL-3.0. La interfaz de LoopLink sigue el diseño de DiAuto, con licencia AGPL-3.0.\n\nIncluye AndroidX, Bouncy Castle, JmDNS y SLF4J. El código fuente y los avisos de licencia acompañan a esta versión.\n\nCarPlay y el icono de CarPlay pertenecen a Apple Inc. LoopLink es un proyecto independiente. Reconectando con tu iPhone… Remoto La dirección del servidor remoto contiene U+0000 @@ -250,7 +250,7 @@ Informar la ubicación de Android al iPhone Informar la ubicación al iPhone Informe guardado. Ábrelo desde tu gestor de archivos para compartirlo. - Los informes se guardan en Downloads/DiPlay.\u0020 + Los informes se guardan en Downloads/LoopLink.\u0020 Solicitando permiso USB del iPhone Solicitando permiso USB de MFi Restablecer @@ -258,13 +258,13 @@ Restablecer el Wi‑Fi de CarPlay ¿Restablecer el Wi‑Fi de CarPlay? Resolución - Vuelve de los ajustes del coche a DiPlay y luego conecta. Acepta la solicitud de CarPlay en tu iPhone. No hace falta una tarifa de datos del coche; la disponibilidad de datos móviles depende de los ajustes de red de tu teléfono. + Vuelve de los ajustes del coche a LoopLink y luego conecta. Acepta la solicitud de CarPlay en tu iPhone. No hace falta una tarifa de datos del coche; la disponibilidad de datos móviles depende de los ajustes de red de tu teléfono. Revisar permisos de la aplicación Volante a la derecha En ejecución 1000 ms · la más estable 1 · Elige tu conexión - 1. Abre los ajustes del punto de acceso del coche, actívalo y selecciona 5 GHz si está disponible.\n2. Copia abajo su nombre y contraseña exactamente.\n3. Deja el punto de acceso del coche activado al conectarte. DiPlay envía los datos por Bluetooth; tu iPhone se une automáticamente. + 1. Abre los ajustes del punto de acceso del coche, actívalo y selecciona 5 GHz si está disponible.\n2. Copia abajo su nombre y contraseña exactamente.\n3. Deja el punto de acceso del coche activado al conectarte. LoopLink envía los datos por Bluetooth; tu iPhone se une automáticamente. 2 · Empareja tu iPhone 300 ms · predeterminado 30 img/s · carga más ligera diff --git a/common/src/main/res/values-ru/strings.xml b/common/src/main/res/values-ru/strings.xml index 75941a6db7..038f347be4 100644 --- a/common/src/main/res/values-ru/strings.xml +++ b/common/src/main/res/values-ru/strings.xml @@ -10,7 +10,7 @@ Данные сохранены · Перед подключением убедитесь, что точка доступа автомобиля включена. Диагностический отчёт Поделиться диагностическим отчётом - Не удалось загрузить аутентификацию CarPlay. Установите полную сборку DiPlay поверх этого приложения. Удалять приложение и менять настройки точки доступа не требуется. + Не удалось загрузить аутентификацию CarPlay. Установите полную сборку LoopLink поверх этого приложения. Удалять приложение и менять настройки точки доступа не требуется. остановлена выключена Беспроводная точка доступа:\u0020 @@ -52,7 +52,7 @@ ОТКРЫТАЯ ПРЕДВАРИТЕЛЬНАЯ ВЕРСИЯ ·\u0020\u0020 Выбрать iPhone ·\u0020 Предварительная версия ·\u0020 - DiPlay подключается через точку доступа автомобиля «%1$s». Включите её в настройках автомобиля и подключитесь. + LoopLink подключается через точку доступа автомобиля «%1$s». Включите её в настройках автомобиля и подключитесь. Изменить сохранённую точку доступа ·\u0020 Готов к\u0020 Тип потока %1$d недоступен здесь (состояние=%2$s) @@ -64,21 +64,21 @@ Язык Язык приложения Системный по умолчанию - Выберите язык DiPlay. «Системный» следует языку устройства. + Выберите язык LoopLink. «Системный» следует языку устройства. Применить Отмена Привычная поездка. Предыдущее подключение Wi-Fi Direct всё ещё активно. Сбросьте его, чтобы подключиться. О программе - О DiPlay + О LoopLink Активно Расширенное сопоставление звуковых каналов Значок AirPlay Разрешить интерфейс CarPlay за пределами безопасной области Разрешите «Рядом находящиеся устройства» и, на старых версиях Android, «Местоположение» перед сбросом Wi-Fi CarPlay. - Разрешите «Рядом находящиеся устройства» для DiPlay в разрешениях приложения головного устройства. - Разрешите «Рядом находящиеся устройства», чтобы DiPlay мог подключиться к вашему связанному iPhone. - Разрешите точное «Местоположение» для DiPlay в разрешениях приложения головного устройства. + Разрешите «Рядом находящиеся устройства» для LoopLink в разрешениях приложения головного устройства. + Разрешите «Рядом находящиеся устройства», чтобы LoopLink мог подключиться к вашему связанному iPhone. + Разрешите точное «Местоположение» для LoopLink в разрешениях приложения головного устройства. Разрешите подключение, чтобы продолжить Независимый приёмник CarPlay для головных устройств Android. Проводные и беспроводные подключения работают на головном устройстве с локальной аутентификацией. Обычный iPhone может подключиться без джейлбрейка, Mac, переходника или входа в учётную запись.\n\nВ этой предварительной версии используется экспериментальная аксессуарная идентичность. Совместимость со всеми iPhone и головными устройствами ещё тестируется. Продукт не сертифицирован Apple. Совместимость с Android 9 @@ -93,7 +93,7 @@ Автоматическое подключение Доступность зависит от настроек запуска вашего головного устройства. Назад - Вернуться в DiPlay + Вернуться в LoopLink Диапазон Настройки Bluetooth Отмена @@ -125,7 +125,7 @@ Закрыть Подключить Подключить телефон - Подключать при открытии DiPlay + Подключать при открытии LoopLink Подключить по USB Подключите iPhone кабелем USB Подключение Bluetooth @@ -140,7 +140,7 @@ Не удалось сбросить Wi-Fi Direct. Закройте другое приложение проекции и повторите. Не удалось сохранить изображение Не удалось сохранить отчёт - Не удалось запустить CarPlay. Вернитесь в DiPlay и проверьте разрешения приложения. + Не удалось запустить CarPlay. Вернитесь в LoopLink и проверьте разрешения приложения. Пользовательский значок 1:1 Отладочные журналы Значок по умолчанию @@ -189,7 +189,7 @@ Укажите путь к устройству I2C Идентичность и оформление Изображение не готово - В CarPlay проведите тремя пальцами вниз, чтобы открыть настройки DiPlay. + В CarPlay проведите тремя пальцами вниз, чтобы открыть настройки LoopLink. Держите Bluetooth и Wi-Fi включёнными на iPhone. Свяжите телефон с Bluetooth автомобиля, затем выберите iPhone здесь. Разрешите «Рядом находящиеся устройства», когда попросят. Держите iPhone рядом с включёнными Bluetooth и Wi-Fi.\nРазрешите CarPlay, если iPhone попросит. Позже @@ -201,7 +201,7 @@ Наибольшая высота Поиск связанного iPhone… Реализовано благодаря открытому коду - Сделайте DiPlay удобным для вашего автомобиля. + Сделайте LoopLink удобным для вашего автомобиля. Ручная точка доступа Производитель Аутентификация MFi готова @@ -213,7 +213,7 @@ «Рядом находящиеся устройства» связывают iPhone. Микрофон нужен для Siri и звонков. Старые версии Android также требуют местоположение для беспроводной настройки. Режим USB может запросить локальное VPN-подключение. Ничего не отправляется автоматически. Данные протокола и учётные данные исключены. Метка OEM - На iPhone откройте Настройки → Bluetooth и свяжитесь с автомобилем. Затем вернитесь в DiPlay и выберите «Подключить телефон». + На iPhone откройте Настройки → Bluetooth и свяжитесь с автомобилем. Затем вернитесь в LoopLink и выберите «Подключить телефон». Открыть Открывать после запуска автомобиля Открыть Bluetooth @@ -240,7 +240,7 @@ Подготовка аутентификации MFi Готово Готово, когда вы будете готовы - Приёмник на базе xcertplay, лицензирован по GPL-3.0. Интерфейс DiPlay следует дизайну DiAuto, лицензированному по AGPL-3.0.\n\nВключает AndroidX, Bouncy Castle, JmDNS и SLF4J. Исходный код и уведомления о лицензиях прилагаются к этому выпуску.\n\nCarPlay и значок CarPlay принадлежат Apple Inc. DiPlay — независимый проект. + LoopLink — форк DiPlay на базе xcertplay, лицензирован по GPL-3.0. Интерфейс LoopLink следует дизайну DiAuto, лицензированному по AGPL-3.0.\n\nВключает AndroidX, Bouncy Castle, JmDNS и SLF4J. Исходный код и уведомления о лицензиях прилагаются к этому выпуску.\n\nCarPlay и значок CarPlay принадлежат Apple Inc. LoopLink — независимый проект. Переподключение к iPhone… Удалённый Адрес удалённого сервера содержит U+0000 @@ -250,7 +250,7 @@ Передавать местоположение Android на iPhone Передавать местоположение на iPhone Отчёт сохранён. Откройте его в файловом менеджере, чтобы поделиться. - Отчёты сохраняются в Downloads/DiPlay.\u0020 + Отчёты сохраняются в Downloads/LoopLink.\u0020 Запрос разрешения USB для iPhone Запрос разрешения USB для MFi Сбросить @@ -258,13 +258,13 @@ Сбросить Wi-Fi CarPlay Сбросить Wi-Fi CarPlay? Разрешение - Вернитесь из настроек автомобиля в DiPlay и подключитесь. Примите запрос CarPlay на iPhone. Автомобильный тариф не требуется; доступность мобильных данных зависит от настроек сети телефона. + Вернитесь из настроек автомобиля в LoopLink и подключитесь. Примите запрос CarPlay на iPhone. Автомобильный тариф не требуется; доступность мобильных данных зависит от настроек сети телефона. Проверить разрешения приложения Праворукий руль Работает 1000 мс · самая стабильная 1 · Выберите способ подключения - 1. Откройте настройки точки доступа автомобиля, включите её и выберите 5 ГГц, если доступно.\n2. Точно скопируйте ниже её имя и пароль.\n3. Оставляйте точку доступа включённой при подключении. DiPlay передаёт данные по Bluetooth; iPhone подключится автоматически. + 1. Откройте настройки точки доступа автомобиля, включите её и выберите 5 ГГц, если доступно.\n2. Точно скопируйте ниже её имя и пароль.\n3. Оставляйте точку доступа включённой при подключении. LoopLink передаёт данные по Bluetooth; iPhone подключится автоматически. 2 · Свяжите iPhone 300 мс · по умолчанию 30 кадров/с · меньшая нагрузка diff --git a/common/src/main/res/values-zh-rCN/strings.xml b/common/src/main/res/values-zh-rCN/strings.xml index 8cebf91b71..8f968b86b4 100644 --- a/common/src/main/res/values-zh-rCN/strings.xml +++ b/common/src/main/res/values-zh-rCN/strings.xml @@ -10,7 +10,7 @@ 详情已保存 · 连接前请确认车载热点已开启。 诊断报告 分享诊断报告 - 无法加载 CarPlay 认证。请在本应用之上覆盖安装完整的 DiPlay 构建。无需卸载或更改热点设置。 + 无法加载 CarPlay 认证。请在本应用之上覆盖安装完整的 LoopLink 构建。无需卸载或更改热点设置。 已停止 已关闭 无线热点: @@ -52,7 +52,7 @@ 公开预览 ·\u0020\u0020 选择 iPhone ·\u0020 公开预览 ·\u0020 - DiPlay 通过车机热点“%1$s”连接。请在车机设置中开启热点后连接。 + LoopLink 通过车机热点“%1$s”连接。请在车机设置中开启热点后连接。 编辑已保存的热点 ·\u0020 已准备连接: 流类型 %1$d 在此不可用(状态=%2$s) @@ -64,19 +64,19 @@ 熟悉的驾乘体验。 之前的 Wi-Fi Direct 连接仍在运行。请重置后再连接。 关于 - 关于 DiPlay + 关于 LoopLink 已启用 高级音频通道映射 AirPlay 图标 允许 CarPlay 界面超出安全区域 重置 CarPlay Wi-Fi 前,请授予“附近的设备”权限;较旧的 Android 版本还需要位置权限。 - 请在车机应用权限中允许 DiPlay 访问附近的设备。 - 请允许 DiPlay 访问附近的设备,以连接已配对的 iPhone。 - 请在车机应用权限中允许 DiPlay 使用精确位置信息。 + 请在车机应用权限中允许 LoopLink 访问附近的设备。 + 请允许 LoopLink 访问附近的设备,以连接已配对的 iPhone。 + 请在车机应用权限中允许 LoopLink 使用精确位置信息。 请授予连接权限以继续 面向 Android 车机的独立 CarPlay 接收器。有线和无线连接均在车机上运行,并使用本地认证。普通 iPhone 无需越狱、Mac、转接器或登录即可连接。\n\n此预览版使用实验性配件身份,仍在测试与不同 iPhone 和车机的兼容性。本产品未经 Apple 认证。 Android 9 兼容性 - DiPlay + LoopLink 应用权限 应用设置 应用并重新连接 @@ -88,7 +88,7 @@ 自动连接 是否可用取决于车机的启动设置。 返回 - 返回 DiPlay + 返回 LoopLink 频段 蓝牙设置 取消 @@ -122,7 +122,7 @@ 取消 连接 连接手机 - 打开 DiPlay 时连接 + 打开 LoopLink 时连接 通过 USB 连接 请使用 USB 数据线连接 iPhone 正在连接蓝牙 @@ -137,14 +137,14 @@ 无法重置 Wi-Fi Direct。请关闭其他投屏应用后重试。 无法保存图片 无法保存报告 - 无法启动 CarPlay。请返回 DiPlay 检查应用权限。 + 无法启动 CarPlay。请返回 LoopLink 检查应用权限。 自定义 1:1 图标 调试日志 默认图标 默认占位图标 诊断报告已保存 诊断 - DiPlay + LoopLink 放弃更改并退出设置 断开连接 正在查找 iPhone @@ -188,12 +188,12 @@ 必须填写 I2C 设备路径 身份与外观 图片尚未准备好 - 在 CarPlay 界面用三指向下滑动,可打开 DiPlay 设置。 + 在 CarPlay 界面用三指向下滑动,可打开 LoopLink 设置。 保持 iPhone 的蓝牙和 Wi-Fi 开启。先与车机蓝牙配对,然后在此选择你的 iPhone。出现提示时允许“附近的设备”。 请将 iPhone 放在附近并开启蓝牙和 Wi-Fi。\niPhone 出现提示时允许使用 CarPlay。 应用语言 应用 - 选择 DiPlay 的语言。“跟随系统”将使用设备语言。 + 选择 LoopLink 的语言。“跟随系统”将使用设备语言。 语言 跟随系统 稍后 @@ -206,7 +206,7 @@ 较长边 正在查找已配对的 iPhone… 开源项目鸣谢 - 按需调整 DiPlay 设置。 + 按需调整 LoopLink 设置。 手动热点 制造商 MFi 认证已就绪 @@ -218,7 +218,7 @@ “附近的设备”权限用于连接 iPhone;麦克风权限用于 Siri 和通话。较旧的 Android 版本还需要位置权限来设置无线连接。USB 模式可能会请求建立本地 VPN 连接。 报告不会自动发送,不包含协议数据和凭据。 OEM 标签 - 在 iPhone 上打开“设置 → 蓝牙”并与车机配对。然后返回 DiPlay,点击“连接手机”。 + 在 iPhone 上打开“设置 → 蓝牙”并与车机配对。然后返回 LoopLink,点击“连接手机”。 开放 车机启动后打开 打开蓝牙 @@ -245,7 +245,7 @@ 正在准备 MFi 认证 就绪 一切就绪 - 接收器基于采用 GPL-3.0 许可的 xcertplay。DiPlay 界面沿用采用 AGPL-3.0 许可的 DiAuto 设计。\n\n项目包含 AndroidX、Bouncy Castle、JmDNS 和 SLF4J。本版本附有源代码和许可声明。\n\nCarPlay 和 CarPlay 图标归 Apple Inc. 所有。DiPlay 是独立项目。 + LoopLink 是 DiPlay 的分支,基于采用 GPL-3.0 许可的 xcertplay。LoopLink 界面沿用采用 AGPL-3.0 许可的 DiAuto 设计。\n\n项目包含 AndroidX、Bouncy Castle、JmDNS 和 SLF4J。本版本附有源代码和许可声明。\n\nCarPlay 和 CarPlay 图标归 Apple Inc. 所有。LoopLink 是独立项目。 正在重新连接 iPhone… 远程 远程服务器地址包含 U+0000 @@ -255,7 +255,7 @@ 向 iPhone 报告 Android 位置 向 iPhone 报告位置 报告已保存。在文件管理器中打开即可分享。 - 报告将保存到 Downloads/DiPlay。 + 报告将保存到 Downloads/LoopLink。 正在请求 iPhone USB 权限 正在请求 MFi USB 权限 重置 @@ -263,7 +263,7 @@ 重置 CarPlay Wi-Fi 重置 CarPlay Wi-Fi? 分辨率 - 从车机设置返回 DiPlay,然后连接。在 iPhone 上接受 CarPlay 提示。无需车机流量套餐;移动数据可用性取决于手机的网络设置。 + 从车机设置返回 LoopLink,然后连接。在 iPhone 上接受 CarPlay 提示。无需车机流量套餐;移动数据可用性取决于手机的网络设置。 查看应用权限 右舵 运行中 @@ -271,7 +271,7 @@ 1000 毫秒 · 更稳定 1.0x 1 · 选择连接方式 - 1. 打开车机热点设置,开启热点,如有 5 GHz 请选择。\n2. 在下方准确复制热点名称和密码。\n3. 连接时保持车机热点开启。DiPlay 通过蓝牙发送热点信息,iPhone 会自动加入。 + 1. 打开车机热点设置,开启热点,如有 5 GHz 请选择。\n2. 在下方准确复制热点名称和密码。\n3. 连接时保持车机热点开启。LoopLink 通过蓝牙发送热点信息,iPhone 会自动加入。 2.4 GHz 2 · 配对你的 iPhone 300 毫秒 · 默认 diff --git a/common/src/main/res/values/colors_brand.xml b/common/src/main/res/values/colors_brand.xml new file mode 100644 index 0000000000..edd4768f96 --- /dev/null +++ b/common/src/main/res/values/colors_brand.xml @@ -0,0 +1,4 @@ + + + #FF11151D + diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 022e88992d..f167596242 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -10,7 +10,7 @@ Details saved · Check that the car hotspot is on before connecting. Diagnostic report Share diagnostic report - CarPlay authentication could not be loaded. Install the complete DiPlay build over this app. No uninstall or hotspot change is needed. + CarPlay authentication could not be loaded. Install the complete LoopLink build over this app. No uninstall or hotspot change is needed. stopped off Wireless hotspot:\u0020 @@ -52,7 +52,7 @@ PUBLIC PREVIEW ·\u0020\u0020 Choose iPhone ·\u0020 Public preview ·\u0020 - DiPlay connects through the car hotspot “%1$s”. Turn it on in the car settings, then connect. + LoopLink connects through the car hotspot “%1$s”. Turn it on in the car settings, then connect. Edit saved hotspot ·\u0020 Ready for\u0020 Stream type %1$d is unavailable here (state=%2$s) @@ -61,25 +61,25 @@ Safe area:\u0020 The following settings are unavailable and hidden on Android 9 (API 28):\n• Wi-Fi P2P (5 GHz) — LocalOnlyHotspot is used instead.\n• HEVC software decoder — hardware decoding is used instead. Address must start with http:// or https://. Token is optional and sent as an Authorization bearer token. - DiPlay + LoopLink Language App language System default - Choose a language for DiPlay. System default follows the device language. + Choose a language for LoopLink. System default follows the device language. Apply Cancel A familiar drive. A previous Wi-Fi Direct connection is still running. Reset it to connect. About - About DiPlay + About LoopLink Active Advanced audio channel mapping AirPlay icon Allow CarPlay UI outside the safe area Allow Nearby devices and, on older Android versions, Location before resetting CarPlay Wi-Fi. - Allow Nearby devices for DiPlay in the head unit’s app permissions. - Allow Nearby devices so DiPlay can connect to your paired iPhone. - Allow precise Location for DiPlay in the head unit’s app permissions. + Allow Nearby devices for LoopLink in the head unit’s app permissions. + Allow Nearby devices so LoopLink can connect to your paired iPhone. + Allow precise Location for LoopLink in the head unit’s app permissions. Allow the connection permission to continue An independent CarPlay receiver for Android head units. Wired and wireless connections run on the head unit, with local authentication. A standard iPhone can connect without a jailbreak, Mac, dongle or sign-in.\n\nThis preview uses an experimental accessory identity. Compatibility with every iPhone and head unit is still being tested. It is not an Apple-certified product. Android 9 compatibility @@ -94,7 +94,7 @@ Automatic connection Availability depends on your head unit’s startup settings. Back - Back to DiPlay + Back to LoopLink Band Bluetooth settings Cancel @@ -127,7 +127,7 @@ Close Connect Connect phone - Connect when DiPlay opens + Connect when LoopLink opens Connect with USB Connect your iPhone with a USB cable Connecting Bluetooth @@ -142,14 +142,14 @@ Could not reset Wi-Fi Direct. Close the other projection app and try again. Could not save image Could not save the report - Could not start CarPlay. Return to DiPlay and check app permissions. + Could not start CarPlay. Return to LoopLink and check app permissions. Custom 1:1 icon Debug logs Default icon Default placeholder icon Diagnostic report saved Diagnostics - DiPlay + LoopLink Discard changes and exit settings Disconnect Discovering iPhone @@ -193,7 +193,7 @@ I2C device path is required Identity & appearance Image is not ready - In CarPlay, swipe down with three fingers to open DiPlay settings. + In CarPlay, swipe down with three fingers to open LoopLink settings. Keep Bluetooth and Wi-Fi on your iPhone. Pair with the car’s Bluetooth, then select your iPhone here. Allow Nearby devices when asked. Keep your iPhone nearby with Bluetooth and Wi-Fi on.\nAllow CarPlay if your iPhone asks. Later @@ -206,7 +206,7 @@ Longest height Looking for your paired iPhone… Made possible by open source - Make DiPlay feel right for your car. + Make LoopLink feel right for your car. Manual hotspot Manufacturer MFi authentication ready @@ -218,7 +218,7 @@ Nearby devices connects your iPhone. Microphone enables Siri and calls. Older Android versions also require Location for wireless setup. USB mode may ask for a local VPN connection. Nothing is sent automatically. Protocol payloads and credentials are excluded. OEM label - On your iPhone, open Settings → Bluetooth and pair with the car. Then return to DiPlay and choose Connect phone. + On your iPhone, open Settings → Bluetooth and pair with the car. Then return to LoopLink and choose Connect phone. Open Open after the car starts Open Bluetooth @@ -245,7 +245,7 @@ Preparing MFi authentication Ready Ready when you are - Receiver based on xcertplay, licensed under GPL-3.0. DiPlay’s interface follows DiAuto’s design, licensed under AGPL-3.0.\n\nIncludes AndroidX, Bouncy Castle, JmDNS and SLF4J. Source and license notices accompany this release.\n\nCarPlay and the CarPlay icon belong to Apple Inc. DiPlay is an independent project. + LoopLink is a fork of DiPlay and is based on xcertplay, licensed under GPL-3.0. LoopLink’s interface follows DiAuto’s design, licensed under AGPL-3.0.\n\nIncludes AndroidX, Bouncy Castle, JmDNS and SLF4J. Source and license notices accompany this release.\n\nCarPlay and the CarPlay icon belong to Apple Inc. LoopLink is an independent project. Reconnecting to your iPhone… Remote Remote server address contains U+0000 @@ -255,7 +255,7 @@ Report Android location to the iPhone Report location to iPhone Report saved. Open it from your file manager to share it. - Reports save to Downloads/DiPlay.\u0020 + Reports save to Downloads/LoopLink.\u0020 Requesting iPhone USB permission Requesting MFi USB permission Reset @@ -263,7 +263,7 @@ Reset CarPlay Wi-Fi Reset CarPlay Wi-Fi? Resolution - Return from car settings to DiPlay, then connect. Accept the CarPlay prompt on your iPhone. A car internet plan is not required; mobile data availability depends on your phone’s network settings. + Return from car settings to LoopLink, then connect. Accept the CarPlay prompt on your iPhone. A car internet plan is not required; mobile data availability depends on your phone’s network settings. Review app permissions Right-hand drive Running @@ -271,7 +271,7 @@ 1000 ms · most stable 1.0x 1 · Choose your connection - 1. Open car hotspot settings, turn the hotspot on and select 5 GHz if available.\n2. Copy its name and password below exactly.\n3. Leave the car hotspot on when connecting. DiPlay sends the details over Bluetooth; your iPhone joins automatically. + 1. Open car hotspot settings, turn the hotspot on and select 5 GHz if available.\n2. Copy its name and password below exactly.\n3. Leave the car hotspot on when connecting. LoopLink sends the details over Bluetooth; your iPhone joins automatically. 2.4 GHz 2 · Pair your iPhone 300 ms · default diff --git a/common/src/main/res/values/themes.xml b/common/src/main/res/values/themes.xml index b9f51b9d0b..76ba65be5c 100644 --- a/common/src/main/res/values/themes.xml +++ b/common/src/main/res/values/themes.xml @@ -1,11 +1,11 @@ diff --git a/common/src/test/java/com/shilapi/xcertplay/DiagnosticExportStoreTest.kt b/common/src/test/java/com/shilapi/xcertplay/DiagnosticExportStoreTest.kt index 157590a70d..b500ce60c6 100644 --- a/common/src/test/java/com/shilapi/xcertplay/DiagnosticExportStoreTest.kt +++ b/common/src/test/java/com/shilapi/xcertplay/DiagnosticExportStoreTest.kt @@ -33,11 +33,11 @@ class DiagnosticExportStoreTest { } @Test fun android10SavesUtf8ReportToDownloadsAndPublishesAfterClosingIt() { - val report = "DiPlay · diagnostic report\nVideo: H.264\n" - val uri = DiagnosticExportStore.saveToDownloads(resolver, "DiPlay-test.txt", report) + val report = "LoopLink · diagnostic report\nVideo: H.264\n" + val uri = DiagnosticExportStore.saveToDownloads(resolver, "LoopLink-test.txt", report) assertEquals(provider.uri, uri) assertEquals(report, provider.file.readText()) - assertEquals("Download/DiPlay", provider.insertValues!!.getAsString(MediaStore.Downloads.RELATIVE_PATH)) + assertEquals("Download/LoopLink", provider.insertValues!!.getAsString(MediaStore.Downloads.RELATIVE_PATH)) assertEquals("text/plain", provider.insertValues!!.getAsString(MediaStore.Downloads.MIME_TYPE)) assertEquals(1, provider.insertValues!!.getAsInteger(MediaStore.Downloads.IS_PENDING)) assertEquals(0, provider.publishValues!!.getAsInteger(MediaStore.Downloads.IS_PENDING)) diff --git a/docs/THIRD_PARTY_NOTICES.md b/docs/THIRD_PARTY_NOTICES.md index dcbc109d5e..9d0d30a593 100644 --- a/docs/THIRD_PARTY_NOTICES.md +++ b/docs/THIRD_PARTY_NOTICES.md @@ -2,21 +2,13 @@ ## Receiver -DiPlay is a modified version of [xcertplay by shilapi](https://github.com/shilapi/xcertplay). The upstream receiver is licensed under GNU GPL version 3; the full text is in `LICENSE` and the original README is retained in `docs/UPSTREAM-README.md`. +LoopLink is a fork of [DiPlay by shihabal3amri](https://github.com/shihabal3amri/DiPlay), which is a modified version of [xcertplay by shilapi](https://github.com/shilapi/xcertplay). The upstream receiver is licensed under GNU GPL version 3; the full text is in `LICENSE` and the original README is retained in `docs/UPSTREAM-README.md`. Upstream credits [LIVI](https://github.com/f-io/LIVI) and [Showcase](https://github.com/amineross/showcase) for protocol research. Existing source comments and attribution are preserved. ## Home and settings UI -`common/src/main/java/com/shilapi/xcertplay/DiPlayActivity.kt` adapts the palette, visual arrangement and interface copy of the [DiAuto project](https://github.com/shihabal3amri/DiAuto). DiAuto's source is licensed under AGPL version 3. The UI file is marked AGPL-3.0-only; its license text is included in `docs/licenses/DiAuto-AGPL-3.0.txt`. - -## CarPlay icon - -The unmodified icon was obtained from Apple's developer site at: - -https://developer.apple.com/assets/elements/icons/carplay/carplay-96x96_2x.png - -CarPlay and the CarPlay icon are Apple Inc. marks/assets. This asset is not covered by the project's open-source code license. Its use here does not imply Apple approval or certification. +`common/src/main/java/com/shilapi/xcertplay/DiPlayActivity.kt` adapts the visual arrangement and interface copy of the [DiAuto project](https://github.com/shihabal3amri/DiAuto). DiAuto's source is licensed under AGPL version 3. The UI file is marked AGPL-3.0-only; its license text is included in `docs/licenses/DiAuto-AGPL-3.0.txt`. ## Runtime dependencies @@ -30,14 +22,12 @@ Gradle dependency declarations and version catalog accompany the source. License ## Experimental authentication data -The public preview APK includes an accessory certificate/key pair recovered from public Carlinkit C2Air Allwinner V821 firmware during the owner's local investigation. These data are not newly generated Apple-issued credentials for DiPlay and are not relicensed as project source code. They are bundled in the preview APK to reproduce the offline experiment; continued acceptance and suitability for general distribution are unresolved. The source archive does not contain the private key, and the separate Android APK-signing key is never distributed. +The public preview APK includes an accessory certificate/key pair recovered from public Carlinkit C2Air Allwinner V821 firmware during the owner's local investigation. These data are not newly generated Apple-issued credentials for DiPlay or LoopLink and are not relicensed as project source code. They are bundled in the preview APK to reproduce the offline experiment; continued acceptance and suitability for general distribution are unresolved. The source archive does not contain the private key, and the separate Android APK-signing key is never distributed. ## Download website The static site layout, CSS and generator adapt DiAuto (AGPL-3.0). The AGPL license text is included with the source. -## BYD HUD maneuver icons - -Required Notice: Copyright AndyShaman (https://github.com/AndyShaman/BYDMate) +## Branding and trademarks -The maneuver PNGs under `shared/src/main/assets/byd-hud-icons` were imported from BYDMate. Its PolyForm Noncommercial 1.0.0 terms and required notice are included alongside the assets. These files are separate from the project code license; upstream describes them as donor assets and their original provenance is not independently established. The validated DiLink5.1 windshield path uses factory turn codes rather than these images. +The LoopLink name and logo (`asset/looplink-logo.svg`, `asset/looplink-mark.svg` and the app icons made from them) belong to the LoopLink project. CarPlay and iPhone are trademarks of Apple Inc.; LoopLink is not an Apple-certified product and no Apple affiliation or endorsement is implied. diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index 0cd9cd6097..a52261640d 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -14,7 +14,7 @@ android { } defaultConfig { - applicationId = "com.shihab.diplay" + applicationId = "io.loopbreak.looplink" minSdk = 28 targetSdk = 37 versionCode = 27 @@ -39,8 +39,7 @@ android { buildTypes { debug { - applicationIdSuffix = ".hudtest" - versionNameSuffix = "-hud-test" + versionNameSuffix = "-debug" } release { optimization { diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml index 89e1b4b3c4..1753e5a18c 100644 --- a/mobile/src/main/AndroidManifest.xml +++ b/mobile/src/main/AndroidManifest.xml @@ -6,10 +6,10 @@ android:allowBackup="false" android:fullBackupContent="@xml/backup_rules" android:dataExtractionRules="@xml/data_extraction_rules" - android:icon="@drawable/ic_carplay" + android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:localeConfig="@xml/locales_config" - android:roundIcon="@drawable/ic_carplay" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/Theme.Xcertplay"> diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml index 401758ed7e..2314ad203a 100644 --- a/mobile/src/main/res/values/strings.xml +++ b/mobile/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - DiPlay + LoopLink diff --git a/shared/src/main/java/com/shilapi/xcertplay/network/LocalOnlyHotspotManager.kt b/shared/src/main/java/com/shilapi/xcertplay/network/LocalOnlyHotspotManager.kt index b53ca4affd..a3901cc76f 100644 --- a/shared/src/main/java/com/shilapi/xcertplay/network/LocalOnlyHotspotManager.kt +++ b/shared/src/main/java/com/shilapi/xcertplay/network/LocalOnlyHotspotManager.kt @@ -189,7 +189,7 @@ class LocalOnlyHotspotManager(context: Context, private val onDiagnostic: (Strin try { val builder = SoftApConfiguration.Builder() SoftApConfiguration.Builder::class.java.getMethod("setSsid", String::class.java) - .invoke(builder, "DiPlay-${UUID.randomUUID().toString().take(6)}") + .invoke(builder, "LoopLink-${UUID.randomUUID().toString().take(6)}") SoftApConfiguration.Builder::class.java.getMethod("setPassphrase", String::class.java, Int::class.javaPrimitiveType) .invoke(builder, UUID.randomUUID().toString().replace("-", "").take(20), SoftApConfiguration.SECURITY_TYPE_WPA2_PSK) // Request the station's 5 GHz channel, or 36 without a 5 GHz station.