Merge branch 'master' of ssh://61.40.220.21:/cable/git-repo/mobile/ios

OneCable/Classes/ViewControllers/MainScreens/MainViewController.m

@@ -101,9 +101,11 @@
 
 -(void)testSocket
 {
+    return;
+    
 //    [[SocketServiceHandler sharedManager] connect];
-    [[SocketServiceHandler sharedManager] connectServer];
-    [[SocketServiceHandler sharedManager] initWithDelegate:self];
+//    [[SocketServiceHandler sharedManager] connectServer];
+//    [[SocketServiceHandler sharedManager] initWithDelegate:self];
     
     
 }
@@ -216,14 +218,14 @@
         }
         
         DashboardModel *dashboard = (DashboardModel *) responseObject;
-        
+        NSLog(@"DashBoard Info : %@", responseObject);
         if (dashboard) {//API 성공 ,
             _dashboard = dashboard;
             
             if (!_isNotFirstLoading) {
                 _isNotFirstLoading = YES;
-                
-                [JDFacade facade].loginUser.homehubDeviceId = _dashboard.deviceId; //초대에서 넘어오는 경우,
+// FIXME : 이부분이 어떤 내용인지 파악해야 한다.
+//                [JDFacade facade].loginUser.homehubDeviceId = _dashboard.deviceId; //초대에서 넘어오는 경우,
                 
                 //when first loading this view.
                 [self initThingsViewController];
@@ -345,17 +347,17 @@
 #pragma mark - SocketServiceHandler delegate
 -(void)socketConnectComplete
 {
-    NSMutableDictionary *data = [[NSMutableDictionary alloc] init];
-    
-    data[@"message_type"] = @"auth";
-    data[@"member_id"] = @"100";
-    data[@"password"] = @"1234";
-    data[@"os_type"] = @"MA";
-    data[@"cust_id"] = @"1002";
-    data[@"ctrt_grp_id"] = @"1002";  
-    
-    
-    [[SocketServiceHandler sharedManager] sendData:data];
+//    NSMutableDictionary *data = [[NSMutableDictionary alloc] init];
+//    
+//    data[@"message_type"] = @"auth";
+//    data[@"member_id"] = @"100";
+//    data[@"password"] = @"1234";
+//    data[@"os_type"] = @"MA";
+//    data[@"cust_id"] = @"1002";
+//    data[@"ctrt_grp_id"] = @"1002";  
+//    
+//    
+//    [[SocketServiceHandler sharedManager] sendData:data];
 }
 
 #pragma mark - UI Control