Sfoglia il codice sorgente

조명 scene 수정
app_version : 2022.05.09.05

jslee(madeinlab) 2 anni fa
parent
commit
83baead2b2

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

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

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

@@ -2392,11 +2392,11 @@ public class MAIN extends WpadScreen {
 
             if (mKnxData.ControlType == false) {
                 for (int i = 0; i < 4; i++) {
-                    if (mDimming[(floor*2 - 1)][i] == 0) {
+                    if (mDimming[(floor - 1)+3][i] == 0) {
                         onoff[i] = 2;
                         dimming[i] = 0;
                     } else {
-                        dimming[i] = (byte) mDimming[(floor*2 - 1)][i];
+                        dimming[i] = (byte) mDimming[(floor - 1)+3][i];
                         onoff[i] = (byte) nOnOff;
                     }
                 }
@@ -2438,11 +2438,11 @@ public class MAIN extends WpadScreen {
 
             if (mKnxData.ControlType == false) {
                 for (int i = 0; i < 4; i++) {
-                    if (mDimming[(floor*3 - 1)][i] == 0) {
+                    if (mDimming[(floor - 1)+6][i] == 0) {
                         onoff[i] = 2;
                         dimming[i] = 0;
                     } else {
-                        dimming[i] = (byte) mDimming[(floor*3 - 1)][i];
+                        dimming[i] = (byte) mDimming[(floor - 1+6)][i];
                         onoff[i] = (byte) nOnOff;
                     }
                 }
@@ -3020,7 +3020,7 @@ public class MAIN extends WpadScreen {
 
                         break;
                     }
-                    if (mDimming[(floor*2 - 1)][i] != mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.Dimming) {
+                    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");
@@ -3032,7 +3032,7 @@ public class MAIN extends WpadScreen {
                     }
                 }
                 for (int i = 0; i < 4; i++) {
-                    if (mDimming[(floor*3 - 1)][i] == 0) {
+                    if (mDimming[(floor - 1)+6][i] == 0) {
                         if(mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.OnOff) {
                             bSceneRelaxing = false;
                             BTN_LIGHT_SCENE_RELAXING.setButtonFrontImage();
@@ -3042,7 +3042,7 @@ public class MAIN extends WpadScreen {
                         }
                     }
                     else if (!mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.OnOff||
-                            mDimming[(floor*3 - 1)][i] != mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.Dimming) {
+                            mDimming[(floor - 1)+6][i] != mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.Dimming) {
                         bSceneRelaxing = false;
                         BTN_LIGHT_SCENE_RELAXING.setButtonFrontImage();
                         Log.w(TAG, "[updateLightSceneBTN] relaxing dimming fail");