Ver código fonte

- 장치 리스트 옵션버튼 작업

KaRam Kim 8 anos atrás
pai
commit
03be8e0cff

+ 24 - 13
OneCable/Classes/ViewControllers/ThingsScreens/ThingsViewController.m

@@ -844,11 +844,7 @@
     
     [_deviceReOrderList removeObjectAtIndex:atIndexPath.item];
     [_deviceReOrderList insertObject:device atIndex:toIndexPath.item];
-//
-//    [_collectionView reloadData];
-//    UIImage *image = [_photosArray objectAtIndex:fromIndexPath.item];
-//    [_photosArray removeObjectAtIndex:fromIndexPath.item];
-//    [_photosArray insertObject:image atIndex:toIndexPath.item];
+
 }
 
 #pragma mark - UI Events
@@ -876,7 +872,7 @@
     [[JDFacade facade] confirmTitle:@"알림" message:@"장치 목록의 순서를\n장치가 등록된 순으로 초괴화합니다." btnOKLabel:@"확인" btnCancelLabel:@"취소" completion:^(CustomAlertView *alertView, NSInteger buttonIndex) {
         if (buttonIndex == 0) {
             // TODO : 서버에서 장치 목록 순서 다시 가져오기
-            [self enterReOrderMode:NO];
+            [self toggleReOrderMode:NO];
         }
     }];
 }
@@ -886,24 +882,24 @@
         if (buttonIndex == 0) {
             // TODO : 데이터 업데이트 하기
             _deviceList = [[NSMutableArray alloc] initWithArray:_deviceReOrderList];
-            [self enterReOrderMode:NO];
+            [self toggleReOrderMode:NO];
         }
     }];
     
 //    _deviceList = _deviceReOrderList;
-//    [self enterReOrderMode:NO];
+//    [self toggleReOrderMode:NO];
 }
 
 - (IBAction)btnCloseTouched:(id)sender {
     [[JDFacade facade] confirmTitle:@"알림" message:@"장치 목록 순서를 저장하지 않고\n이전화면으로 이동합니다." btnOKLabel:@"확인" btnCancelLabel:@"취소" completion:^(CustomAlertView *alertView, NSInteger buttonIndex) {
         if (buttonIndex == 0) {
-            [self enterReOrderMode:NO];
+            [self toggleReOrderMode:NO];
         }
     }];
-//    [self enterReOrderMode:NO];
+//    [self toggleReOrderMode:NO];
 }
 
--(void)enterReOrderMode:(Boolean)isReOrder
+-(void)toggleReOrderMode:(Boolean)isReOrder
 {
     _isReOrderMode = isReOrder;
     _viewEditMode.hidden = !isReOrder;
@@ -916,6 +912,20 @@
     _lblEditMode.text = @"장치 목록 순서 편집";
 }
 
+-(void)toggleEditMode:(Boolean)isEdit
+{
+    _isDeleteMode = isEdit;
+    _viewEditMode.hidden = !isEdit;
+    _btnOption.hidden = isEdit;
+    [_collectionView reloadData];
+    
+    _viewTitle.hidden = isEdit;
+    _lblEditMode.hidden = !isEdit;
+    
+    _lblEditMode.text = @"장치 삭제";
+    
+}
+
 #pragma mark - SocketService
 - (void) socketDidReceiveMessage:(id)message info:(NSDictionary *)info
 {
@@ -957,17 +967,18 @@
     switch (tag) {
         case ReOrder:
         {
-            [self enterReOrderMode:YES];
+            [self toggleReOrderMode:YES];
         }
             break;
         case Add:
         {
-            // TODO : 장치 추가 화면 듸우기
+            [self addNewDevice];
         }
             break;
         case Del:
         {
             // TODO : 장치 삭제 모드로 진입
+            [self toggleEditMode:YES];
         }
             break;
         case Refresh: