diff --git a/app/src/main/java/com/example/medilightv2android/managers/ImuPostureClassifier.kt b/app/src/main/java/com/example/medilightv2android/managers/ImuPostureClassifier.kt index a7b7f31..cbf40e4 100644 --- a/app/src/main/java/com/example/medilightv2android/managers/ImuPostureClassifier.kt +++ b/app/src/main/java/com/example/medilightv2android/managers/ImuPostureClassifier.kt @@ -69,7 +69,10 @@ object ImuPostureClassifier { val absPitch = abs(pitch) val thr = GreenZoneConstants.pitchLyingThreshold - val posture = if (absPitch > thr) Posture.LYING else Posture.NON_LYING + // Pitch 의미: AX 가 중력과 일치할수록 큰 값 (≈90°), AZ 가 중력과 일치하면 작은 값 (≈0°). + // 사용자 직관: 센서 평평하게 둠 (AZ up) = LYING, 세움 (AX up) = NON_LYING (upright). + // → 작은 pitch → LYING, 큰 pitch → NON_LYING + val posture = if (absPitch <= thr) Posture.LYING else Posture.NON_LYING return Result(posture, pitch, accMag, gyroMag, "ok") } } diff --git a/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt index c937c49..a9eb0a3 100644 --- a/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt +++ b/app/src/main/java/com/example/medilightv2android/ui/views/monitoring/PiezoMonitoringView.kt @@ -1791,7 +1791,7 @@ fun PiezoMonitoringView(appState: AppState) { Spacer(modifier = Modifier.width(8.dp)) Text("${pitchThrVal.toInt()}°", fontSize = 13.sp, fontWeight = FontWeight.Bold, color = MlPrimary) Spacer(modifier = Modifier.weight(1f)) - Text("|pitch|>${pitchThrVal.toInt()}°→Lying", fontSize = 11.sp, color = MlSecondaryText) + Text("|pitch|≤${pitchThrVal.toInt()}°→Lying", fontSize = 11.sp, color = MlSecondaryText) } Slider( value = pitchThrVal, @@ -1800,6 +1800,29 @@ fun PiezoMonitoringView(appState: AppState) { steps = 11, colors = SliderDefaults.colors(thumbColor = MlPrimary, activeTrackColor = MlPrimary) ) + + HorizontalDivider(modifier = Modifier.padding(vertical = dividerPadding)) + + // Wakeup Alarm toggle (Personalization 페이지 와 동일 prefs) + var wakeupEnabled by remember { + mutableStateOf(com.example.medilightv2android.services.WakeupAlarmPrefs.isEnabled(context)) + } + Row(verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth()) { + Column(modifier = Modifier.weight(1f)) { + Text("기상 알람", fontSize = labelSize, fontWeight = FontWeight.SemiBold) + Text("일어남 감지 시 빨간 팝업", + fontSize = 11.sp, color = MlSecondaryText) + } + Switch( + checked = wakeupEnabled, + onCheckedChange = { + wakeupEnabled = it + com.example.medilightv2android.services.WakeupAlarmPrefs.setEnabled(context, it) + }, + colors = SwitchDefaults.colors(checkedTrackColor = Color(0xFFD32F2F)) + ) + } } HorizontalDivider(modifier = Modifier.padding(vertical = dividerPadding))