Pārlūkot izejas kodu

- 장치 프로파일 업데이트 부분 작업 완료 / 테스트 필

KaRam Kim 8 gadi atpakaļ
vecāks
revīzija
ee0913dd9e

+ 2 - 0
OneCable/Classes/Definitions.h

@@ -401,6 +401,8 @@ typedef enum MorePopupBtnType {
 //#define kUIFontSize07       26.0f   //things detail value 아주 큰 글씨
 //#define kUIFontSize08       36.0f   //장치 상세
 
+#define kUITextColorCode06          @"#caced8"
+
 #define kUITextColor01          setColor(@"#000000")           //기본 컬러 black
 #define kUITextColor02          setColor(@"#00C188")           //포인트 컬러 - 녹색
 #define kUITextColor03          setColor(@"#888FA8")           //연한 회색 컬러

+ 4 - 0
OneCable/Classes/JDFacade.m

@@ -418,6 +418,10 @@ static NSString *const ksKeychainArchiveData = @"_archiveData";
                 completion(info);
             }
         }];
+        if ([info getColorCode] != nil) {
+            [action setValue:[info getColorCode] forKey:@"titleTextColor"];
+        }
+//        [action setValue:[UIColor redColor] forKey:@"titleTextColor"];
         [alertController addAction:action];
     }
     

+ 4 - 0
OneCable/Classes/Model/DataSelectModel.h

@@ -12,8 +12,11 @@
 @interface DataSelectModel : NSObject
 
 @property (copy, nonatomic) NSString *title;
+@property (copy, nonatomic) NSString *strColorCode;
 @property (copy, nonatomic) id value;
 
+-(UIColor *)getColorCode;
+
 @end
 
 
@@ -22,4 +25,5 @@
 @property (copy, nonatomic) NSMutableArray<DataSelectModel> *list;
 @property (copy, nonatomic) NSString *title;
 
+
 @end

+ 9 - 0
OneCable/Classes/Model/DataSelectModel.m

@@ -10,6 +10,15 @@
 
 @implementation DataSelectModel
 
+-(UIColor *)getColorCode
+{
+    UIColor *result = nil;
+    if (_strColorCode != nil) {
+        result = setColor(_strColorCode);
+    }
+    return result;
+}
+
 @end
 
 

+ 26 - 1
OneCable/Classes/ViewControllers/ThingsScreens/ThingsDetailViewController.m

@@ -509,6 +509,17 @@
 }
 
 
+-(void)nodeProfileUpdate
+{
+    SocketRequestModel *request = [[SocketRequestModel alloc] initWithMsgType:MSG_TYPE_NODE_PROFILE_UPDATE];
+    NSDictionary *param = @{@"device_id":_refDevice.deviceId,
+                            @"node_id":_refDevice.nodeId,
+                            @"cust_id": [[JDFacade facade].loginUser custId],
+                            @"ctrt_grp_id": [[JDFacade facade].loginUser ctrtGrpId]};
+    [request setRequestMsg:param];
+    [self sendDataToSocket:request modelClass:[CommandModel class] isLoading:YES];
+}
+
 #pragma mark - MoreButtonDelegate
 -(void)moreBtnAction:(id)sender
 {
@@ -546,7 +557,12 @@
     [self toggleOptionsWithArray:sender btnArray:_moreBtnArray];
 }
 - (IBAction)btnUpdateTouched:(id)sender {
-    NSLog(@"업데이트");
+    [[JDFacade facade] confirmTitle:@"장치 업데이트" message:@"지금 장치를 최신 버전으로\n업데이트 하시겠습니까?" btnOKLabel:@"예" btnCancelLabel:@"아니오" completion:^(CustomAlertView *alertView, NSInteger buttonIndex) {
+        if (buttonIndex == 0) {
+            [self nodeProfileUpdate];
+        }
+    }];
+    
 }
 
 - (IBAction)btnCloseTouched:(id)sender {
@@ -576,6 +592,15 @@
             [self requestDeviceDetail:@NO];
         }
     }
+    if ([result.messageType isEqualToString:MSG_TYPE_NODE_PROFILE_UPDATE_RES]) {
+//        ContentModel *response = [[ContentModel alloc] initWithDictionary:notification.object error:nil];
+        if (result.isSuccess) {
+            NSLog(@"Resutl : %@", result);
+        } else {
+            [[JDFacade facade] alertTitle:nil message:result.resultMsg];
+        }
+//        NSLog(@"Response : %@", result);
+    }
 //    else if ([result.messageType isEquestToIgnoreCase:MSG_TYPE_NODE_COMMAND_RES]) {
 //        
 //    }

+ 3 - 0
OneCable/Classes/ViewControllers/ThingsScreens/ThingsViewController.m

@@ -454,6 +454,9 @@
                                                    
                                                    DataSelectModel *data = [[DataSelectModel alloc] init];
                                                    data.title = info.deviceName;
+                                                   if (![info isDeviceOnlined]) {
+                                                       data.strColorCode = kUITextColorCode06;
+                                                   }
                                                    data.value = info;
                                                    [_homeHubList.list addObject:data];
                                                }