- 장치 상세에서 장치 삭제 기능 추

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDetailViewController.h

@@ -28,6 +28,8 @@
 - (IBAction)btnOptionTouched:(id)sender;
 - (IBAction)btnCloseTouched:(id)sender;
 
+-(void)finishDeviveDelete;
+
 @end
 
 

OneCable/Classes/ViewControllers/ThingsScreens/ThingsDetailViewController.m

@@ -24,6 +24,8 @@
 #import "ModifyDeviceNamePopupView.h"
 #import "JYPullToRefreshController.h"
 
+#import "ThingsForcedDelViewController.h"
+#import "ThingsGeneralDelViewController.h"
 /**
  
  Hub 명 Text Color       : kUITextColor03
@@ -484,6 +486,24 @@
     }
 }
 
+-(void)deleteDevice
+{
+//    DeviceModel *device =_deviceList[indexPath.row];
+    
+    if ([_deviceDetail.onlineState isEquestToIgnoreCase:@"OFF"]) {
+        ThingsForcedDelViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"ThingsForcedDelViewController" storyboardName:@"Things"];
+        
+        vc.delDevice = _deviceDetail;
+        [self showTransparencyModalView:vc removeSelf:NO];
+        
+    } else {
+        ThingsGeneralDelViewController *vc = [CommonUtil instantiateViewControllerWithIdentifier:@"ThingsGeneralDelViewController" storyboardName:@"Things"];
+        
+        vc.delDevice = _deviceDetail;
+        [self showTransparencyModalView:vc removeSelf:NO];
+    }
+}
+
 #pragma mark - MoreButtonDelegate
 -(void)moreBtnAction:(id)sender
 {
@@ -559,6 +579,11 @@
 //    }
 }
 
+-(void)finishDeviveDelete
+{
+    [self btnCloseTouched:nil];
+}
+
 
 #pragma mark - MemoryWarning
 

OneCable/Classes/ViewControllers/ThingsScreens/ThingsForcedDelCompleteViewController.m

@@ -13,6 +13,7 @@
 
 #import "MainViewController.h"
 #import "ThingsViewController.h"
+#import "ThingsDetailViewController.h"
 
 @interface ThingsForcedDelCompleteViewController ()
 
@@ -64,6 +65,9 @@
         ThingsViewController *vc = [JDFacade facade].mainViewController.tvc;
         if (vc && [vc isKindOfClass:[ThingsViewController class]]) {
             [vc finishDeviveDelete];
+        } else {
+            ThingsDetailViewController *vc2 = (ThingsDetailViewController *)vc;
+            [vc2 finishDeviveDelete];
         }
     }];
 }

OneCable/Classes/ViewControllers/ThingsScreens/ThingsGeneralDelCompleteViewController.m

@@ -14,6 +14,7 @@
 #import "ThingsGeneralDelStartViewController.h"
 #import "MainViewController.h"
 #import "ThingsViewController.h"
+#import "ThingsDetailViewController.h"
 
 @interface ThingsGeneralDelCompleteViewController ()
 
@@ -99,6 +100,9 @@
         ThingsViewController *vc = [JDFacade facade].mainViewController.tvc;
         if (vc && [vc isKindOfClass:[ThingsViewController class]]) {
             [vc finishDeviveDelete];
+        }  else {
+            ThingsDetailViewController *vc2 = (ThingsDetailViewController *)vc;
+            [vc2 finishDeviveDelete];
         }
     }];
 }