- 홈 멤버 그룹조회 관련 파라메터 수

OneCable/Classes/Common.h

@@ -44,6 +44,41 @@
 #define IS_IPHONE_6 CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 667.0f)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(667.0f, 375))
 #define IS_IPHONE_6P CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(414, 736.0f)) || CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(736.0f, 414))
 
+#define USERDEFAULT [NSUserDefaults standardUserDefaults]
+#define SharedApplication [UIApplication sharedApplication]
+#define Bundle [NSBundle mainBundle]
+#define MainScreen [UIScreen mainScreen]
+#define BundleInfo [Bundle infoDictionary]
+#define AppVersion [BundleInfo  objectForKey:@"CFBundleVersion"]
+#define DeviceLangCode [[NSLocale preferredLanguages] objectAtIndex: 0] //시스템 언어정보 코드
+
+#define ViewWidth(v) v.frame.size.width
+#define ViewHeight(v) v.frame.size.height
+#define ViewX(v) v.frame.origin.x
+#define ViewY(v) v.frame.origin.y
+
+#define ViewRectSetXY(v, x, y) CGRectMake(x, y, ViewWidth(v), ViewHeight(v))
+#define ViewRectSetX(v, x) CGRectMake(x, ViewY(v), ViewWidth(v), ViewHeight(v))
+#define ViewRectSetY(v, y) CGRectMake(ViewX(v), y, ViewWidth(v), ViewHeight(v))
+
+#define RectMake(x, y, w, h) CGRectMake(x, y, w, h)
+
+#define RectX(f) f.origin.x
+#define RectY(f) f.origin.y
+#define RectWidth(f) f.size.width
+#define RectHeight(f) f.size.height
+
+#define RectSetWidth(f, w) CGRectMake(RectX(f), RectY(f), w, RectHeight(f))
+#define RectSetHeight(f, h) CGRectMake(RectX(f), RectY(f), RectWidth(f), h)
+#define RectSetX(f, x) CGRectMake(x, RectY(f), RectWidth(f), RectHeight(f))
+#define RectSetY(f, y) CGRectMake(RectX(f), y, RectWidth(f), RectHeight(f))
+#define RectSetSize(f, w, h) CGRectMake(RectX(f), RectY(f), w, h)
+#define RectSetOrigin(f, x, y) CGRectMake(x, y, RectWidth(f), RectHeight(f))
+
+#define getCenter(v) CGPointMake(v.center.x-ViewX(v), v.center.y-ViewY(v))
+
+
+
 
 #define IS_IPAD [[[UIDevice currentDevice] systemVersion] floatValue] >= 8.3 ? (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) : [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad
 #define AUTO_NIB(NIB_NAME)  IS_IPAD?[NSString stringWithFormat:@"%@_iPad", NIB_NAME]:IS_4INCH_SCREEN?[NSString stringWithFormat:@"%@_4Inch", NIB_NAME]:NIB_NAME

OneCable/Classes/Model/LoginModel.h

@@ -51,7 +51,8 @@
 
 @interface HomeMemberListModel : JDJSONModel
 
-@property (copy, nonatomic) NSArray<HomeMemberModel> *list;
+@property (copy, nonatomic) NSString *limitCnt; //멤버 등록 제한 숫자(Default : 10)
+@property (copy, nonatomic) NSArray<HomeMemberModel> *ctrtGrpMemberList; //홈그룹 멤버 목록
 
 @end
 

OneCable/Classes/ViewControllers/HomeMemberScreens/HomeMemberViewController.m

@@ -304,7 +304,7 @@
             NSLog(@"Member List : %@", responseObject);
             
             HomeMemberListModel *fetchedMemberList = (HomeMemberListModel *)responseObject;
-            NSArray<HomeMemberModel> *homegrpMemberList = fetchedMemberList.list;
+            NSArray<HomeMemberModel> *homegrpMemberList = fetchedMemberList.ctrtGrpMemberList;
             
             if (homegrpMemberList && homegrpMemberList.count) {
                 HomeMemberModel *master = [homegrpMemberList objectKey:@"gradeCode" eqaulToString:KNEET_MEMBER_MASTER];
@@ -344,7 +344,7 @@
         }
         NSLog(@"Member List : %@", responseObject);
         HomeMemberListModel *fetchedMemberList = (HomeMemberListModel *)responseObject;
-        NSArray<HomeMemberModel> *homegrpMemberList = fetchedMemberList.list;
+        NSArray<HomeMemberModel> *homegrpMemberList = fetchedMemberList.ctrtGrpMemberList;
 
         if (homegrpMemberList && homegrpMemberList.count) {
             _memberList = homegrpMemberList;
@@ -506,12 +506,14 @@
         return CGSizeZero;
     }
     
-    return CGSizeMake(IPHONE_WIDTH, 168.0f);
+    return CGSizeMake(ViewWidth(_collectionView), 168.0f);
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-    
-    return CGSizeMake(IPHONE_WIDTH / _deviceFlag, 168.0f);
+    NSLog(@"Phone View Size : %f", IPHONE_WIDTH);
+    NSLog(@"Collection View Size : %f", ViewWidth(_collectionView));
+    NSLog(@"Cell Size : %@", NSStringFromCGSize(CGSizeMake(ViewWidth(_collectionView) / _deviceFlag, 168.0f)));
+    return CGSizeMake(ViewWidth(_collectionView) / _deviceFlag, 168.0f);
 //    if (IPHONE_WIDTH == 414.0f) {//아이폰 6일 경우,
 //    } else if (IPHONE_WIDTH == 375.0f) {//아이폰 6+일경우
 //        return CGSizeMake(IPHONE_WIDTH / _deviceFlag, 168.0f);

OneCable/Classes/ViewControllers/MainScreens/LoginViewController.m

@@ -164,6 +164,7 @@
                                 @"device_token": [JDFacade facade].APNSToken ? [JDFacade facade].APNSToken : ksEmptyString,
                                 @"os_type": MOBILE_DEVICE_TYPE,
                                 @"device_hostname": [JDFacade facade].deviceHostName ? [JDFacade facade].deviceHostName : ksEmptyString};
+    
 
     NSString *path = [NSString stringWithFormat:API_GET_SIGN_IN_AUTO];