Kaynağa Gözat

Merge branch 'master' of https://hub.hdc-smart.com/WallPad/LuxuryWPMV2

Jeffrey Nam 2 yıl önce
ebeveyn
işleme
2e18dce218

+ 0 - 52
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/screen/MAIN.java

@@ -2356,21 +2356,6 @@ public class MAIN extends WpadScreen {
 
             if (mKnxData.ControlType == false) {
                 retAll = KnxApi.SetEntireLivlight((byte)4, onoff, dimming, new byte[]{0X00, 0X00, 0X00, 0X00});
-/*
-                for (int i = 0; i < 4; i++) {
-                    if (mDimming[(floor - 1)][i] == 0) {
-                        dimming = 0;
-                        onoff = 2;
-                    } else {
-                        dimming = mDimming[(floor - 1)][i];
-                        onoff = nOnOff;
-                    }
-                    //ret = KnxApi.SetLightDimming((byte) i, (byte) dimming, (byte) onoff);
-                    retAll = KnxApi.SetEntireLivlight((byte)4, new byte[]{0X01, 0X01, 0X01, 0X01}, new byte[]{0X00, 0X00, 0X00, 0X00}, new byte[]{0X00, 0X00, 0X00, 0X00});
-                    retAll = retAll + ret;
-                }
-
- */
             }
             if (retAll >= 0) Sound().Play(SND.effect.TOUCH_LATCHED);
             else Sound().Play(SND.effect.TOUCH_UNLATCHED);
@@ -2401,21 +2386,6 @@ public class MAIN extends WpadScreen {
                     }
                 }
                 retAll = KnxApi.SetEntireLivlight((byte)4, onoff, dimming, new byte[]{0X00, 0X00, 0X00, 0X00});
-                /*
-
-                for (int i = 0; i < 4; i++) {
-                    if (mDimming[(floor * 2 - 1)][i] == 0) {
-                        dimming = 0;
-                        onoff = 2;
-                    } else {
-                        dimming = mDimming[(floor * 2 - 1)][i];
-                        onoff = nOnOff;
-                    }
-                    //ret = KnxApi.SetLightDimming((byte) i, (byte) dimming, (byte) onoff);
-                    retAll = retAll + ret;
-                }
-
-                 */
             }
             if (retAll >= 0) Sound().Play(SND.effect.TOUCH_LATCHED);
             else Sound().Play(SND.effect.TOUCH_UNLATCHED);
@@ -2447,20 +2417,6 @@ public class MAIN extends WpadScreen {
                     }
                 }
                 retAll = KnxApi.SetEntireLivlight((byte)4, onoff, dimming, new byte[]{0X00, 0X00, 0X00, 0X00});
-/*
-                for (int i = 0; i < 4; i++) {
-                    if (mDimming[(floor * 3 - 1)][i] == 0) {
-                        dimming = 0;
-                        onoff = 2;
-                    } else {
-                        dimming = mDimming[(floor * 3 - 1)][i];
-                        onoff = nOnOff;
-                    }
-                    //ret = KnxApi.SetLightDimming((byte) i, (byte) dimming, (byte) onoff);
-                    retAll = retAll + ret;
-                }
-
- */
             }
             if (retAll >= 0) Sound().Play(SND.effect.TOUCH_LATCHED);
             else Sound().Play(SND.effect.TOUCH_UNLATCHED);
@@ -2989,23 +2945,17 @@ public class MAIN extends WpadScreen {
         try {
             if (DEVICE_OPERATION_MODE == Common.MODE_NOMAL) {
                 int floor = MainActivity.ho;
-                int ret = -1;
-                int retAll = 0;
-                int dimming = 0;
-                int onoff = 1;
                 for (int i = 0; i < 4; i++) {
                     if(!mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.OnOff) {
                         bSceneDay = false;
                         BTN_LIGHT_SCENE_DAY.setButtonFrontImage();
                         Log.w(TAG, "[updateLightSceneBTN] day onoff fail");
-
                         break;
                     }
                     if (mDimming[(floor - 1)][i] != mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.Dimming) {
                         bSceneDay = false;
                         BTN_LIGHT_SCENE_DAY.setButtonFrontImage();
                         Log.w(TAG, "[updateLightSceneBTN] day fail");
-
                         break;
                     }
                     if(i==3){
@@ -3017,14 +2967,12 @@ public class MAIN extends WpadScreen {
                         bSceneEvening = false;
                         BTN_LIGHT_SCENE_EVENING.setButtonFrontImage();
                         Log.w(TAG, "[updateLightSceneBTN] evening onoff fail");
-
                         break;
                     }
                     if (mDimming[(floor - 1)+3][i] != mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.Dimming) {
                         bSceneEvening = false;
                         BTN_LIGHT_SCENE_EVENING.setButtonFrontImage();
                         Log.w(TAG, "[updateLightSceneBTN] evening fail");
-
                         break;
                     }
                     if(i==3){