steven/raman
1
1
Fork 0
Code Issues 20 Pull Requests 1 Actions Packages Releases Wiki Activity

Compare commits

merge into: steven:develop
Branches Tags
steven:develop steven:feature/ISSUE-62 steven:feature/ISSUE-22 steven:master
...
pull from: steven:feature/ISSUE-22
Branches Tags
steven:develop steven:feature/ISSUE-62 steven:feature/ISSUE-22 steven:master

1 Commits

Author SHA1 Message Date
areumwoo
4a89f4562f Fix engineer screen state updates 2026-03-08 15:35:38 +09:00
1 changed files with 33 additions and 33 deletions
Expand all files Collapse all files

66
app/src/main/java/com/laseroptek/raman/ui/screens/engineer/EngineerScreen.kt
View File

@@ -1011,14 +1011,14 @@ fun EngineerScreen(
if (ok) { if (ok) {
Timber.d("onClick > lampCount: $value") Timber.d("onClick > lampCount: $value")
mainViewModel.setLifeTime( engineerViewModel.setLifeTime(
lifeTime.copy( lifeTime.copy(
lamp = value lamp = value
) )
) )
scope.launch { scope.launch {
mainViewModel.saveLifeTimeToPreference() engineerViewModel.saveLifeTimeToPreference()
} }
} }
showLifeTimeLampCountPopup = false showLifeTimeLampCountPopup = false
@@ -1034,13 +1034,13 @@ fun EngineerScreen(
onClick = { ok, value -> onClick = { ok, value ->
if (ok) { if (ok) {
Timber.d("onClick > hp5x5: $value") Timber.d("onClick > hp5x5: $value")
mainViewModel.setLifeTime( engineerViewModel.setLifeTime(
lifeTime.copy( lifeTime.copy(
hp5x5 = value hp5x5 = value
) )
) )
scope.launch { scope.launch {
mainViewModel.saveLifeTimeToPreference() engineerViewModel.saveLifeTimeToPreference()
} }
} }
showLifeTypeHP5x5Popup = false showLifeTypeHP5x5Popup = false
@@ -1056,13 +1056,13 @@ fun EngineerScreen(
onClick = { ok, value -> onClick = { ok, value ->
if (ok) { if (ok) {
Timber.d("onClick > hp7x7: $value") Timber.d("onClick > hp7x7: $value")
mainViewModel.setLifeTime( engineerViewModel.setLifeTime(
lifeTime.copy( lifeTime.copy(
hp7x7 = value hp7x7 = value
) )
) )
scope.launch { scope.launch {
mainViewModel.saveLifeTimeToPreference() engineerViewModel.saveLifeTimeToPreference()
} }
} }
showLifeTimeHP7x7Popup = false showLifeTimeHP7x7Popup = false
@@ -1078,13 +1078,13 @@ fun EngineerScreen(
onClick = { ok, value -> onClick = { ok, value ->
if (ok) { if (ok) {
Timber.d("onClick > hp10x10: $value") Timber.d("onClick > hp10x10: $value")
mainViewModel.setLifeTime( engineerViewModel.setLifeTime(
lifeTime.copy( lifeTime.copy(
hp10x10 = value hp10x10 = value
) )
) )
scope.launch { scope.launch {
mainViewModel.saveLifeTimeToPreference() engineerViewModel.saveLifeTimeToPreference()
} }
} }
showLifeTimeHP10x10Popup = false showLifeTimeHP10x10Popup = false
@@ -1100,13 +1100,13 @@ fun EngineerScreen(
onClick = { ok, value -> onClick = { ok, value ->
if (ok) { if (ok) {
Timber.d("onClick > hp12x12: $value") Timber.d("onClick > hp12x12: $value")
mainViewModel.setLifeTime( engineerViewModel.setLifeTime(
lifeTime.copy( lifeTime.copy(
hp12x12 = value hp12x12 = value
) )
) )
scope.launch { scope.launch {
mainViewModel.saveLifeTimeToPreference() engineerViewModel.saveLifeTimeToPreference()
} }
} }
showLifeTimeHP12x12Popup = false showLifeTimeHP12x12Popup = false
@@ -1122,13 +1122,13 @@ fun EngineerScreen(
onClick = { ok, value -> onClick = { ok, value ->
if (ok) { if (ok) {
Timber.d("onClick > hp3x15: $value") Timber.d("onClick > hp3x15: $value")
mainViewModel.setLifeTime( engineerViewModel.setLifeTime(
lifeTime.copy( lifeTime.copy(
hp3x15 = value hp3x15 = value
) )
) )
scope.launch { scope.launch {
mainViewModel.saveLifeTimeToPreference() engineerViewModel.saveLifeTimeToPreference()
} }
} }
showLifeTimeHP3x15Popup = false showLifeTimeHP3x15Popup = false
@@ -1143,13 +1143,13 @@ fun EngineerScreen(
onClick = { ok, value -> onClick = { ok, value ->
if (ok) { if (ok) {
Timber.d("onClick > detector: $value") Timber.d("onClick > detector: $value")
mainViewModel.setLifeTime( engineerViewModel.setLifeTime(
lifeTime.copy( lifeTime.copy(
detector = value detector = value
) )
) )
scope.launch { scope.launch {
mainViewModel.saveLifeTimeToPreference() engineerViewModel.saveLifeTimeToPreference()
} }
} }
showLifeTimeDetectorPopup = false showLifeTimeDetectorPopup = false
@@ -1164,13 +1164,13 @@ fun EngineerScreen(
onClick = { ok, value -> onClick = { ok, value ->
if (ok) { if (ok) {
Timber.d("onClick > water: $value") Timber.d("onClick > water: $value")
mainViewModel.setLifeTime( engineerViewModel.setLifeTime(
lifeTime.copy( lifeTime.copy(
water = value water = value
) )
) )
scope.launch { scope.launch {
mainViewModel.saveLifeTimeToPreference() engineerViewModel.saveLifeTimeToPreference()
} }
} }
showLifeTimeWaterPopup = false showLifeTimeWaterPopup = false
@@ -1187,7 +1187,7 @@ fun EngineerScreen(
onClick = { ok, value -> onClick = { ok, value ->
if (ok) { if (ok) {
Timber.d("onClick > ktp: $value") Timber.d("onClick > ktp: $value")
mainViewModel.setTemperatureWrite( engineerViewModel.setTemperatureWrite(
temperatureWrite.copy( temperatureWrite.copy(
ktp = value.toFloat() ktp = value.toFloat()
) )
@@ -1199,12 +1199,12 @@ fun EngineerScreen(
CMD.OVEN, CMD.OVEN,
Oven( Oven(
type = 0x41, type = 0x41,
ktp = temperatureWrite.ktp ktp = value.toFloat()
) )
) )
scope.launch { scope.launch {
mainViewModel.saveTemeratureWriteToPreference() engineerViewModel.saveTemeratureWriteToPreference()
} }
} }
showTempKTPPopup = false showTempKTPPopup = false
@@ -1220,13 +1220,13 @@ fun EngineerScreen(
if (ok) { if (ok) {
Timber.d("onClick > chamber1: $value") Timber.d("onClick > chamber1: $value")
mainViewModel.setTemperatureWrite( engineerViewModel.setTemperatureWrite(
temperatureWrite.copy( temperatureWrite.copy(
chamber1 = value.toFloat() chamber1 = value.toFloat()
) )
) )
scope.launch { scope.launch {
mainViewModel.saveTemeratureWriteToPreference() engineerViewModel.saveTemeratureWriteToPreference()
} }
} }
showTempChamber1Popup = false showTempChamber1Popup = false
@@ -1241,13 +1241,13 @@ fun EngineerScreen(
onClick = { ok, value -> onClick = { ok, value ->
if (ok) { if (ok) {
Timber.d("onClick > chamber2: $value") Timber.d("onClick > chamber2: $value")
mainViewModel.setTemperatureWrite( engineerViewModel.setTemperatureWrite(
temperatureWrite.copy( temperatureWrite.copy(
chamber2 = value.toFloat() chamber2 = value.toFloat()
) )
) )
scope.launch { scope.launch {
mainViewModel.saveTemeratureWriteToPreference() engineerViewModel.saveTemeratureWriteToPreference()
} }
} }
showTempChamber2Popup = false showTempChamber2Popup = false
@@ -1261,13 +1261,13 @@ fun EngineerScreen(
count = temperatureWrite.water, count = temperatureWrite.water,
onClick = { ok, value -> onClick = { ok, value ->
if (ok) { if (ok) {
mainViewModel.setTemperatureWrite( engineerViewModel.setTemperatureWrite(
temperatureWrite.copy( temperatureWrite.copy(
water = value.toFloat() water = value.toFloat()
) )
) )
scope.launch { scope.launch {
mainViewModel.saveTemeratureWriteToPreference() engineerViewModel.saveTemeratureWriteToPreference()
} }
} }
showTempWaterPopup = false showTempWaterPopup = false
@@ -1282,13 +1282,13 @@ fun EngineerScreen(
onClick = { ok, value -> onClick = { ok, value ->
if (ok) { if (ok) {
Timber.d("onClick > basePlate: $value") Timber.d("onClick > basePlate: $value")
mainViewModel.setTemperatureWrite( engineerViewModel.setTemperatureWrite(
temperatureWrite.copy( temperatureWrite.copy(
basePlate = value.toFloat() basePlate = value.toFloat()
) )
) )
scope.launch { scope.launch {
mainViewModel.saveTemeratureWriteToPreference() engineerViewModel.saveTemeratureWriteToPreference()
} }
} }
showTempBaseplatePopup = false showTempBaseplatePopup = false
@@ -1393,9 +1393,9 @@ fun EngineerScreen(
mainViewModel.saveLampCountToPreference() mainViewModel.saveLampCountToPreference()
mainViewModel.saveSprayDcdListToPreference() mainViewModel.saveSprayDcdListToPreference()
mainViewModel.savePresetListToPreference() mainViewModel.savePresetListToPreference()
mainViewModel.saveLifeTimeToPreference() engineerViewModel.saveLifeTimeToPreference()
mainViewModel.saveTemeratureWriteToPreference() engineerViewModel.saveTemeratureWriteToPreference()
mainViewModel.saveEnergyMeasuredWriteToPreference() engineerViewModel.saveEnergyMeasuredWriteToPreference()
mainViewModel.saveEnergyRefer2ToPreference() mainViewModel.saveEnergyRefer2ToPreference()
mainViewModel.saveProductSerialListToPreference() mainViewModel.saveProductSerialListToPreference()
mainViewModel.savePowerSupplySerialListToPreference() mainViewModel.savePowerSupplySerialListToPreference()
@@ -1521,14 +1521,14 @@ fun EngineerScreen(
}, },
onClickSet = { v -> onClickSet = { v ->
// write measured value // write measured value
mainViewModel.setEnergyMeasuredWrite( engineerViewModel.setEnergyMeasuredWrite(
EnergyMeasured( EnergyMeasured(
measured = v measured = v
) )
) )
scope.launch { scope.launch {
mainViewModel.saveEnergyMeasuredWriteToPreference() engineerViewModel.saveEnergyMeasuredWriteToPreference()
} }
/* /*
@@ -1733,4 +1733,4 @@ fun PreviewEngineerView(
mainViewModel = mainViewModel, mainViewModel = mainViewModel,
engineerViewModel = engineerViewModel engineerViewModel = engineerViewModel
) )
} }