- 소스정리 / 규칙 추가 화면 장치 목록 api 연결

OneCable/Classes/AppDelegate.m

@@ -138,7 +138,7 @@
 
 // 푸시 처리
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{
-    
+    NSLog(@"UserInfo : %@", userInfo);
     [self handlePushNotification:userInfo];
 }
 

OneCable/Classes/Definitions.h

@@ -183,7 +183,7 @@ static NSInteger kMaxTimeOut = 60;      //운영
 #define API_GET_RULE_CMDCLS     @"/rules/cmdcls/%@"
 #define API_GET_RULE_MOBILE     @"/rules/mobile_devices"
 #define API_GET_RULE_MEMBERS    @"/rules/mobile_members"
-#define API_GET_ITEM_DEVICES    @"/rules/item_devices/%@"
+#define API_GET_ITEM_DEVICES    @"/customer/%@/group/%@/rule/device/item/%@"
 
 
 #define API_GET_PRERULE_LIST    @"/predefined_rules"

OneCable/Classes/ViewControllers/HomeMemberScreens/HomeMemberAddViewController.m

@@ -365,9 +365,13 @@
 
 -(NSString *)getInviteNumberValidateUrl:(NSString *)number
 {
-    NSMutableArray *arr = [NSMutableArray array];
-    arr[0] = [JDFacade facade].loginUser.memberId;
-    arr[1] = number;
+//    NSMutableArray *arr = [NSMutableArray array];
+//    arr[0] = [JDFacade facade].loginUser.memberId;
+//    arr[1] = number;
+    NSArray *arr = @[
+                     [JDFacade facade].loginUser.memberId,
+                     number
+                     ];
     
     return [[JDFacade facade] getUrlWithCustAndGroupID:API_GET_HOMEGROUP_MEMBER_VALIDATE arguments:arr];
 }

OneCable/Classes/ViewControllers/RuelsScreens/RulesAddViewController.m

@@ -180,7 +180,7 @@
 }
 
 - (void)prepareViewDidLoad {
-    [self requestDeviceListForAction:ksItemTypeCodeTrigger];
+    [self requestDeviceListForAction:ksItemTypeCodeAction];
 }
 
 
@@ -188,11 +188,13 @@
 
 - (void)requestDeviceListForAction:(NSString *)typeCode {
     //parameters
-    NSDictionary *parameter = @{@"item_type_code": typeCode};
+//    NSDictionary *parameter = @{@"item_type_code": typeCode};
+    NSArray *arr = @[typeCode];
+//    NSString *path = [NSString stringWithFormat:API_GET_ITEM_DEVICES, ksItemTypeCodeAction];
+    NSString *path = [[JDFacade facade] getUrlWithCustAndGroupID:API_GET_ITEM_DEVICES arguments:arr];
     
-    NSString *path = [NSString stringWithFormat:API_GET_ITEM_DEVICES, ksItemTypeCodeAction];
     
-    [[RequestHandler handler] sendAsyncGetRequestAPIPath:path parameters:parameter modelClass:[ItemListModel class] completion:^(id responseObject) {
+    [[RequestHandler handler] sendAsyncGetRequestAPIPath:path parameters:nil modelClass:[ItemListModel class] completion:^(id responseObject) {
         if (!responseObject) {//응답결과가 잘못되었거나 없을 경우,
             return;
         }