Merge pull request 'H/P 연결할 때마다 Lifetime 기준값이 1씩 증가하는 버그 수정' (#64) from feature/ISSUE-14,15 into develop

Reviewed-on: #64

app/src/main/java/com/laseroptek/raman/ui/screens/home/HomeScreen.kt

@@ -304,7 +304,7 @@ fun HomeScreen(
                     pulseType = pulseType,
                     handPieceType = handPiece.type,
                     type = LaserStatusType.REPETITION,
-                    angle = if (pulseType == 0 || repetitionList.size < 2) 0f else repetitionAngle,
+                    angle = if (pulseType == 0 || repetitionList.isEmpty()) 0f else repetitionAngle,
                     onChange = { angle ->
                         if (handPiece.type == 0) {
                             Toast.makeText(
@@ -315,7 +315,7 @@ fun HomeScreen(
                             return@LaserControlView
                         }
 
-                        if (pulseType == 0 || repetitionList.size < 2) {
+                        if (pulseType == 0 || repetitionList.isEmpty()) {
                             //Toast.makeText(context, "Single pulse type (0 Hz)", Toast.LENGTH_SHORT).show()
                         } else {
                             mainViewModel.onChangeRepetition(angle)
@@ -332,7 +332,7 @@ fun HomeScreen(
                             return@LaserControlView
                         }
 
-                        if (pulseType == 0 || repetitionList.size < 2) {
+                        if (pulseType == 0 || repetitionList.isEmpty()) {
                             //Toast.makeText(context, "Single pulse type (0 Hz)", Toast.LENGTH_SHORT).show()
                         } else {
                             //mainViewModel.onClickRepetition(state)

app/src/main/java/com/laseroptek/raman/ui/screens/home/preset/PresetLoadPopup.kt

@@ -780,21 +780,25 @@ fun PresetLoadPopup(
                                 .noRippleClickable(onClick = {
                                     Timber.d("onClick - Preset Load")
 
-                                    val selectedPreset =
-                                        presetViewModel.getPreset(selectedPresetIndex)
-                                    val priority =
-                                        selectedPreset?.priority ?: 0
+                                    val selectedPreset = presetViewModel.getPreset(selectedPresetIndex)
+                                    if (selectedPreset == null) {
+                                        Timber.w("onClick - Preset Load: selectedPreset is null. index=$selectedPresetIndex")
+                                        return@noRippleClickable
+                                    }
+                                    val priority = selectedPreset.priority
 
                                     Timber.d("onClick - Preset Load ($priority)")
 
-//                                    if (priority > 0) {   // TODO : 검증 필요
+                                    if (priority > 0) {
                                         mainViewModel.setSelectedPresetIndex( priority )
                                         mainViewModel.applyPreset(priority)
+                                    } else {
+                                        // 우선순위가 NONE인 경우, 인덱스 설정 X
+                                        mainViewModel.setSelectedPresetIndex(0)
+                                        mainViewModel.applyPreset(selectedPreset)
+                                    }
                                     presetViewModel.clearPreset()
                                     onClick.invoke(false)
-//                                    } else {
-//                                        Timber.d("SKIP - Preset Load ($priority)")
-//                                    }
                                 })
                                 .size(40.px.dp)
                                 .background(Color.Transparent)

app/src/main/java/com/laseroptek/raman/ui/screens/main/MainViewModel.kt

@@ -134,6 +134,7 @@ import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import kotlin.math.abs
 import javax.inject.Inject
 import kotlin.experimental.or
 import kotlin.time.Duration.Companion.milliseconds
@@ -1105,7 +1106,7 @@ class MainViewModel @Inject constructor(
                 CMD.LASER_STATUS -> {
                     val l = packet.data.toLaserStatus()
                     setLaserStatus(l.copy())
-                    // on receuve laser on (or interval) increase count and save to pref.
+                    // on receive laser on (or interval) increase count and save to pref.
                     // Laser On 패킷만 counting 하도록 변경 (2개 패킷 모두 수신 됨)
                     if (_laserStatus.value.laserStatus == LASER_STATUS.LASER_ON /* || l.laserStatus == LASER_STATUS.INTERVAL */) {
                         playBeepSound()
@@ -1184,58 +1185,19 @@ class MainViewModel @Inject constructor(
                     setEnergyControl(EnergyControl(0x03, 0x00))
                     setEnergyMeasured(EnergyMeasured(0x04, 0x00, 0x00))
 
-                    // hand piece 별 count 증가
-                    when (h.type) {
-                        1 -> {  // hp 5x5
-                            setLifeTime(
-                                _lifeTime.value.copy(
-                                    hp5x5 = _lifeTime.value.hp5x5 + 1
-                                )
-                            )
-                            saveLifeTimeToPreference()
-                            Timber.d("_lifeTime (hp5x5): ${_lifeTime}")
-                        }
-                        2 -> {
-                            setLifeTime(
-                                _lifeTime.value.copy(
-                                    hp7x7 = _lifeTime.value.hp7x7 + 1
-                                )
-                            )
-                            saveLifeTimeToPreference()
-                            Timber.d("_lifeTime (hp7x7): ${_lifeTime}")
-                        }
-                        3 -> {
-                            setLifeTime(
-                                _lifeTime.value.copy(
-                                    hp10x10 = _lifeTime.value.hp10x10 + 1
-                                )
-                            )
-                            saveLifeTimeToPreference()
-                            Timber.d("_lifeTime (hp10x10): ${_lifeTime}")
-                        }
-                        4 -> {
-                            setLifeTime(
-                                _lifeTime.value.copy(
-                                    hp12x12 = _lifeTime.value.hp12x12 + 1
-                                )
-                            )
-                            saveLifeTimeToPreference()
-                            Timber.d("_lifeTime (hp12x12): ${_lifeTime}")
-                        }
-                        5 -> {
-                            setLifeTime(
-                                _lifeTime.value.copy(
-                                    hp3x15 = _lifeTime.value.hp3x15 + 1
-                                )
-                            )
-                            saveLifeTimeToPreference()
-                            Timber.d("_lifeTime (hp3x15): ${_lifeTime}")
-                        }
+                    val connectedHandPieceLifeTime = when (h.type) {
+                        1 -> lifeTime.value.hp5x5
+                        2 -> lifeTime.value.hp7x7
+                        3 -> lifeTime.value.hp10x10
+                        4 -> lifeTime.value.hp12x12
+                        5 -> lifeTime.value.hp3x15
                         else -> {
-                            Timber.d("unknwon hand piece type: ${h.type}")
+                            Timber.d("Unknown Hand-piece type: ${h.type}")
                             return@launch
                         }
                     }
+                    Timber.d("HAND_PIECE lifetime: type=${h.type}, value=${connectedHandPieceLifeTime}, hpCount=${hpCount.value}")
+
 
                     // hand piece가 변경 시점 에서, pref 테이블 값을 -> energyTable 로 로딩
                     loadFluenceTable(handPiece.value.type)
@@ -2081,28 +2043,58 @@ class MainViewModel @Inject constructor(
         Timber.d("preset: ${preset}")
 
         val newPreset = if (preset == null) {
+            val defaultPulseWidth = PulseDurations.first()
             Preset(
                 handPieceType = handPiece.value.type,
                 priority = priority,
-                fluence = energyTable.value.getKey2ListForKey1(0.5f).first(),
+                fluence = energyTable.value.getKey2ListForKey1(defaultPulseWidth).firstOrNull() ?: 0f,
                 repetition = repetitionList.value.first(),
-                pulseWidth = PulseDurations.first(),
+                pulseWidth = defaultPulseWidth,
             )
         } else {
             preset
         }
+        applyPreset(newPreset)
+    }
 
-        val fluenceList = energyTable.value.getKey2ListForKey1(newPreset.pulseWidth)
+    fun applyPreset(preset: Preset) {
+        val newPreset = preset.copy()
 
         val pulseStep = PulseDurations.indexOf(newPreset.pulseWidth).takeIf {it != -1} ?: 0
-        val fluenceStep = fluenceList.indexOf(newPreset.fluence).takeIf {it != -1} ?: 0
-        val repetitionStep = repetitionList.value.indexOf(newPreset.repetition).takeIf {it != -1} ?: 0
+        val resolvedPulseWidth = PulseDurations[pulseStep]
+
+        // 프리셋의 pulseWidth 기준으로 실제 사용 가능한 fluence 목록을 먼저 동기화한다.
+        val newFluenceList = energyTable.value.getKey2ListForKey1(resolvedPulseWidth)
+        if (newFluenceList != fluenceList.value) {
+            setFluenceList(newFluenceList)
+        }
+
+        // 프리셋 fluence가 정확히 없을 수 있으므로, 가장 가까운 값으로 보정한다.
+        val resolvedFluence = newFluenceList.minByOrNull { abs(it - newPreset.fluence) }
+            ?: newFluenceList.firstOrNull()
+            ?: 0f
+        val fluenceStep = newFluenceList.indexOf(resolvedFluence).takeIf { it != -1 } ?: 0
+
+        // 보정된 (pulseWidth, fluence) 조합으로 repetition 테이블을 다시 계산한다.
+        val hzType = hzTable.value.getValue(resolvedPulseWidth, resolvedFluence)
+        val newRepetitionList = RepetitionsByColorKey[hzType] ?: RepetitionsByColorKey[KEY_YELLOW]!!
+        if (newRepetitionList != repetitionList.value) {
+            setRepetitionList(newRepetitionList)
+        }
+        val repetitionStep = newRepetitionList.indexOf(newPreset.repetition).takeIf { it != -1 } ?: 0
 
         Timber.d("pulseStep: ${pulseStep} fluenceStep: ${fluenceStep} repetitionStep: ${repetitionStep}")
 
         val pulseAngle = pulseStep.stepToDegree(totalSteps = PulseDurations.size)
-        val fluenceAngle = fluenceStep.stepToDegree(totalSteps = fluenceList.size)
-        val repetitionAngle = repetitionStep.stepToDegree(totalSteps = repetitionList.value.size)
+        val fluenceAngle = if (newFluenceList.isNotEmpty()) {
+            fluenceStep.stepToDegree(totalSteps = newFluenceList.size)
+        } else {
+            0f
+        }
+        val repetitionAngle = repetitionIndexToAngle(
+            index = repetitionStep,
+            totalSteps = newRepetitionList.size,
+        )
 
         Timber.d("pulseStep: ${pulseStep} fluenceStep: ${fluenceStep} repetitionStep: ${repetitionStep}")
 
@@ -2132,30 +2124,35 @@ class MainViewModel @Inject constructor(
             setFluenceList(newFluenceList)
         }
 
+        // 2-1. Resolve and apply fluence by value (not by old angle/index).
+        val resolvedFluence = newFluenceList.minByOrNull { abs(it - newFluence) } ?: 0f
+        val resolvedFluenceIndex = newFluenceList.indexOf(resolvedFluence).takeIf { it >= 0 } ?: 0
+        if (newFluenceList.isNotEmpty()) {
+            setFluenceAngle(resolvedFluenceIndex.stepToDegree(totalSteps = newFluenceList.size))
+        }
+
         // 3. Safely Update Repetition List (Prevents NullPointerException)
-        val newHzType = hzTable.value.getValue(newPulseDuration, newFluence)
+        val newHzType = hzTable.value.getValue(newPulseDuration, resolvedFluence)
         val newRepetitionList = RepetitionsByColorKey[newHzType] ?: RepetitionsByColorKey[KEY_YELLOW]!!
         if (newRepetitionList != repetitionList.value) {
             setRepetitionList(newRepetitionList)
         }
 
-        // Smartly preserve Repetition Angle
-        // 4. Check if the old repetition value exists in the new list.
-        val oldRepetitionIndex = if (currentRepetitionValue != null) {
-            newRepetitionList.indexOf(currentRepetitionValue)
-        } else {
-            -1
-        }
+        // 4. Resolve and apply repetition by value (not by old angle/index).
+        val targetRepetition = currentRepetitionValue ?: 0f
+        val resolvedRepetition = newRepetitionList.minByOrNull { abs(it - targetRepetition) } ?: 0f
+        val resolvedRepetitionIndex = newRepetitionList.indexOf(resolvedRepetition).takeIf { it >= 0 } ?: 0
 
-        if (oldRepetitionIndex != -1) {
-            // If the old value exists, set the slider to that position.
-            val preservedAngle = oldRepetitionIndex.stepToDegree(totalSteps = newRepetitionList.size)
-            setRepetitionAngle(preservedAngle)
-            Timber.d("Repetition value $currentRepetitionValue preserved at new angle $preservedAngle.")
+        if (newRepetitionList.isNotEmpty()) {
+            val resolvedRepetitionAngle = repetitionIndexToAngle(
+                index = resolvedRepetitionIndex,
+                totalSteps = newRepetitionList.size,
+            )
+            setRepetitionAngle(resolvedRepetitionAngle)
+            Timber.d("Resolved repetition by value: old=$currentRepetitionValue, new=$resolvedRepetition, angle=$resolvedRepetitionAngle")
         } else {
-            // If it doesn't exist, THEN reset the slider to the beginning.
             setRepetitionAngle(0f)
-            Timber.d("Repetition value $currentRepetitionValue not supported in new list. Resetting angle.")
+            Timber.d("Repetition list is empty. Resetting repetition angle to 0f.")
         }
 
         // 5. Conditionally reset the fluence angle slider if needed
@@ -2168,7 +2165,7 @@ class MainViewModel @Inject constructor(
         // 6. Any change invalidates the current preset selection.
         setSelectedPresetIndex(0)
 
-        Timber.d("Updated Laser Parameters: pulse=$newPulseDuration, fluence=$newFluence -> newRepListSize=${newRepetitionList.size}")
+        Timber.d("Updated Laser Parameters: pulse=$newPulseDuration, fluence=$resolvedFluence -> newRepListSize=${newRepetitionList.size}")
     }
 
     /**
@@ -2188,13 +2185,16 @@ class MainViewModel @Inject constructor(
         setPulseAngle(newPulseStep.stepToDegree(totalSteps = PulseDurations.size))
 
         val newPulseDuration = PulseDurations[newPulseStep]
-        // When pulse duration changes via slider, we use the first available fluence for the new list.
-        val firstFluence = energyTable.value.getKey2ListForKey1(newPulseDuration).firstOrNull() ?: 0f
+        // Keep the current fluence value when pulse duration changes via slider.
+        val currentFluenceStep = fluenceAngle.value.degreeToStep(totalSteps = fluenceList.value.size)
+        val currentFluence = fluenceList.value.getOrNull(currentFluenceStep)
+            ?: energyTable.value.getKey2ListForKey1(newPulseDuration).firstOrNull()
+            ?: 0f
 
-        // Call the centralized helper, resetting the fluence slider.
+        // Call the centralized helper using the preserved fluence value.
         updateLaserParameters(
             newPulseDuration = newPulseDuration,
-            newFluence = firstFluence,
+            newFluence = currentFluence,
         )
     }
 
@@ -2206,12 +2206,17 @@ class MainViewModel @Inject constructor(
             setPulseAngle(newStep.stepToDegree(totalSteps = PulseDurations.size))
 
             val newPulseDuration = PulseDurations[newStep]
-            val firstFluence = energyTable.value.getKey2ListForKey1(newPulseDuration).firstOrNull() ?: 0f
+            // Keep the current fluence value when pulse duration changes via slider.
+            val currentFluenceStep = fluenceAngle.value.degreeToStep(totalSteps = fluenceList.value.size)
+            val currentFluence = fluenceList.value.getOrNull(currentFluenceStep)
+                ?: energyTable.value.getKey2ListForKey1(newPulseDuration).firstOrNull()
+                ?: 0f
+
 
             // Call the centralized helper, resetting the fluence slider.
             updateLaserParameters(
                 newPulseDuration = newPulseDuration,
-                newFluence = firstFluence,
+                newFluence = currentFluence,
             )
         }
     }
@@ -2254,8 +2259,12 @@ class MainViewModel @Inject constructor(
 
     fun onChangeRepetition(angle: Float) {
         // This logic is simple and has no complex dependencies, so it can remain as is.
-        if (angle != repetitionAngle.value) {
-            setRepetitionAngle(angle)
+        val normalizedAngle = repetitionIndexToAngle(
+            index = angle.degreeToStep(totalSteps = repetitionList.value.size),
+            totalSteps = repetitionList.value.size,
+        )
+        if (normalizedAngle != repetitionAngle.value) {
+            setRepetitionAngle(normalizedAngle)
         }
         setSelectedPresetIndex(0)
     }
@@ -2266,12 +2275,23 @@ class MainViewModel @Inject constructor(
         val newStep = if (state == UpDownState.Up) currentStep + 1 else currentStep - 1
 
         if (newStep in repetitionList.value.indices) {
-            val newRepetitionAngle = newStep.stepToDegree(totalSteps = repetitionList.value.size)
+            val newRepetitionAngle = repetitionIndexToAngle(
+                index = newStep,
+                totalSteps = repetitionList.value.size,
+            )
             setRepetitionAngle(newRepetitionAngle)
             setSelectedPresetIndex(0)
         }
     }
 
+    private fun repetitionIndexToAngle(index: Int, totalSteps: Int): Float {
+        return when {
+            totalSteps <= 0 -> 0f
+            totalSteps == 1 -> 270f
+            else -> index.stepToDegree(totalSteps = totalSteps)
+        }
+    }
+
     /**
      * Perform all heavy I/O in a single background block.
      * This prevents the "Skipped frames" caused by 30+ sequential bridge calls