|
@@ -94,13 +94,13 @@ public class MAIN extends WpadScreen {
|
|
|
// IHN-1010 (대외 고급형 월패드)
|
|
|
WpadImageView BTN_LIGHT_PRESET_01_DIMMING, BTN_LIGHT_PRESET_02_DIMMING, BTN_LIGHT_PRESET_03_DIMMING, BTN_LIGHT_PRESET_04_DIMMING;
|
|
|
// IHN-1010GL (현산 AC 조명)
|
|
|
- private WpadImageView [] BTN_HDCLIVINGLIGHT = new WpadImageView[5];
|
|
|
+ private WpadImageView [] BTN_HDCLIVINGLIGHT = new WpadImageView[6];
|
|
|
int[] img_hdclight_normal = new int []
|
|
|
- { R.drawable.btn_main_hdclivinglight_l1_normal, R.drawable.btn_main_hdclivinglight_l2_normal, R.drawable.btn_main_hdclivinglight_l3_normal, R.drawable.btn_main_hdclivinglight_l4_normal, R.drawable.btn_main_hdclivinglight_l5_normal };
|
|
|
+ { R.drawable.btn_main_hdclivinglight_l1_normal, R.drawable.btn_main_hdclivinglight_l2_normal, R.drawable.btn_main_hdclivinglight_l3_normal, R.drawable.btn_main_hdclivinglight_l4_normal, R.drawable.btn_main_hdclivinglight_l5_normal, R.drawable.btn_main_hdclivinglight_l5_normal };
|
|
|
int[] img_hdclight_pressed = new int []
|
|
|
- { R.drawable.btn_main_hdclivinglight_l1_pressed, R.drawable.btn_main_hdclivinglight_l2_pressed, R.drawable.btn_main_hdclivinglight_l3_pressed, R.drawable.btn_main_hdclivinglight_l4_pressed, R.drawable.btn_main_hdclivinglight_l5_pressed };
|
|
|
+ { R.drawable.btn_main_hdclivinglight_l1_pressed, R.drawable.btn_main_hdclivinglight_l2_pressed, R.drawable.btn_main_hdclivinglight_l3_pressed, R.drawable.btn_main_hdclivinglight_l4_pressed, R.drawable.btn_main_hdclivinglight_l5_pressed, R.drawable.btn_main_hdclivinglight_l5_pressed };
|
|
|
int[] img_hdclight_selected = new int []
|
|
|
- { R.drawable.btn_main_hdclivinglight_l1_selected, R.drawable.btn_main_hdclivinglight_l2_selected, R.drawable.btn_main_hdclivinglight_l3_selected, R.drawable.btn_main_hdclivinglight_l4_selected, R.drawable.btn_main_hdclivinglight_l5_selected };
|
|
|
+ { R.drawable.btn_main_hdclivinglight_l1_selected, R.drawable.btn_main_hdclivinglight_l2_selected, R.drawable.btn_main_hdclivinglight_l3_selected, R.drawable.btn_main_hdclivinglight_l4_selected, R.drawable.btn_main_hdclivinglight_l5_selected, R.drawable.btn_main_hdclivinglight_l5_selected };
|
|
|
|
|
|
IconManager mIconManager;
|
|
|
IconInfoTable mIconInfoTable;
|
|
@@ -615,7 +615,7 @@ public class MAIN extends WpadScreen {
|
|
|
Log.v(TAG, "[onTouchEvent] ID.SCREENS.MANUAL_MAIN.ELEMENTS.BTNS.LIGHT_PRESET_04_DIMMING");
|
|
|
setDimmingLightCtrlPreset(4);
|
|
|
}
|
|
|
- else if (ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_HDCLIVING_01 <= nTargetID && nTargetID <= ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_HDCLIVING_05) {
|
|
|
+ else if (ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_HDCLIVING_01 <= nTargetID && nTargetID <= ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_HDCLIVING_06) {
|
|
|
Log.v(TAG, "[onTouchEvent] ID.SCREENS.MANUAL_MAIN.ELEMENTS.BTNS.LIGHT_HDCLIVING");
|
|
|
ctrlHDCLivingLight((nTargetID - ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_HDCLIVING_01) + 1);
|
|
|
|
|
@@ -1745,6 +1745,10 @@ public class MAIN extends WpadScreen {
|
|
|
position.setPosition(298, 521, 68, 68);
|
|
|
return position;
|
|
|
|
|
|
+ case ID.SCREENS.MAIN.ELEMENTS.BTNS.LIGHT_HDCLIVING_06:
|
|
|
+ position.setPosition(372, 521, 68, 68);
|
|
|
+ return position;
|
|
|
+
|
|
|
case ID.SCREENS.MAIN.ELEMENTS.BTNS.CALENDAR:
|
|
|
position.setPosition(35, 194, 232, 50);
|
|
|
return position;
|