|
@@ -96,7 +96,8 @@ public class CallSubMenuScreen {
|
|
|
}
|
|
|
}
|
|
|
else if (Version.getModelType() == MODEL_TYPE.IHN_1010GL || Version.getModelType() == MODEL_TYPE.IHN_1010GL_I) {
|
|
|
- LampID = ID.LINKEDSCREEN.SubMenuCtrl.OutSide_EachLamp;
|
|
|
+ //LampID = ID.LINKEDSCREEN.SubMenuCtrl.OutSide_EachLamp;
|
|
|
+ LampID = ID.LINKEDSCREEN.SubMenuCtrl.HDCLivingNEach_Lamp;
|
|
|
}
|
|
|
else {
|
|
|
if (GetZeroEnergyHouseInfo() == true) {
|
|
@@ -842,10 +843,10 @@ public class CallSubMenuScreen {
|
|
|
makeHomeCtrlMenuList();
|
|
|
}
|
|
|
|
|
|
- if (nScreenID >= ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp && nScreenID <= ID.LINKEDSCREEN.SubMenuCtrl.OutSide_EachLamp) {
|
|
|
+ if (nScreenID >= ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp && nScreenID <= ID.LINKEDSCREEN.SubMenuCtrl.HDCLivingNEach_Lamp) {
|
|
|
Log.d(TAG, "[callStartHomeCtrlAPK] ===== 1 =====");
|
|
|
for (int i = 0; i < m_HomeCtrlMenuList.length; i++) Log.d(TAG, "[callStartHomeCtrlAPK] m_HomeCtrlMenuList[" + i + "] = " +m_HomeCtrlMenuList[i]);
|
|
|
- int findIdx = findSubMenuListIdx(ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp, ID.LINKEDSCREEN.SubMenuCtrl.OutSide_EachLamp);
|
|
|
+ int findIdx = findSubMenuListIdx(ID.LINKEDSCREEN.SubMenuCtrl.HDC_LivingLamp, ID.LINKEDSCREEN.SubMenuCtrl.HDCLivingNEach_Lamp);
|
|
|
Log.d(TAG, "[callStartHomeCtrlAPK] findIdx [" + findIdx + "]");
|
|
|
Log.d(TAG, "[callStartHomeCtrlAPK] ===== 2 =====");
|
|
|
if (findIdx >= 0) {
|