浏览代码

- 장치명 변경관련 수정

KaRam Kim 8 年之前
父节点
当前提交
6cad4381da

+ 2 - 0
OneCable/Classes/Definitions.h

@@ -148,6 +148,8 @@ static NSInteger kMaxTimeOut = 60;      //운영
 #define API_GET_DEVICE_DETAIL   @"/devices/%@"
 #define API_POST_NODE_COMMAND   @"/devices/%@/nodes/%@/commands"
 
+
+#define API_PUT_DEVICE_INFO     @"/customer/%@/group/%@/device"                 //Device/Node 속성 변경
 #define API_PUT_NODE_ORDER_RESET    @"/customer/%@/group/%@/device/seq/init"    //디바이스 노드 순서 초기화
 #define API_PUT_NODE_ORDER_CHANGE   @"/customer/%@/group/%@/device/seq"         //디바이스 노드 순서 변경
 

+ 8 - 8
OneCable/Classes/ViewControllers/ThingsScreens/ChangeDeviceNamePopupView.m

@@ -23,7 +23,7 @@
 @end
 
 @implementation ChangeDeviceNamePopupView
-@synthesize deviceDetailModel;
+
 
 - (id)initFromNib:(DeviceDetailModel*)detailModel{
 
@@ -36,13 +36,13 @@
             self.frame = [UIScreen mainScreen].bounds;
             self.lblTitle.text = NSLocalizedString(@"이름 변경", @"이름 변경");
 
-            NSString * prdName = [deviceDetailModel.prdName stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-            NSString * prdUserName = [deviceDetailModel.prdUserName stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+            NSString * prdName = [_deviceDetailModel.prdName stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+            NSString * prdUserName = [_deviceDetailModel.prdUserName stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
             
             if ([prdName isEqualToString: prdUserName] || [prdUserName isEqualToString:@""]) {
                 _txtInputDeviceName.placeholder = @"새로운 이름";
             } else {
-                _txtInputDeviceName.placeholder = deviceDetailModel.prdUserName;
+                _txtInputDeviceName.placeholder = _deviceDetailModel.prdUserName;
             }
             
             
@@ -86,11 +86,11 @@
 
 - (void) requestDeviceChangeName {
 
-    NSDictionary *parameter = @{@"device_id": deviceDetailModel.deviceId,
-                                @"node_id" : deviceDetailModel.nodeId,
-                                @"prd_user_name" : [_txtInputDeviceName.text isEqualToString:@""] ? deviceDetailModel.prdName : _txtInputDeviceName.text};
+    NSDictionary *parameter = @{@"device_id": _deviceDetailModel.deviceId,
+                                @"node_id" : _deviceDetailModel.nodeId,
+                                @"prd_user_name" : [_txtInputDeviceName.text isEqualToString:@""] ? _deviceDetailModel.prdName : _txtInputDeviceName.text};
     
-    NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_GET_DEVICE_LIST arguments:nil];
+    NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_PUT_DEVICE_INFO arguments:nil];
     
     [[RequestHandler handler] sendAsyncPutRequestAPIPath:path parameters:parameter modelClass:[JDJSONModel class] completion:^(id responseObject) {