|
@@ -1188,6 +1188,7 @@ public class MainActivity extends WpadActivity {
|
|
|
int index = TargetId - ID.main.button.MULTI1;
|
|
|
for(int i = 0; i< MultiBtn.length; i++){
|
|
|
MultiBtn[i].setButtonFrontImage();
|
|
|
+ MultiBtn[i].setButtonEventOffDisable();
|
|
|
}
|
|
|
MultiBtn[index].setButtonRearImage();
|
|
|
|
|
@@ -1198,7 +1199,13 @@ public class MainActivity extends WpadActivity {
|
|
|
} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.Heating_V2 || mCurrentScreenId == API_Menu.SubMenuCtrl.Heating_V1) {
|
|
|
setChangeScreen(API_Menu.SubMenuCtrl.Heating_V2, false);
|
|
|
} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.Gas) {
|
|
|
- setChangeScreen(API_Menu.SubMenuCtrl.Gas, false);
|
|
|
+ if(ho==2){
|
|
|
+ setChangeScreen(API_Menu.SubMenuCtrl.Gas, false);
|
|
|
+ }else{
|
|
|
+ StartMultiControl(ID.screen.GasTestScreen, 2);
|
|
|
+ }
|
|
|
+ //setChangeScreen(API_Menu.SubMenuCtrl.Gas, false);
|
|
|
+
|
|
|
} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.SystemAircon) {
|
|
|
setChangeScreen(API_Menu.SubMenuCtrl.SystemAircon, false);
|
|
|
} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.ChangAir_Normal) {
|
|
@@ -1213,7 +1220,10 @@ public class MainActivity extends WpadActivity {
|
|
|
} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.Heating_V2 || mCurrentScreenId == API_Menu.SubMenuCtrl.Heating_V1) {
|
|
|
StartMultiControl(ID.screen.HeatingV2TestScreen, index+1);
|
|
|
} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.Gas) {
|
|
|
- StartMultiControl(ID.screen.GasTestScreen, index+1);
|
|
|
+ MultiBtn[0].setButtonEventOffEnable(R.drawable.tab_floor_1_disabled);
|
|
|
+ MultiBtn[2].setButtonEventOffEnable(R.drawable.tab_floor_3_disabled);
|
|
|
+ //다른층은 2층으로 연동시킨다.
|
|
|
+ StartMultiControl(ID.screen.GasTestScreen, 2);
|
|
|
} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.SystemAircon) {
|
|
|
StartMultiControl(ID.screen.KnxSystemAirconMainTestScreen, index+1);
|
|
|
//StartMultiControl(ID.screen.SystemAirconTest1Screen, index+1);
|
|
@@ -1710,7 +1720,7 @@ public class MainActivity extends WpadActivity {
|
|
|
setAIRBackBtnVisible(false);
|
|
|
setKccDimmBtnVisible(false);
|
|
|
setVentilBackBtnVisible(false);
|
|
|
- setMultiBtnVisible(true);
|
|
|
+ setGasMultiBtnVisible(true);
|
|
|
result = true;
|
|
|
break;
|
|
|
|
|
@@ -3102,6 +3112,7 @@ public class MainActivity extends WpadActivity {
|
|
|
MultiBtn[i].setVisibility(View.VISIBLE);
|
|
|
MultiBtn[i].bringToFront();
|
|
|
MultiBtn[i].setButtonFrontImage();
|
|
|
+ MultiBtn[i].setButtonEventOffDisable();
|
|
|
} else {
|
|
|
if (MultiBtn[i].getVisibility() != View.INVISIBLE)
|
|
|
MultiBtn[i].setVisibility(View.INVISIBLE);
|
|
@@ -3116,6 +3127,29 @@ public class MainActivity extends WpadActivity {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 멀티 가스 제어 층 버튼 활성화 & 비활성화
|
|
|
+ *
|
|
|
+ * @param Enabled - true : 활성화, false : 비활성화
|
|
|
+ * @return (boolean) true : 성공, false : 실패
|
|
|
+ */
|
|
|
+ public void setGasMultiBtnVisible(boolean Enabled) {
|
|
|
+ for (int i = 0; i < MultiBtn.length; i++) {
|
|
|
+ if (Enabled == true) {
|
|
|
+ if (MultiBtn[i].getVisibility() != View.VISIBLE)
|
|
|
+ MultiBtn[i].setVisibility(View.VISIBLE);
|
|
|
+ MultiBtn[i].bringToFront();
|
|
|
+ MultiBtn[i].setButtonFrontImage();
|
|
|
+ } else {
|
|
|
+ if (MultiBtn[i].getVisibility() != View.INVISIBLE)
|
|
|
+ MultiBtn[i].setVisibility(View.INVISIBLE);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ MultiBtn[1].setButtonRearImage();
|
|
|
+ MultiBtn[0].setButtonEventOffEnable(R.drawable.tab_floor_1_disabled);
|
|
|
+ MultiBtn[2].setButtonEventOffEnable(R.drawable.tab_floor_3_disabled);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 상단 KCC디밍조절 버튼 활성화 & 비활성화
|
|
|
*
|