From 4a89f4562f127e8ed86bf7604f2f43fada0bcd13 Mon Sep 17 00:00:00 2001 From: areumwoo Date: Sun, 8 Mar 2026 15:35:38 +0900 Subject: [PATCH] Fix engineer screen state updates --- .../ui/screens/engineer/EngineerScreen.kt | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/EngineerScreen.kt b/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/EngineerScreen.kt index c3648f8..cbc3a83 100644 --- a/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/EngineerScreen.kt +++ b/app/src/main/java/com/laseroptek/raman/ui/screens/engineer/EngineerScreen.kt @@ -1011,14 +1011,14 @@ fun EngineerScreen( if (ok) { Timber.d("onClick > lampCount: $value") - mainViewModel.setLifeTime( + engineerViewModel.setLifeTime( lifeTime.copy( lamp = value ) ) scope.launch { - mainViewModel.saveLifeTimeToPreference() + engineerViewModel.saveLifeTimeToPreference() } } showLifeTimeLampCountPopup = false @@ -1034,13 +1034,13 @@ fun EngineerScreen( onClick = { ok, value -> if (ok) { Timber.d("onClick > hp5x5: $value") - mainViewModel.setLifeTime( + engineerViewModel.setLifeTime( lifeTime.copy( hp5x5 = value ) ) scope.launch { - mainViewModel.saveLifeTimeToPreference() + engineerViewModel.saveLifeTimeToPreference() } } showLifeTypeHP5x5Popup = false @@ -1056,13 +1056,13 @@ fun EngineerScreen( onClick = { ok, value -> if (ok) { Timber.d("onClick > hp7x7: $value") - mainViewModel.setLifeTime( + engineerViewModel.setLifeTime( lifeTime.copy( hp7x7 = value ) ) scope.launch { - mainViewModel.saveLifeTimeToPreference() + engineerViewModel.saveLifeTimeToPreference() } } showLifeTimeHP7x7Popup = false @@ -1078,13 +1078,13 @@ fun EngineerScreen( onClick = { ok, value -> if (ok) { Timber.d("onClick > hp10x10: $value") - mainViewModel.setLifeTime( + engineerViewModel.setLifeTime( lifeTime.copy( hp10x10 = value ) ) scope.launch { - mainViewModel.saveLifeTimeToPreference() + engineerViewModel.saveLifeTimeToPreference() } } showLifeTimeHP10x10Popup = false @@ -1100,13 +1100,13 @@ fun EngineerScreen( onClick = { ok, value -> if (ok) { Timber.d("onClick > hp12x12: $value") - mainViewModel.setLifeTime( + engineerViewModel.setLifeTime( lifeTime.copy( hp12x12 = value ) ) scope.launch { - mainViewModel.saveLifeTimeToPreference() + engineerViewModel.saveLifeTimeToPreference() } } showLifeTimeHP12x12Popup = false @@ -1122,13 +1122,13 @@ fun EngineerScreen( onClick = { ok, value -> if (ok) { Timber.d("onClick > hp3x15: $value") - mainViewModel.setLifeTime( + engineerViewModel.setLifeTime( lifeTime.copy( hp3x15 = value ) ) scope.launch { - mainViewModel.saveLifeTimeToPreference() + engineerViewModel.saveLifeTimeToPreference() } } showLifeTimeHP3x15Popup = false @@ -1143,13 +1143,13 @@ fun EngineerScreen( onClick = { ok, value -> if (ok) { Timber.d("onClick > detector: $value") - mainViewModel.setLifeTime( + engineerViewModel.setLifeTime( lifeTime.copy( detector = value ) ) scope.launch { - mainViewModel.saveLifeTimeToPreference() + engineerViewModel.saveLifeTimeToPreference() } } showLifeTimeDetectorPopup = false @@ -1164,13 +1164,13 @@ fun EngineerScreen( onClick = { ok, value -> if (ok) { Timber.d("onClick > water: $value") - mainViewModel.setLifeTime( + engineerViewModel.setLifeTime( lifeTime.copy( water = value ) ) scope.launch { - mainViewModel.saveLifeTimeToPreference() + engineerViewModel.saveLifeTimeToPreference() } } showLifeTimeWaterPopup = false @@ -1187,7 +1187,7 @@ fun EngineerScreen( onClick = { ok, value -> if (ok) { Timber.d("onClick > ktp: $value") - mainViewModel.setTemperatureWrite( + engineerViewModel.setTemperatureWrite( temperatureWrite.copy( ktp = value.toFloat() ) @@ -1199,12 +1199,12 @@ fun EngineerScreen( CMD.OVEN, Oven( type = 0x41, - ktp = temperatureWrite.ktp + ktp = value.toFloat() ) ) scope.launch { - mainViewModel.saveTemeratureWriteToPreference() + engineerViewModel.saveTemeratureWriteToPreference() } } showTempKTPPopup = false @@ -1220,13 +1220,13 @@ fun EngineerScreen( if (ok) { Timber.d("onClick > chamber1: $value") - mainViewModel.setTemperatureWrite( + engineerViewModel.setTemperatureWrite( temperatureWrite.copy( chamber1 = value.toFloat() ) ) scope.launch { - mainViewModel.saveTemeratureWriteToPreference() + engineerViewModel.saveTemeratureWriteToPreference() } } showTempChamber1Popup = false @@ -1241,13 +1241,13 @@ fun EngineerScreen( onClick = { ok, value -> if (ok) { Timber.d("onClick > chamber2: $value") - mainViewModel.setTemperatureWrite( + engineerViewModel.setTemperatureWrite( temperatureWrite.copy( chamber2 = value.toFloat() ) ) scope.launch { - mainViewModel.saveTemeratureWriteToPreference() + engineerViewModel.saveTemeratureWriteToPreference() } } showTempChamber2Popup = false @@ -1261,13 +1261,13 @@ fun EngineerScreen( count = temperatureWrite.water, onClick = { ok, value -> if (ok) { - mainViewModel.setTemperatureWrite( + engineerViewModel.setTemperatureWrite( temperatureWrite.copy( water = value.toFloat() ) ) scope.launch { - mainViewModel.saveTemeratureWriteToPreference() + engineerViewModel.saveTemeratureWriteToPreference() } } showTempWaterPopup = false @@ -1282,13 +1282,13 @@ fun EngineerScreen( onClick = { ok, value -> if (ok) { Timber.d("onClick > basePlate: $value") - mainViewModel.setTemperatureWrite( + engineerViewModel.setTemperatureWrite( temperatureWrite.copy( basePlate = value.toFloat() ) ) scope.launch { - mainViewModel.saveTemeratureWriteToPreference() + engineerViewModel.saveTemeratureWriteToPreference() } } showTempBaseplatePopup = false @@ -1393,9 +1393,9 @@ fun EngineerScreen( mainViewModel.saveLampCountToPreference() mainViewModel.saveSprayDcdListToPreference() mainViewModel.savePresetListToPreference() - mainViewModel.saveLifeTimeToPreference() - mainViewModel.saveTemeratureWriteToPreference() - mainViewModel.saveEnergyMeasuredWriteToPreference() + engineerViewModel.saveLifeTimeToPreference() + engineerViewModel.saveTemeratureWriteToPreference() + engineerViewModel.saveEnergyMeasuredWriteToPreference() mainViewModel.saveEnergyRefer2ToPreference() mainViewModel.saveProductSerialListToPreference() mainViewModel.savePowerSupplySerialListToPreference() @@ -1521,14 +1521,14 @@ fun EngineerScreen( }, onClickSet = { v -> // write measured value - mainViewModel.setEnergyMeasuredWrite( + engineerViewModel.setEnergyMeasuredWrite( EnergyMeasured( measured = v ) ) scope.launch { - mainViewModel.saveEnergyMeasuredWriteToPreference() + engineerViewModel.saveEnergyMeasuredWriteToPreference() } /* @@ -1733,4 +1733,4 @@ fun PreviewEngineerView( mainViewModel = mainViewModel, engineerViewModel = engineerViewModel ) -} \ No newline at end of file +}