Ver código fonte

에너지쪽 메뉴명 변경, 1010 비밀번호 변경 제거, 쿡탑 모바일 연동 제거.

jslee(madeinlab) 3 anos atrás
pai
commit
6c4729488e

BIN
WallPadMain/libs/WallPadAPI.jar


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

@@ -1615,7 +1615,7 @@ public final class ID {
 
             ENERGY_ENERGYMETER(MENU_ENERGY + 1, "에너지미터", "Energy meter"),
             ENERGY_REMOTEMETER(MENU_ENERGY + 2, "전기 에너지\n현황", "Remote meter"),
-            ENERGY_ENERGYCONSUMPTION(MENU_ENERGY + 3, "에너지\n사용량", "Energy\nconsumption"),
+            ENERGY_ENERGYCONSUMPTION(MENU_ENERGY + 3, "에너지\n생산량", "Energy\nconsumption"),
             ENERGY_ENERGYCOSTTABLE(MENU_ENERGY + 4, "에너지\n요금제", "Cost table"),
             ENERGY_SMARTPANEL(MENU_ENERGY + 5, "스마트\n분전반", "Smart Panel"),   // Distribution Panel Board
             ENERGY_SMARTLIGHT(MENU_ENERGY + 6, "스마트 조명", "Smart Light"),

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

@@ -614,10 +614,11 @@ public class IconManager {
             mIconInfoTable.addIconInfo(ID.ICONS.MENUS.SETTING_CLREANSCREEN.getID(), ID.ICONS.MENUS.SETTING_CLREANSCREEN.getNameKR(), ID.LINKEDSCREEN.SubMenuConfig.CleanLcd,
                     R.drawable.icon_setting_screenclean_normal, R.drawable.icon_setting_screenclean_pressed, R.drawable.icon_setting_screenclean_pressed, R.drawable.icon_setting_screenclean_pressed);
 
-            // 비밀번호 변경
-            mIconInfoTable.addIconInfo(ID.ICONS.MENUS.SETTING_PWCHANGE.getID(), ID.ICONS.MENUS.SETTING_PWCHANGE.getNameKR(), ID.LINKEDSCREEN.SubMenuConfig.PassWordChange,
-                    R.drawable.icon_setting_pw_normal, R.drawable.icon_setting_pw_pressed, R.drawable.icon_setting_pw_pressed, R.drawable.icon_setting_pw_pressed);
-
+            if (Version.getModelType() != Version.MODEL_TYPE.IHN_1010_I_LX2) {
+                // 비밀번호 변경
+                mIconInfoTable.addIconInfo(ID.ICONS.MENUS.SETTING_PWCHANGE.getID(), ID.ICONS.MENUS.SETTING_PWCHANGE.getNameKR(), ID.LINKEDSCREEN.SubMenuConfig.PassWordChange,
+                        R.drawable.icon_setting_pw_normal, R.drawable.icon_setting_pw_pressed, R.drawable.icon_setting_pw_pressed, R.drawable.icon_setting_pw_pressed);
+            }
             // 모닝콜
             //mIconInfoTable.addIconInfo(ID.ICONS.MENUS.SETTING_MORNINGCALL.getID(), ID.ICONS.MENUS.SETTING_MORNINGCALL.getNameKR(), ID.LINKEDSCREEN.SubMenuConfig.MoningCall,
             //        R.drawable.icon_setting_morningcall_normal, R.drawable.icon_setting_morningcall_pressed, R.drawable.icon_setting_morningcall_pressed, R.drawable.icon_setting_morningcall_pressed);
@@ -1886,7 +1887,7 @@ public class IconManager {
                 mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ENERGY_REMOTEMETER.getID(), ID.ICONS.MENUS.ENERGY_REMOTEMETER.getNameKR(), ID.LINKEDSCREEN.SubMenuEnergy.RemoteMeter,
                         R.drawable.gooddesign2020_icon_energy_remotemeter_normal, R.drawable.gooddesign2020_icon_energy_remotemeter_pressed, R.drawable.gooddesign2020_icon_energy_remotemeter_pressed, R.drawable.gooddesign2020_icon_energy_remotemeter_pressed);
 
-                // 에너지 사용량 (원격검침이 사용되면 에너지 사용량 아이콘도 함께 사용한다)
+                // 에너지 사용량 -> 에너지 생산량 (원격검침이 사용되면 에너지 생산량 아이콘도 함께 사용한다)
                 mIconInfoTable.addIconInfo(ID.ICONS.MENUS.ENERGY_ENERGYCONSUMPTION.getID(), ID.ICONS.MENUS.ENERGY_ENERGYCONSUMPTION.getNameKR(), ID.LINKEDSCREEN.SubMenuEnergy.EnergyMgr,
                         R.drawable.icon_energy_consumption_normal, R.drawable.icon_energy_consumption_pressed, R.drawable.icon_energy_consumption_pressed, R.drawable.icon_energy_consumption_pressed);
             }

+ 12 - 6
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/iMapServer.java

@@ -5569,20 +5569,26 @@ public class iMapServer extends Service {
                         }
                     } else if (mWallPadAPI.GetGasKind() == 2) {
                         // 하이브리드 쿡탑
+                        // 쿡탑 최대로 연동 안됨
+                        strResult += "         <devinfo name=\"gas\" value=\"0\" order=\"1\" floor=\"" + ho + "\"/>\r\n";
+                        strResult += "         <devinfo name=\"cooktop\" value=\"0\" order=\"1\" floor=\"" + ho + "\"/>\r\n";
+                        /*
                         if (mCooktopAPI != null) {
+                            int ret = mCooktopAPI.Refresh((byte) 0xFF, false);
                             int nGas = 0;
                             int nOutlet = 0;
-                            for (int j = 0; j < mCooktopAPI.data.DeviceCnt; j++) {
-                                for (int k = 0; k < mCooktopAPI.data.DeviceCnt; k++) {
-                                    if (mCooktopAPI.data.Device[j].circuit[i].hType == DataClasses.CooktopCtrl.DEVICE_TYPE.GASVALVE)
+                            if (ret >= 0) {
+                                for (int k = 0; k < mCooktopAPI.data.Device[0].circuit.length; k++) {
+                                    if (mCooktopAPI.data.Device[0].circuit[k].hType == DataClasses.CooktopCtrl.DEVICE_TYPE.GASVALVE)
                                         nGas++;
-                                    else if (mCooktopAPI.data.Device[j].circuit[i].hType == DataClasses.CooktopCtrl.DEVICE_TYPE.OUTLET)
+                                    else if (mCooktopAPI.data.Device[0].circuit[k].hType == DataClasses.CooktopCtrl.DEVICE_TYPE.OUTLET)
                                         nOutlet++;
                                 }
+                                strResult += "         <devinfo name=\"gas\" value=\"" + nGas + "\" order=\"1\" floor=\"" + ho + "\"/>\r\n";
+                                strResult += "         <devinfo name=\"cooktop\" value=\"" + nOutlet + "\" order=\"1\" floor=\"" + ho + "\"/>\r\n";
                             }
-                            strResult += "         <devinfo name=\"gas\" value=\"" + nGas + "\" order=\"1\" floor=\"" + ho + "\"/>\r\n";
-                            strResult += "         <devinfo name=\"cooktop\" value=\"" + nOutlet + "\" order=\"1\" floor=\"" + ho + "\"/>\r\n";
                         }
+                         */
                     } else {
                         strResult += "         <devinfo name=\"gas\" value=\"0\" order=\"1\" floor=\"" + ho + "\"/>\r\n";
                         strResult += "         <devinfo name=\"cooktop\" value=\"0\" order=\"1\" floor=\"" + ho + "\"/>\r\n";