07.11 commit test

OneCable/Classes/ViewControllers/RuelsScreens/RulesAddViewController.m

@@ -351,7 +351,7 @@
 - (void)requestRegisterRule {
     
     NSLog(@"requestRegisterRule");
-    NSArray *triggers       = [self items:_triggers];
+    NSArray *triggers       = nil;//[self items:_triggers];
     
     NSLog(@"triggers");
     NSArray *actions        = [self items:_actions];
@@ -562,10 +562,9 @@
     }
     else if ([itemSubTypeCode isEqualToString:ksItemSubTypeCodeAppPush]) {//푸시일 경우,
         //at once.
-        NSLog(@"subItems : %@", subItems);
+        
         for (ItemSubModel *subItem in subItems) {
             
-            NSLog(@"subItem : %@", subItem);
             NSDictionary *rSubItem = @{@"condition_type_code": subItem.conditionTypeCode,
                                        @"cmdcls_value": subItem.cmdclsValue};
             
@@ -574,6 +573,7 @@
         
     }
     else if ([itemSubTypeCode isEqualToString:ksItemSubTypeCodeTimer]) {//타이머일 경우,
+        
         for (ItemSubModel *subItem in subItems) {
             NSDictionary *rSubItem = @{@"hour": subItem.hour,
                                        @"minute": subItem.minute,
@@ -583,6 +583,7 @@
         }
     }
     else if ([itemSubTypeCode isEqualToString:ksItemSubTypeCodeDaylight]) {//해뜰때/질때 일 경우,
+        
         for (ItemSubModel *subItem in subItems) {
             NSDictionary *rSubItem = @{@"source_id": subItem.sourceId,
                                        @"source_sub_id": subItem.sourceSubId,
@@ -592,6 +593,7 @@
         }
     }
     else if ([itemSubTypeCode isEqualToString:ksItemSubTypeCodeHeat]) {//온도
+        
         for (ItemSubModel *subItem in subItems) {
             NSDictionary *rSubItem = @{@"source_id": subItem.sourceId,
                                        @"condition_type_code": subItem.conditionTypeCode,
@@ -1691,7 +1693,9 @@
                     [self requestModifyRule];
                 }
             }];
-        } else {
+        }
+        else {
+            
             [self requestModifyRule];
         }
     }
@@ -1701,7 +1705,9 @@
 - (void)getRidOfDeleteDevices:(ItemModel *)deviceItem {
     
     [deviceItem.subItems enumerateObjectsUsingBlock:^(ItemSubModel *subItem, NSUInteger idx, BOOL * _Nonnull stop) {
+        
         if (subItem.deleteYn) {
+            
             if ([_triggers containsObject:deviceItem]) {
                 [_triggers removeObject:deviceItem];
                 return;

OneCable/Classes/ViewControllers/ThingsScreens/ThingsViewController.m

@@ -195,7 +195,7 @@
     [_imgvLogo sd_setImageWithURL:[NSURL URLWithString:[JDFacade facade].loginUser.msoImageUrl] placeholderImage:nil options:SDWebImageRefreshCached];
     
     _imgvLogo.contentMode = UIViewContentModeScaleAspectFit;
-
+    _imgvLogo.hidden = YES;
     [self viewOfflineSetDeviceModel:_selectHub];
     
     [_btnClose setHidden:YES];
@@ -1090,7 +1090,7 @@
             //            cell.btnDevice.enabled = YES;
             cell.btnDeviceControl.hidden = NO;
             _btnOption.hidden = NO;
-            _imgvLogo.hidden = NO;
+            _imgvLogo.hidden = YES;
         }
         
         
@@ -1414,7 +1414,7 @@
 
 -(void)toggleReOrderMode:(Boolean)isReOrder
 {
-    _imgvLogo.hidden = !isReOrder;
+//    _imgvLogo.hidden = !isReOrder;
     _isReOrderMode = isReOrder;
     _viewEditMode.hidden = !isReOrder;
     _btnOption.hidden = isReOrder;
@@ -1428,7 +1428,7 @@
 
 -(void)toggleEditMode:(Boolean)isEdit
 {
-    _imgvLogo.hidden = !isEdit;
+//    _imgvLogo.hidden = !isEdit;
     _isDeleteMode = isEdit;
     _viewEditMode.hidden = !isEdit;
     _btnOption.hidden = isEdit;