Parcourir la source

[ManagerSetting]
1. 관리자 점검
- 현산향일체형조명일괄소ㅡ일괄소등병합형_에너지미터 -> 6회로 + 에너지 미터 추가

jglee il y a 2 ans
Parent
commit
f5be99718e

+ 8 - 1
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/CheckControllerFragment.java

@@ -375,7 +375,7 @@ public class CheckControllerFragment extends Fragment {
                         strType = "조명 - "+Const.LIGHT_CONTROLLER_TYPE_HDC_INTLIGHT_ADD_BATCHLIGHT;
                         strType = "조명 - "+Const.LIGHT_CONTROLLER_TYPE_HDC_INTLIGHT_ADD_BATCHLIGHT;
                     }
                     }
                     else if (Const.LIGHT_CONTROLLER_TYPE_HDC_INTLIGHT_ADD_BATCHLIGHT_MULTISWITCH.equals(strType)) {
                     else if (Const.LIGHT_CONTROLLER_TYPE_HDC_INTLIGHT_ADD_BATCHLIGHT_MULTISWITCH.equals(strType)) {
-                        lightType = 4;
+                        lightType = 5;
                         strType = "조명 - "+Const.LIGHT_CONTROLLER_TYPE_HDC_INTLIGHT_ADD_BATCHLIGHT_MULTISWITCH;
                         strType = "조명 - "+Const.LIGHT_CONTROLLER_TYPE_HDC_INTLIGHT_ADD_BATCHLIGHT_MULTISWITCH;
                     }
                     }
                 }
                 }
@@ -387,6 +387,7 @@ public class CheckControllerFragment extends Fragment {
                 case 1: // 대외 기본형
                 case 1: // 대외 기본형
                 case 3://현산향일체형조명기본형
                 case 3://현산향일체형조명기본형
                 case 4://현산향일체형일괄소등병합형
                 case 4://현산향일체형일괄소등병합형
+                case 5://현산향일체형조명일괄소등병합형_에너지미터
                 {
                 {
                     String lightControllerName = strType;
                     String lightControllerName = strType;
                     int type = Const.CONTROLLER_TYPE_LIGHT_LIVING_ROOM;
                     int type = Const.CONTROLLER_TYPE_LIGHT_LIVING_ROOM;
@@ -410,6 +411,11 @@ public class CheckControllerFragment extends Fragment {
 
 
                         mControllerList.add(listControllerVO2);
                         mControllerList.add(listControllerVO2);
                     }
                     }
+
+                    if(lightType == 5)
+                    {
+                        getIEnergyControllerList();
+                    }
                 }
                 }
                 break;
                 break;
 
 
@@ -1134,6 +1140,7 @@ public class CheckControllerFragment extends Fragment {
 
 
                     case 3://현산향일체형조명기본형
                     case 3://현산향일체형조명기본형
                     case 4://현산향일체형일괄소등병합형
                     case 4://현산향일체형일괄소등병합형
+                    case 5://현산향일체형조명일괄소등병합형_에너지미터
                         testAPI = mWallPadAPI.Get_IntLightController();
                         testAPI = mWallPadAPI.Get_IntLightController();
                         break;
                         break;