Browse Source

[WallPadMain]
1. App Ver. 갱신
- 2021.04.09.01
2. 화성 봉담 아이파크 현장 1차 버전

cwnam@hdc-icontrols.com 4 years ago
parent
commit
7252bf4061

+ 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="2021.04.06.10">
+    android:versionName="2021.04.09.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

+ 1 - 0
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/declare/ID.java

@@ -244,6 +244,7 @@ public final class ID {
                     public final static int LIGHT_HDCLIVING_03 = BASE + 240;
                     public final static int LIGHT_HDCLIVING_04 = BASE + 241;
                     public final static int LIGHT_HDCLIVING_05 = BASE + 242;
+                    public final static int LIGHT_HDCLIVING_06 = BASE + 243;
                 }
 
                 public final class TEXTS {

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

@@ -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;

+ 6 - 1
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/IconManager.java

@@ -302,7 +302,8 @@ public class IconManager {
                 if (Common.CurrentDistributionPanelType == Version.DISTRIBUTION_MODEL.KNX_DIST) {
                     mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIVINGLIGHT.getID(), ID.ICONS.MENUS.CTRL_LIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp,
                             R.drawable.icon_ctrl_light_normal, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed);
-                }else{
+                }
+                else {
                     mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIVINGLIGHT.getID(), ID.ICONS.MENUS.CTRL_LIVINGLIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp,
                             R.drawable.icon_ctrl_light_normal, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed);
                 }
@@ -325,6 +326,10 @@ public class IconManager {
                                     R.drawable.icon_ctrl_outlet_normal, R.drawable.icon_ctrl_outlet_pressed, R.drawable.icon_ctrl_outlet_pressed, R.drawable.icon_ctrl_outlet_pressed);
                         }
                     }
+                    else if (naLightEnable[1] == WallpadDeviceSet.LIGHT_TYPE_HDC_INTLIGHT_NORMAL) {
+                        mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIVINGLIGHT.getID(), ID.ICONS.MENUS.CTRL_LIVINGLIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp,
+                                R.drawable.icon_ctrl_light_normal, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed);
+                    }
                     else if (naLightEnable[1] == WallpadDeviceSet.LIGHT_TYPE_HDC_INTLIGHT_ADD_BATCHLIGHT) {
                         mIconInfoTable.addIconInfo(ID.ICONS.MENUS.CTRL_LIGHT.getID(), ID.ICONS.MENUS.CTRL_LIGHT.getNameKR(), ID.LINKEDSCREEN.SubMenuCtrl.OutSide_EachLamp,
                                 R.drawable.icon_ctrl_light_normal, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed, R.drawable.icon_ctrl_light_pressed);