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

Fix engineer screen state updates #60

Open
woo wants to merge 1 commits from feature/ISSUE-22 into develop
pull from: feature/ISSUE-22
merge into: steven:develop
Conversation 1 Commits 1 Files Changed 1 +33 -33
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File 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) {
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
)
}
}