Forráskód Böngészése

22.04.28 로비->대문 변경, 조명 전체제어시 2초동안 버튼 입력 안되는 것 제거.

jslee(madeinlab) 3 éve
szülő
commit
97b2172c92

BIN
WallPadAPI/jar/WallPadAPI.jar


+ 1 - 1
WallPadAPI/src/main/java/com/artncore/commons/API_Menu.java

@@ -113,7 +113,7 @@ public final class API_Menu
         public final static int BASE = 3000; //BASE and GroupID
 
         public final static String Name_Door        = "현관";
-        public final static String Name_Lobby       = "로비";
+        public final static String Name_Lobby       = "대문";     //로비->대문
         public final static String Name_Neighbor    = "이웃";
         public final static String Name_Guard       = "경비실";
         public final static String Name_PSTN        = "전화";

+ 1 - 1
WallPadAPI/src/main/java/com/artncore/commons/define.java

@@ -4,7 +4,7 @@ import android.os.Environment;
 
 public class define {
 	/** WallPadAPI Version 을 정의합니다. */
-	public static final String WALLPADAPI_VERSION = "2022.04.11.03";
+	public static final String WALLPADAPI_VERSION = "2022.04.28.01";
 	///////////////////////////////////////////////////////////////////////
 	// WallPadDevService 의 각 드라이버와 통신을 위한 드라이버 이름을 정의합니다.
 	///////////////////////////////////////////////////////////////////////

+ 14 - 12
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxMainScreen.java

@@ -703,19 +703,21 @@ public class LightKnxMainScreen extends WpadScreen {
                 Sound().Play(SND.effect.TOUCH_LATCHED);
                 MovePage(true);
             } else if (TargetId == ID.KnxLight.button.ALL_EXECUTION) {
-                long currentClickTime = SystemClock.uptimeMillis();
-                long elapsedTime = currentClickTime - mLastClickTime;
-                mLastClickTime = currentClickTime;
-                if (elapsedTime > MIN_CLICK_INTERVAL) {
-                    Device_All_Excecution_Release(false);
-                }
+                Device_All_Excecution_Release(false);
+                //long currentClickTime = SystemClock.uptimeMillis();
+                //long elapsedTime = currentClickTime - mLastClickTime;
+                //mLastClickTime = currentClickTime;
+                //if (elapsedTime > MIN_CLICK_INTERVAL) {
+                //    Device_All_Excecution_Release(false);
+                //}
             } else if (TargetId == ID.KnxLight.button.ALL_RELEASE) {
-                long currentClickTime = SystemClock.uptimeMillis();
-                long elapsedTime = currentClickTime - mLastClickTime;
-                mLastClickTime = currentClickTime;
-                if (elapsedTime > MIN_CLICK_INTERVAL) {
-                    Device_All_Excecution_Release(true);
-                }
+                Device_All_Excecution_Release(true);
+                //long currentClickTime = SystemClock.uptimeMillis();
+                //long elapsedTime = currentClickTime - mLastClickTime;
+                //mLastClickTime = currentClickTime;
+                //if (elapsedTime > MIN_CLICK_INTERVAL) {
+                //    Device_All_Excecution_Release(true);
+                //}
             }
         }
     }

+ 4 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxPopupRoomScreen.java

@@ -438,7 +438,8 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
                     }
                 }
             }
-        } else if (ActionName.equals(define.NOTIFY_DAIL)) {
+        }
+        else if (ActionName.equals(define.NOTIFY_DAIL)) {
             DebugLogOutput("onBrReceive - NOTIFY_DAIL");
             byte OnOff = intent.getByteExtra("ONOFF", (byte) 0xEE);
             byte Dial = intent.getByteExtra("DIAL", (byte) 0xEE);
@@ -1409,10 +1410,11 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
         LightSwitch.Info.LightCount = 2;
         LightSwitch.Info.LightType_1 = (byte) 0x0E;
         LightSwitch.Info.LightType_2 = (byte) 0x0F;
-        LightSwitch.Data.LightSwitch = new LightSwithcClass.Light_SwitchClass[1];
+        LightSwitch.Data.LightSwitch = new LightSwithcClass.Light_SwitchClass[2];
         LightSwithcClass.Light_SwitchClass lightSwitch = new LightSwithcClass.Light_SwitchClass();
         lightSwitch.Data.OnOff = true;
         LightSwitch.Data.LightSwitch[0] = lightSwitch;
+        LightSwitch.Data.LightSwitch[1] = lightSwitch;
         mData.Light_Switch = new LightSwithcClass[2];
         mData.Light_Switch[0] = LightSwitch;
         mData.Light_Switch[1] = LightSwitch;