Переглянути джерело

[WallPadHomeCtrl]
1. 환기 신규 버전 화면 예약중일 경우 처리 추가
- 바이패스 누를 경우, 예약 중이면 팝업표시
2. 버전업
- 2022.08.25.01 -> 2023.03.14.01

jglee 2 роки тому
батько
коміт
b2e7c0f01b

+ 1 - 1
WallPadHomeCtrl/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadhomectrl"
     android:versionCode="17"
-    android:versionName="2022.08.25.01">
+    android:versionName="2023.03.14.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

+ 8 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_venti/VentilationMainScreen.java

@@ -938,6 +938,14 @@ public class VentilationMainScreen extends WpadScreen {
 					return;
 				}
 
+				//jglee - 2023.03.13 예약중 알람 팝업 처리
+				if (mVentilData.VentilStatus.Reservation) {
+					printDebugLog("[onTouchEvent] ========== jeff 2 ==========");
+					// 예약중입니다 팝업 알람
+					startAlarmPopup(ID.VentiPopup_Alarm.kind.ReservationClear);
+					return;
+				}
+
 				boolean OnOff = false;
 				if (!mVentilData.VentilStatus.ByPass) OnOff = true;