- 장치 순서 변경 작업 완료

OneCable/Classes/CommonUI/CommandClassControlView.h

@@ -36,6 +36,7 @@ typedef void(^NodeCommandFailureBlock)(id error);
 @property (assign, nonatomic) BOOL isConditionMode;
 @property (assign, nonatomic) BOOL isConditionTypeMode;
 @property (assign, nonatomic) BOOL isMandatoryNode;
+@property (assign, nonatomic) BOOL isReOrderMode;
 
 + (CommandClassControlView *)viewForCommandClass:(CmdClsType)cmdClsType;
 - (void)requestNodeCommand:(NSDictionary *)parameters requestValue:(NSString *)requestValue completionHandler:(NodeCommandCompletionBlock)completion failureHandler:(NodeCommandFailureBlock)failure;

OneCable/Classes/CommonUI/CommandClassControlView.m

@@ -175,7 +175,8 @@
     _device.cmdclsValue = _isON ? _requestValueForOff : _requestValueForOn;
     _lblContentValueMsg.text = _device.contentValueMsg;
 
-
+    _btnSwitch.hidden = self.isReOrderMode;
+    
     [self setSwitchBinary];
 }
 
@@ -374,6 +375,8 @@
         [self.lblContentValueMsg setColor:kUITextColor02 text:self.lblContentValueMsg.text];
     }
     
+    _btnOpen.hidden = self.isReOrderMode;
+    
     [self setSwitchBinary];
 }
 

OneCable/Classes/Model/JDJSONModel.h

@@ -68,7 +68,6 @@
 @interface SocketModel : JDJSONModel
 
 @property (copy, nonatomic) NSString *messageType;
-@property (copy, nonatomic) NSString *resultMsg;
 @property (copy, nonatomic) NSString *requestId;
 @property (assign, nonatomic, readonly) BOOL isSuccess;
 

OneCable/Classes/Model/SocketMsgModel.h

@@ -33,3 +33,12 @@
 
 @end
 
+
+
+
+@interface SocketReponseModel : SocketModel
+@property (copy, nonatomic) NSDictionary *commandId;
+@property (copy, nonatomic) NSDictionary *commandStatus;
+@property (copy, nonatomic) NSDictionary *commandType;
+@end
+

OneCable/Classes/ViewControllers/ThingsScreens/ThingsViewController.m

@@ -498,6 +498,23 @@
 
 - (void)requestDeviceOrderChange {
     NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_PUT_NODE_ORDER_CHANGE aditional:nil];
+    NSMutableArray *nodeOrder = [NSMutableArray array];
+    
+    for (DeviceModel *info in _deviceReOrderList) {
+        NSDictionary *orderInfo  = @{
+                                     @"device_id": info.deviceId,
+                                     @"node_id": info.nodeId};
+        [nodeOrder addObject:orderInfo];
+    }
+    NSDictionary *parameter = @{@"nodes": nodeOrder};
+    [[RequestHandler handler] sendAsyncPutRequestAPIPath:path parameters:parameter modelClass:[JDJSONModel class] completion:^(id responseObject) {
+        NSLog(@"ReOrder Result : %@", responseObject);
+//        [self refreshDeviceList];
+    } failure:^(id errorObject) {
+        JDErrorModel *error = (JDErrorModel *)errorObject;
+        [[JDFacade facade] alert:error.errorMessage];
+    }];
+    
 }
 
 
@@ -676,14 +693,14 @@
             
             CommandClassControlView *controlView = [CommandClassControlView viewForCommandClass:device.cmdclsType];
             controlView.device = device;
-            NSLog(@"Device Info : %@", device);
+            controlView.isReOrderMode = _isReOrderMode;
             cell.controlContainer.hidden = !controlView;
             if (!cell.controlContainer.hidden) {
                 UIView *superview = cell.controlContainer;
                 [superview addSubview:controlView];
                 
 //                controlView.width = IS_IPHONE_6P ? 98.0f : 120;
-                NSLog(@"Controll View : %f", ViewWidth(superview));
+//                NSLog(@"Controll View : %f", ViewWidth(superview));
 //                controlView.width = ViewWidth(superview);
                 [controlView mas_makeConstraints:^(MASConstraintMaker *make) {
 //                    make.size.mas_equalTo(superview.frame.size);
@@ -956,6 +973,7 @@
         if (buttonIndex == 0) {
             // TODO : 데이터 업데이트 하기
             _deviceList = [[NSMutableArray alloc] initWithArray:_deviceReOrderList];
+            [self requestDeviceOrderChange];
             [self toggleReOrderMode:NO];
         }
     }];