- 장치 리스트 조회 / 리스트 출력작업

OneCable/Classes/Definitions.h

@@ -107,7 +107,7 @@ static NSString *kWebLinkServer = @"http://61.40.220.23:7794";      //운영
 #define API_POST_HOMEGROUP_MEMBER_INVITATIONS   @"/homegrp_members/invitations" //홈그룹 초대 수락/거절
 
 //20 - dashboard
-#define API_GET_DASHBOARD                   @"/customer/%@/group/%@/device/node"       //노드 목록 조회
+#define API_GET_DASHBOARD                   @"/customer/%@/group/%@/device"         //Device 목록 조회(홈허브 리스트)
 #define API_GET_DASHBOARD_MODE_LIST         @"/modes"                   //대시보드 모드 조회
 #define API_POST_DASHBOARD_MODE_CHANGE      @"/modes/%@/current_mode"   //대시보드 모드 변경
 #define API_GET_MODE_STATUS                 @"/modes/%@/status"         //홈모드 변경 결과 조회
@@ -127,7 +127,7 @@ static NSString *kWebLinkServer = @"http://61.40.220.23:7794";      //운영
 //#define API_POST_GROUP_DELETE   @"/groups/devices/%@"   //그룹 내 디바이스 삭제
 
 #define API_PARAM_PAGING        @"?paging_datetime=%@&paging_type=%@"
-#define API_GET_DEVICE_LIST     @"/customer/%@/group/%@/device"
+#define API_GET_DEVICE_LIST     @"/customer/%@/group/%@/device/%@/node"       //노드 목록 조회(장치목록)
 #define API_GET_DEVICE_DETAIL   @"/devices/%@"
 #define API_POST_NODE_COMMAND   @"/devices/%@/nodes/%@/commands"
 #define API_GET_DEVICE_ICONS    @"/devices/icons/%@"       //디바이스 아이콘

OneCable/Classes/ViewControllers/ThingsScreens/ThingsViewController.m

@@ -349,7 +349,7 @@
                                 @"paging_type": _pagingType ? _pagingType : ksEmptyString};
 
 //    NSString *path = [NSString stringWithFormat:API_GET_DEVICE_LIST];
-    NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_GET_DEVICE_LIST aditional:nil];
+    NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_GET_DEVICE_LIST aditional:@""];
 
     [[RequestHandler handler] sendAsyncRequestAPIPath:path method:ksHTTPRequestGET parameters:parameter
                                            modelClass:[DeviceListModel class] showLoadingView:showLoadingView completion:^(id responseObject) {
@@ -619,6 +619,40 @@
     [self toggleOptions:sender];
 }
 
+#pragma mark - SocketService
+- (void) socketDidReceiveMessage:(id)message info:(NSDictionary *)info
+{
+    SocketModel *result = (SocketModel *)message;
+    NSLog(@"Result Info : %@", result);
+    SWITCH(result.messageType)
+    {
+        
+        CASE (@"node.register")
+        {
+
+        }
+        CASE (@"node.delete")
+        {
+
+        }
+        CASE(@"nodes.reload")
+        {
+
+            
+        }
+        DEFAULT
+        {
+            break;
+        }
+    }
+}
+
+- (void) socketDidFailWithError:(NSError *)error {
+    [[JDFacade facade] loadIndicator:NO allowUserInteraction:YES];
+}
+
+
+
 #pragma mark - MemoryWarning
 
 - (void)viewWillDisappear:(BOOL)animated {