lyhungcoder@gmail.com / Lifelog

Browse Code »

Commit 3c805063b5b987fbb80f35b76673c9d33c2ab091

Authored by phong 2017-11-13 00:12:21 +0900

1 parent 26548f2f08

Exists in master

update api notice

Showing 5 changed files with 97 additions and 19 deletions Inline Diff

LifeLog/LifeLog/HomeViewConb troller.m
LifeLog/LifeLog/HomeViewController.xib
LifeLog/LifeLog/Info.plist
LifeLog/LifeLog/ServerAPI.h
LifeLog/LifeLog/ServerAPI.m

LifeLog/LifeLog/HomeViewConb troller.m

Diff comments View file @ 3c80506

 //
 //  HomeViewController.m
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/25/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import "HomeViewController.h"
 #import "NSDate+helper.h"
 #import <CoreMotion/CoreMotion.h>
 #import "CMMotionActivityExtra.h"
 #import "TodayViewController.h"
 #import "Utilities.h"
 #import <MBProgressHUD/MBProgressHUD.h>
 #import "ServerAPI.h"
 static NSInteger maxRequest = 20;
 static NSInteger numberTotal = 10000;
 @interface HomeViewController ()
 {
     MBProgressHUD *progressHud;
     NSInteger targetStep;
 }
 @property (nonatomic, weak) IBOutlet UILabel *lblTitle;
 @property (nonatomic, weak) IBOutlet UIImageView *avatar;
 @property (nonatomic, weak) IBOutlet UILabel *lblDateCurrent;
 @property (nonatomic, weak) IBOutlet UILabel *lblValueStep;
 @property (nonatomic, weak) IBOutlet UILabel *lblUnitStep;
 @property (nonatomic, weak) IBOutlet UILabel *lblValueStepOther;
 @property (nonatomic, weak) IBOutlet UILabel *lblPercent;
 @property (nonatomic, weak) IBOutlet UILabel *lblNotice;
 @property (weak, nonatomic) IBOutlet UISegmentedControl *segmentHome;
 @property (weak, nonatomic) IBOutlet UITextView *tvNotice;
 @property (nonatomic, strong) CMPedometer *pedometer;
 @property (nonatomic, strong) CMMotionActivityManager *motionActivityManager;
 @property (nonatomic, strong) NSOperationQueue *operationQueue;
 @property (nonatomic, strong) NSTimer *timer;
 @property (nonatomic, assign) NSInteger bike;
 @property (nonatomic, assign) NSInteger walking;
 @property (nonatomic, assign) NSInteger running;
 @property (nonatomic, strong) NSDate *dateCurrent;
 @property (nonatomic, assign) int totalRequest;
 @property (nonatomic, assign) int countComplete;
 @property (nonatomic, assign) int currentIndex;
 @end
 @implementation HomeViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.lblTitle.text = NSLocalizedString(@"lifelog.home.title", nil);
     [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.topLayoutGuide attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.lblTitle attribute:NSLayoutAttributeTop multiplier:1 constant:0]];
     self.avatar.backgroundColor = [UIColor whiteColor];
     self.avatar.layer.borderWidth = 2.0f;
     self.avatar.layer.borderColor = [[UIColor whiteColor] CGColor];
     self.avatar.layer.cornerRadius = self.avatar.frame.size.width/2.0f;
     self.avatar.layer.masksToBounds = YES;
     NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:kUser];
     User *user = (User *)[NSKeyedUnarchiver unarchiveObjectWithData:data];
     if (user != nil) {
         NSString *linkImage = [NSString stringWithFormat:@"%@%@", kServerAddress, user.profile_image];
         NSURL *urlImage = [NSURL URLWithString:linkImage];
         NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
         sessionConfig.timeoutIntervalForRequest = 30.0;
         sessionConfig.timeoutIntervalForResource = 60.0;
         sessionConfig.HTTPMaximumConnectionsPerHost = 20;
         sessionConfig.allowsCellularAccess = YES;
         HomeViewController __weak *weakSelf = self;
         NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig];
         NSURLSessionDataTask *downloadPhotoTask = [session
                                                    dataTaskWithURL:urlImage completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
                                                        if (weakSelf == nil)
                                                        {
                                                            return;
                                                        }
                                                        if (error == nil) {
                                                            UIImage *image = [[UIImage alloc] initWithData:data];
                                                            [[NSOperationQueue mainQueue] addOperationWithBlock:^{
                                                                weakSelf.avatar.image = image;
                                                            }];
                                                        }
                                                    }];
         [downloadPhotoTask resume];
     }
     self.lblNotice.text = NSLocalizedString(@"lifelog.home.notice", nil);
     _dateCurrent = [NSDate date];
     self.lblDateCurrent.text = [NSString stringWithFormat:@"%ld%@%ld%@%ld%@", (long)[_dateCurrent getYear], NSLocalizedString(@"lifelog.common.year", nil), (long)[_dateCurrent getMonth], NSLocalizedString(@"lifelog.common.month", nil), (long)[_dateCurrent getDay], NSLocalizedString(@"lifelog.common.day", nil)];
     self.lblUnitStep.text = NSLocalizedString(@"lifelog.home.unit.step", nil);
     if ([CMPedometer isStepCountingAvailable]) {
         _pedometer = [[CMPedometer alloc] init];
     }
     if ([CMMotionActivityManager isActivityAvailable]) {
         _motionActivityManager = [[CMMotionActivityManager alloc] init];
     }
     _operationQueue = [[NSOperationQueue alloc] init];
     _bike = 0;
     _walking = 0;
     _running = 0;
     _segmentHome.selectedSegmentIndex = 1;
     _totalRequest = 0;
     _countComplete = 0;
     progressHud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     progressHud.mode = MBProgressHUDModeIndeterminate;
     progressHud.detailsLabel.text = NSLocalizedString(@"lifelog.home.progressHud.title", nil);
     // [self saveDataStep7LastDay];
     targetStep = numberTotal;
+    [self requestNotice];
 }
+- (void)requestNotice
+{
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setDateFormat:@"yyyy-MM-dd"];
+    NSString *dateString = [dateFormatter stringFromDate:_dateCurrent];
+    HomeViewController __weak *weakSelf = self;
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        //Do background work
+        [[ServerAPI server] getNoticeByDate:dateString CompletionHandler:^(NSArray *arrResults, NSError *error) {
+            if(weakSelf == nil) {
+                return ;
+            }
+            if (error == nil) {
+                // NSLog(@"List Notices: %@", arrResults);
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    NSString *stringNotice = @"";
+                    for (NSString *noticeInfor in arrResults) {
+                        NSString *noticeString = [NSString stringWithFormat:@"%@\n", noticeInfor];
+                        stringNotice = [stringNotice stringByAppendingString:noticeString];
+                    }
+                    weakSelf.tvNotice.text = stringNotice;
+                });
+            }
+            else {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    weakSelf.tvNotice.text = @"";
+                    /*
+                    NSString *message = [error.userInfo objectForKey:@"message"];
+                    [Utilities showErrorMessage:message withViewController:weakSelf];
+                    */
+                });
+            }
+        }];
+    });
+}
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     NSDate *dateNow = [NSDate date];
     [self saveStepForDay:dateNow];
 }
 - (void)requestTopByDate:(NSDate *)date {
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setDateFormat:@"yyyy-MM-dd"];
     NSString *dateString = [dateFormatter stringFromDate:date];
     [progressHud showAnimated:YES];
     [progressHud setHidden:NO];
     HomeViewController __weak *weakSelf = self;
     int mode = 1;
     switch (_segmentHome.selectedSegmentIndex) {
         case 0:
             mode = 3;
             break;
         case 1:
             mode = 1;
             break;
         case 2:
             mode = 2;
             break;
         default:
             break;
     }
     [[ServerAPI server] requestTopWithMode:mode andDate:dateString CompletionHandler:^(TopObject *topObject, NSError *error) {
         if(weakSelf == nil) {
             return ;
         }
         if (error == nil) {
             NSLog(@"TopObject: %@", topObject);
             dispatch_async(dispatch_get_main_queue(), ^{
                 [weakSelf updateStepUI:topObject.targetInfor];
             });
         }
         else {
             dispatch_async(dispatch_get_main_queue(), ^{
                 NSString *message = [error.userInfo objectForKey:@"message"];
                 [Utilities showErrorMessage:message withViewController:weakSelf];
             });
         }
         dispatch_async(dispatch_get_main_queue(), ^{
             [progressHud setHidden:YES];
         });
     }];
+    /*
     [[ServerAPI server] requestHomeWithMode:mode andDate:dateString CompletionHandler:^(HomeObject *homeObject, NSError *error) {
         if(weakSelf == nil) {
             return ;
         }
         if (error == nil) {
             NSLog(@"List Notices: %@", homeObject.listNotice);
             for (NoticeInfor *noticeInfor in homeObject.listNotice) {
                 NSLog(@"noticeInfor: %@", noticeInfor.notice_content);
             }
             dispatch_async(dispatch_get_main_queue(), ^{
                 [weakSelf updateNoticeUI:homeObject];
             });
         }
         else {
             dispatch_async(dispatch_get_main_queue(), ^{
                 NSString *message = [error.userInfo objectForKey:@"message"];
                 [Utilities showErrorMessage:message withViewController:weakSelf];
             });
         }
         dispatch_async(dispatch_get_main_queue(), ^{
             [progressHud setHidden:YES];
         });
     }];
+    */
 }
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
 }
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
 #pragma mark - IBAction
 - (IBAction)menuButtonTouchUpInside:(id)sender
 {
 }
 - (IBAction)todayButtonTouchUpInside:(id)sender
 {
     TodayViewController *todayVC = [[TodayViewController alloc] initWithNibName:@"TodayViewController" bundle:nil];
     todayVC.targetStep = targetStep;
     [self.navigationController pushViewController:todayVC animated:YES];
 }
 - (IBAction)leftButtonTouchUpInside:(id)sender
 {
     self.dateCurrent = [self.dateCurrent dateByAddingTimeInterval:-(24*60*60)];
     self.lblDateCurrent.text = [NSString stringWithFormat:@"%ld%@%ld%@%ld%@", (long)[_dateCurrent getYear], NSLocalizedString(@"lifelog.common.year", nil), (long)[_dateCurrent getMonth], NSLocalizedString(@"lifelog.common.month", nil), (long)[_dateCurrent getDay], NSLocalizedString(@"lifelog.common.day", nil)];
     [self resetStepUI];
     [self saveStepForDay:self.dateCurrent];
+    [self requestNotice];
 }
 - (IBAction)rightButtonTouchUpInside:(id)sender
 {
     self.dateCurrent = [self.dateCurrent dateByAddingTimeInterval:24*60*60];
     self.lblDateCurrent.text = [NSString stringWithFormat:@"%ld%@%ld%@%ld%@", (long)[_dateCurrent getYear], NSLocalizedString(@"lifelog.common.year", nil), (long)[_dateCurrent getMonth], NSLocalizedString(@"lifelog.common.month", nil), (long)[_dateCurrent getDay], NSLocalizedString(@"lifelog.common.day", nil)];
     [self resetStepUI];
     //[self saveStepForDay:self.dateCurrent];
     [self requestTopByDate:self.dateCurrent];
+    [self requestNotice];
 }
 - (IBAction)segmentValueChange:(id)sender {
     [self resetStepUI];
     [self requestTopByDate:self.dateCurrent];
 }
 #pragma mark - Functions Private
 - (void)saveStepForDay:(NSDate *)date
 {
     if ([CMMotionActivityManager isActivityAvailable]) {
         [progressHud showAnimated:YES];
         [progressHud setHidden:NO];
         self.bike = 0;
         self.walking = 0;
         self.running = 0;
         NSDate *startDate = [date beginningAtMidnightOfDay];
         NSDate *endDate = [startDate dateByAddingTimeInterval:(24*60*60 - 1)];
         HomeViewController __weak *weakSelf = self;
         dispatch_queue_t myQueue = dispatch_queue_create("mobileworld.jp.lifelog.forDay", NULL);
         dispatch_async(myQueue, ^{
             if (weakSelf == nil) {
                 return ;
             }
             [weakSelf.motionActivityManager queryActivityStartingFromDate:startDate toDate:endDate toQueue:_operationQueue withHandler:^(NSArray<CMMotionActivity *> * _Nullable activities, NSError * _Nullable error) {
                 if (error || activities.count <= 0) {
                     dispatch_async(dispatch_get_main_queue(), ^{
                         [weakSelf updateStepUI];
                     });
                     return ;
                 }
                 // set EndDate
                 NSMutableArray *arrayActivities = [[NSMutableArray alloc] init];
                 for (int i = 0; i < activities.count; i++) {
                     CMMotionActivity *activity = [activities objectAtIndex:i];
                     CMMotionActivityExtra *activityExtra = [[CMMotionActivityExtra alloc] init];
                     activityExtra.activity = activity;
                     if (i == activities.count - 1) {
                         activityExtra.endDate = endDate;
                     }
                     else {
                         CMMotionActivity *activityNext = [activities objectAtIndex:i+1];
                         // activityExtra.endDate = [activityNext.startDate dateByAddingTimeInterval:-1];
                         activityExtra.endDate = activityNext.startDate;
                     }
                     [arrayActivities addObject:activityExtra];
                 }
                 // PhongNV
                 weakSelf.currentIndex = 0;
                 [weakSelf save20objectOfActivityExtras:arrayActivities];
             }];
         });
     }
 }
 - (void)complete20Request:(NSArray *)activities {
     if (self.totalRequest == self.countComplete) {
         self.totalRequest = 0;
         self.countComplete = 0;
         self.currentIndex++;
         [self save20objectOfActivityExtras:activities];
     }
 }
 - (void)save20objectOfActivityExtras:(NSArray *)activities
 {
     int result = floor(activities.count / maxRequest);
     if (activities.count <= 0 || self.currentIndex > result) {
         self.totalRequest = 0;
         self.countComplete = 0;
         self.currentIndex = 0;
         dispatch_async(dispatch_get_main_queue(), ^{
             [self updateStepUI];
         });
         return;
     }
     HomeViewController __weak *weakSelf = self;
     for (NSInteger index = self.currentIndex*maxRequest; index < self.currentIndex*maxRequest + maxRequest; index++) {
         if ((self.currentIndex*maxRequest + maxRequest) >= activities.count) {
             self.totalRequest = (int)(activities.count - self.currentIndex*maxRequest);
             if (self.totalRequest <= 0) {
                 [weakSelf complete20Request:activities];
             }
         }
         else {
             self.totalRequest = (int)maxRequest;
         }
         if (index < activities.count) {
             CMMotionActivityExtra *activityExtra = [activities objectAtIndex:index];
             [self.pedometer queryPedometerDataFromDate:activityExtra.activity.startDate toDate:activityExtra.endDate withHandler:^(CMPedometerData * _Nullable pedometerData, NSError * _Nullable error) {
                 if (weakSelf == nil) {
                     return ;
                 }
                 NSInteger numberStep = [pedometerData.numberOfSteps integerValue];
                 int mode = 1;
                 if (activityExtra.activity.cycling) {
                     mode = 3;
                 }
                 else if (activityExtra.activity.walking) {
                     mode = 1;
                 }
                 else if (activityExtra.activity.running) {
                     mode = 2;
                 }
                 else {
                     // unknown
                 }
                 // save step to server
                 if (numberStep > 0) {
                     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
                     [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
                     NSString *dateBegin = [dateFormatter stringFromDate:activityExtra.activity.startDate];
                     NSString *dateEnd = [dateFormatter stringFromDate:activityExtra.endDate];
-                    NSLog(@"dateBegin: %@ | dateEnd: %@ | numberStep: %li", dateBegin, dateEnd, numberStep);
+                    // NSLog(@"dateBegin: %@ | dateEnd: %@ | numberStep: %li", dateBegin, dateEnd, numberStep);
                     [[ServerAPI server] requestCreateLog:mode withStep:(int)numberStep startDate:dateBegin endDate:dateEnd CompletionHandler:^(NSError *error) {
                         if (error) {
                             NSLog(@"Error: %@", error);
                         }
                         weakSelf.countComplete++;
                         [weakSelf complete20Request:activities];
                     }];
                 }
                 else {
                     weakSelf.countComplete++;
                     [weakSelf complete20Request:activities];
                 }
             }];
         }
     }
 }
 - (void)updateStepUI
 {
     [self requestTopByDate:self.dateCurrent];
 }
 - (void)saveDataStep7LastDay
 {
     NSDate *dateNow = [NSDate date];
     for (int index = 0; index < 7; index++) {
         dateNow = [dateNow dateByAddingTimeInterval:-(24*60*60)];
         [self saveStepByDate:dateNow];
     }
 }
 - (void)saveStepByDate:(NSDate *)date
 {
     if ([CMMotionActivityManager isActivityAvailable]) {
         NSDate *startDate = [date beginningAtMidnightOfDay];
         NSDate *endDate = [startDate dateByAddingTimeInterval:(24*60*60 - 1)];
         HomeViewController __weak *weakSelf = self;
         dispatch_queue_t myQueue = dispatch_queue_create("mobileworld.jp.lifelog.7lastday", NULL);
         dispatch_async(myQueue, ^{
             if (weakSelf == nil) {
                 return ;
             }
             [weakSelf.motionActivityManager queryActivityStartingFromDate:startDate toDate:endDate toQueue:_operationQueue withHandler:^(NSArray<CMMotionActivity *> * _Nullable activities, NSError * _Nullable error) {
                 if (error || activities.count <= 0) {
                     return ;
                 }
                 // set EndDate
                 NSMutableArray *arrayActivities = [[NSMutableArray alloc] init];
                 for (int i = 0; i < activities.count; i++) {
                     CMMotionActivity *activity = [activities objectAtIndex:i];
                     CMMotionActivityExtra *activityExtra = [[CMMotionActivityExtra alloc] init];
                     activityExtra.activity = activity;
                     if (i == activities.count - 1) {
                         activityExtra.endDate = endDate;
                     }
                     else {
                         CMMotionActivity *activityNext = [activities objectAtIndex:i+1];
                         activityExtra.endDate = [activityNext.startDate dateByAddingTimeInterval:-1];
                     }
                     [arrayActivities addObject:activityExtra];
                 }
                 for (CMMotionActivityExtra *activityExtra in arrayActivities) {
                     [weakSelf.pedometer queryPedometerDataFromDate:activityExtra.activity.startDate toDate:activityExtra.endDate withHandler:^(CMPedometerData * _Nullable pedometerData, NSError * _Nullable error) {
                         NSInteger numberStep = [pedometerData.numberOfSteps integerValue];
                         int mode = 1;
                         if (activityExtra.activity.cycling) {
                             mode = 3;
                         }
                         else if (activityExtra.activity.walking) {
                             mode = 1;
                         }
                         else if (activityExtra.activity.running) {
                             mode = 2;
                         }
                         else {
                             // unknown
                         }
                         // save step to server
                         if (numberStep > 0) {
                             NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
                             [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
                             NSString *dateBegin = [dateFormatter stringFromDate:activityExtra.activity.startDate];
                             NSString *dateEnd = [dateFormatter stringFromDate:activityExtra.endDate];
                             [[ServerAPI server] requestCreateLog:mode withStep:(int)numberStep startDate:dateBegin endDate:dateEnd CompletionHandler:^(NSError *error) {
                                 if (error) {
                                     NSLog(@"Error: %@", error);
                                 }
                             }];
                         }
                     }];
                 }
             }];
         });
     }
 }
 - (void)updateStepUI:(TargetInfor *)targetInfor
 {
     NSString *stringTargetStep = [targetInfor.target_step stringByReplacingOccurrencesOfString:@"," withString:@""];
     targetStep = [stringTargetStep integerValue];
     self.lblValueStep.text = targetInfor.num_step;
     self.lblValueStepOther.text = [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"lifelog.today.remaining.other", nil), targetInfor.remaining_step];
     self.lblPercent.text = [NSString stringWithFormat:@"%@ %i%@", NSLocalizedString(@"lifelog.today.text.percent", nil), [targetInfor.complete_percent intValue], NSLocalizedString(@"lifelog.today.percent", nil)];
 }
 - (void)updateNoticeUI:(HomeObject *)homeObject
 {
     NSString *stringNotice = @"";
     for (NoticeInfor *notice in homeObject.listNotice) {
         NSString *noticeString = [NSString stringWithFormat:@"%@\n", notice.notice_content];
         stringNotice = [stringNotice stringByAppendingString:noticeString];
     }
     _tvNotice.text = stringNotice;
 }
 - (void)resetStepUI
 {
     self.lblValueStep.text = @"";
     self.lblValueStepOther.text = @"";
     self.lblPercent.text = @"";
 }
 @end

LifeLog/LifeLog/HomeViewController.xib

Diff comments View file @ 3c80506

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="HomeViewController">
             <connections>
                 <outlet property="avatar" destination="J2A-tf-wH0" id="FdR-Zg-4ye"/>
                 <outlet property="lblDateCurrent" destination="IaR-IO-4RA" id="nVS-KW-X4d"/>
                 <outlet property="lblNotice" destination="lnt-4H-Ao8" id="aoM-JS-VHg"/>
                 <outlet property="lblPercent" destination="DuE-Dh-nEe" id="Yz4-VO-P2h"/>
                 <outlet property="lblTitle" destination="u3S-9u-GMZ" id="7C6-gv-vPu"/>
                 <outlet property="lblUnitStep" destination="wfu-aB-xXm" id="4Ms-pS-D2m"/>
                 <outlet property="lblValueStep" destination="TUf-Tp-93t" id="qAh-fl-oW4"/>
                 <outlet property="lblValueStepOther" destination="3Xj-IB-96h" id="yXj-HA-fDR"/>
                 <outlet property="segmentHome" destination="ibb-Yl-iqu" id="lE6-pr-GgT"/>
                 <outlet property="tvNotice" destination="kdD-rj-BtX" id="t6k-l8-l2N"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="HOME" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u3S-9u-GMZ" userLabel="LabelTitle">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                     <color key="backgroundColor" red="0.098039215686274508" green="0.098039215686274508" blue="0.098039215686274508" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="8z2-GM-1iE"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="23"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LPY-Zl-cOp" userLabel="ButtonMenu">
                     <rect key="frame" x="335" y="7" width="30" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="30" id="5Ve-P6-6G7"/>
                         <constraint firstAttribute="width" secondItem="LPY-Zl-cOp" secondAttribute="height" multiplier="1:1" id="6V0-0o-71r"/>
                     </constraints>
                     <state key="normal" image="icon_menu"/>
                     <connections>
                         <action selector="menuButtonTouchUpInside:" destination="-1" eventType="touchUpInside" id="HrU-er-jwh"/>
                     </connections>
                 </button>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="avatar_default" translatesAutoresizingMaskIntoConstraints="NO" id="J2A-tf-wH0" userLabel="avatar">
                     <rect key="frame" x="8" y="54" width="80" height="80"/>
                     <constraints>
                         <constraint firstAttribute="width" secondItem="J2A-tf-wH0" secondAttribute="height" multiplier="1:1" id="TVn-eB-Jhs"/>
                         <constraint firstAttribute="width" constant="80" id="YGa-LO-1Mu"/>
                     </constraints>
                 </imageView>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_left" translatesAutoresizingMaskIntoConstraints="NO" id="vRa-cr-YTe" userLabel="icon_left">
                     <rect key="frame" x="98" y="79" width="30" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="30" id="UZi-wZ-The"/>
                         <constraint firstAttribute="width" secondItem="vRa-cr-YTe" secondAttribute="height" multiplier="1:1" id="itE-d2-PsT"/>
                     </constraints>
                 </imageView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b6V-Bi-4oz" userLabel="ButtonLeft">
                     <rect key="frame" x="88" y="69" width="50" height="50"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="width" secondItem="b6V-Bi-4oz" secondAttribute="height" multiplier="1:1" id="GYG-2B-e1R"/>
                         <constraint firstAttribute="width" constant="50" id="bgQ-rD-KZD"/>
                     </constraints>
                     <connections>
                         <action selector="leftButtonTouchUpInside:" destination="-1" eventType="touchUpInside" id="Bzk-y5-Lre"/>
                     </connections>
                 </button>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_right" translatesAutoresizingMaskIntoConstraints="NO" id="Low-8n-pqa" userLabel="icon_right">
                     <rect key="frame" x="335" y="79" width="30" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="30" id="jTd-Xb-RdV"/>
                         <constraint firstAttribute="width" secondItem="Low-8n-pqa" secondAttribute="height" multiplier="1:1" id="pft-kU-wDw"/>
                     </constraints>
                 </imageView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="at8-co-gC4" userLabel="ButtonRight">
                     <rect key="frame" x="325" y="69" width="50" height="50"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="50" id="dpm-ie-7c4"/>
                         <constraint firstAttribute="width" secondItem="at8-co-gC4" secondAttribute="height" multiplier="1:1" id="wDO-Tw-aYK"/>
                     </constraints>
                     <connections>
                         <action selector="rightButtonTouchUpInside:" destination="-1" eventType="touchUpInside" id="0jR-UP-2ia"/>
                     </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2017年1月1日" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IaR-IO-4RA">
                     <rect key="frame" x="136" y="79" width="191" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="MsO-aD-MZ3"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="22"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TUf-Tp-93t" userLabel="valueStep">
                     <rect key="frame" x="20" y="139" width="275" height="40"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="6Wd-CK-kPs"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="45"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="step" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wfu-aB-xXm" userLabel="unitStep">
                     <rect key="frame" x="305" y="149" width="50" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="50" id="oQw-JM-dmo"/>
                         <constraint firstAttribute="height" constant="30" id="pV2-7i-dZB"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="25"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VAz-hq-dvR">
                     <rect key="frame" x="157" y="525" width="60" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="60" id="KzL-jP-qZn"/>
                         <constraint firstAttribute="height" constant="30" id="kdw-th-wDS"/>
                     </constraints>
                     <state key="normal" title="TODAY">
                         <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
                     <connections>
                         <action selector="todayButtonTouchUpInside:" destination="-1" eventType="touchUpInside" id="KoT-el-kxw"/>
                     </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Xj-IB-96h">
                     <rect key="frame" x="8" y="187" width="359" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="B7Z-yO-b6M"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="20"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DuE-Dh-nEe">
                     <rect key="frame" x="8" y="225" width="359" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="6YJ-rf-mz3"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="20"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="お知らせ" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lnt-4H-Ao8">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="お知らせ" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lnt-4H-Ao8">
                     <rect key="frame" x="8" y="275" width="359" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="isj-iQ-BcF"/>
                     </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="25"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_other" translatesAutoresizingMaskIntoConstraints="NO" id="BoP-c1-c0q">
-                    <rect key="frame" x="20" y="313" width="75" height="67"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="75" id="lKw-2n-DMo"/>
-                        <constraint firstAttribute="height" constant="67" id="m58-CT-3kB"/>
-                    </constraints>
-                </imageView>
                 <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="ibb-Yl-iqu">
                     <rect key="frame" x="75" y="575" width="224" height="29"/>
                     <segments>
                         <segment title="BIKE"/>
                         <segment title="WALKING"/>
                         <segment title="RUNNING"/>
                     </segments>
                     <color key="tintColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                     <connections>
                         <action selector="segmentValueChange:" destination="-1" eventType="valueChanged" id="kL2-mI-baG"/>
                     </connections>
                 </segmentedControl>
                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kdD-rj-BtX" userLabel="tvNotice">
-                    <rect key="frame" x="103" y="313" width="264" height="204"/>
+                    <rect key="frame" x="8" y="313" width="359" height="204"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                 </textView>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
             <constraints>
                 <constraint firstItem="IaR-IO-4RA" firstAttribute="leading" secondItem="vRa-cr-YTe" secondAttribute="trailing" constant="8" id="010-mM-SLU"/>
                 <constraint firstAttribute="trailing" secondItem="Low-8n-pqa" secondAttribute="trailing" constant="10" id="0OY-h0-Rgg"/>
                 <constraint firstAttribute="trailing" secondItem="kdD-rj-BtX" secondAttribute="trailing" constant="8" id="3bP-sY-1pI"/>
                 <constraint firstItem="u3S-9u-GMZ" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="4TN-aJ-vQh"/>
                 <constraint firstAttribute="trailing" secondItem="u3S-9u-GMZ" secondAttribute="trailing" id="8KH-Mn-IUf"/>
                 <constraint firstItem="DuE-Dh-nEe" firstAttribute="top" secondItem="3Xj-IB-96h" secondAttribute="bottom" constant="8" id="9h2-XH-Dd7"/>
                 <constraint firstItem="kdD-rj-BtX" firstAttribute="top" secondItem="lnt-4H-Ao8" secondAttribute="bottom" constant="8" id="BCi-jo-C0A"/>
                 <constraint firstAttribute="trailing" secondItem="LPY-Zl-cOp" secondAttribute="trailing" constant="10" id="CX3-BL-hNh"/>
                 <constraint firstItem="vRa-cr-YTe" firstAttribute="leading" secondItem="J2A-tf-wH0" secondAttribute="trailing" constant="10" id="Cax-pu-Kp7"/>
                 <constraint firstItem="3Xj-IB-96h" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="E8R-qO-PtJ"/>
-                <constraint firstItem="kdD-rj-BtX" firstAttribute="leading" secondItem="BoP-c1-c0q" secondAttribute="trailing" constant="8" id="EE0-bp-sbO"/>
                 <constraint firstItem="b6V-Bi-4oz" firstAttribute="centerX" secondItem="vRa-cr-YTe" secondAttribute="centerX" id="EEt-Ct-vxb"/>
                 <constraint firstItem="u3S-9u-GMZ" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" placeholder="YES" id="GbN-me-UEd"/>
                 <constraint firstItem="b6V-Bi-4oz" firstAttribute="centerY" secondItem="vRa-cr-YTe" secondAttribute="centerY" id="HXS-oH-EPB"/>
                 <constraint firstItem="vRa-cr-YTe" firstAttribute="centerY" secondItem="J2A-tf-wH0" secondAttribute="centerY" id="IDF-HZ-fqt"/>
                 <constraint firstAttribute="trailing" secondItem="lnt-4H-Ao8" secondAttribute="trailing" constant="8" id="IEA-1V-AZx"/>
                 <constraint firstItem="ibb-Yl-iqu" firstAttribute="top" secondItem="VAz-hq-dvR" secondAttribute="bottom" constant="20" id="Ib2-KY-3A7"/>
                 <constraint firstAttribute="bottom" secondItem="ibb-Yl-iqu" secondAttribute="bottom" constant="64" id="Iv8-Al-1Ff"/>
-                <constraint firstItem="BoP-c1-c0q" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="20" id="OVd-PH-Yxx"/>
                 <constraint firstItem="DuE-Dh-nEe" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="Rum-yc-3Ym"/>
                 <constraint firstItem="Low-8n-pqa" firstAttribute="centerY" secondItem="J2A-tf-wH0" secondAttribute="centerY" id="W7b-Hb-9ME"/>
                 <constraint firstItem="IaR-IO-4RA" firstAttribute="centerY" secondItem="J2A-tf-wH0" secondAttribute="centerY" id="b4I-Me-4xZ"/>
-                <constraint firstItem="BoP-c1-c0q" firstAttribute="top" secondItem="lnt-4H-Ao8" secondAttribute="bottom" constant="8" id="bAt-3o-b1H"/>
                 <constraint firstItem="wfu-aB-xXm" firstAttribute="top" secondItem="IaR-IO-4RA" secondAttribute="bottom" constant="40" id="bH1-l5-YRA"/>
                 <constraint firstItem="lnt-4H-Ao8" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="ea3-Dx-s4s"/>
                 <constraint firstItem="at8-co-gC4" firstAttribute="centerX" secondItem="Low-8n-pqa" secondAttribute="centerX" id="h5o-Cj-Z7s"/>
                 <constraint firstAttribute="trailing" secondItem="DuE-Dh-nEe" secondAttribute="trailing" constant="8" id="iyi-TY-Wfe"/>
                 <constraint firstItem="LPY-Zl-cOp" firstAttribute="centerY" secondItem="u3S-9u-GMZ" secondAttribute="centerY" id="jBf-Ck-YYj"/>
                 <constraint firstItem="TUf-Tp-93t" firstAttribute="centerY" secondItem="wfu-aB-xXm" secondAttribute="centerY" constant="-5" id="k3n-lY-8K1"/>
                 <constraint firstItem="J2A-tf-wH0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="mVQ-bZ-JBW"/>
                 <constraint firstAttribute="trailing" secondItem="wfu-aB-xXm" secondAttribute="trailing" constant="20" id="mtA-2Q-ssH"/>
                 <constraint firstItem="ibb-Yl-iqu" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="nOT-Ic-JU1"/>
                 <constraint firstItem="J2A-tf-wH0" firstAttribute="top" secondItem="u3S-9u-GMZ" secondAttribute="bottom" constant="10" id="nu9-Lj-5xz"/>
                 <constraint firstAttribute="trailing" secondItem="3Xj-IB-96h" secondAttribute="trailing" constant="8" id="pF6-db-UUi"/>
                 <constraint firstItem="3Xj-IB-96h" firstAttribute="top" secondItem="wfu-aB-xXm" secondAttribute="bottom" constant="8" id="psY-0r-fPJ"/>
+                <constraint firstItem="kdD-rj-BtX" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="q4Z-No-KmH"/>
                 <constraint firstItem="TUf-Tp-93t" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="20" id="sC4-Kr-3bN"/>
                 <constraint firstItem="at8-co-gC4" firstAttribute="centerY" secondItem="Low-8n-pqa" secondAttribute="centerY" id="tav-ge-tCT"/>
                 <constraint firstItem="VAz-hq-dvR" firstAttribute="top" secondItem="kdD-rj-BtX" secondAttribute="bottom" constant="8" id="ujL-1z-cUf"/>
                 <constraint firstItem="lnt-4H-Ao8" firstAttribute="top" secondItem="DuE-Dh-nEe" secondAttribute="bottom" constant="20" id="w4w-Z4-Jzk"/>
                 <constraint firstItem="wfu-aB-xXm" firstAttribute="leading" secondItem="TUf-Tp-93t" secondAttribute="trailing" constant="10" id="x51-DA-4Le"/>
                 <constraint firstItem="VAz-hq-dvR" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="xE7-ro-k8m"/>
                 <constraint firstItem="Low-8n-pqa" firstAttribute="leading" secondItem="IaR-IO-4RA" secondAttribute="trailing" constant="8" id="y6e-6A-hjn"/>
             </constraints>
             <point key="canvasLocation" x="33.5" y="97.5"/>
         </view>
     </objects>
     <resources>
         <image name="avatar_default" width="80" height="80"/>
         <image name="icon_left" width="30" height="30"/>
         <image name="icon_menu" width="30" height="30"/>
-        <image name="icon_other" width="150" height="134"/>
         <image name="icon_right" width="30" height="30"/>
     </resources>
 </document>

LifeLog/LifeLog/Info.plist

Diff comments View file @ 3c80506

1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">	2	<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3	<plist version="1.0">	3	<plist version="1.0">
4	<dict>	4	<dict>
5	<key>CFBundleDevelopmentRegion</key>	5	<key>CFBundleDevelopmentRegion</key>
6	<string>en</string>	6	<string>en</string>
7	<key>CFBundleDisplayName</key>	7	<key>CFBundleDisplayName</key>
8	<string>LIFE_LOG</string>	8	<string>LIFE_LOG</string>
9	<key>CFBundleExecutable</key>	9	<key>CFBundleExecutable</key>
10	<string>$(EXECUTABLE_NAME)</string>	10	<string>$(EXECUTABLE_NAME)</string>
11	<key>CFBundleIdentifier</key>	11	<key>CFBundleIdentifier</key>
12	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>	12	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
13	<key>CFBundleInfoDictionaryVersion</key>	13	<key>CFBundleInfoDictionaryVersion</key>
14	<string>6.0</string>	14	<string>6.0</string>
15	<key>CFBundleName</key>	15	<key>CFBundleName</key>
16	<string>$(PRODUCT_NAME)</string>	16	<string>$(PRODUCT_NAME)</string>
17	<key>CFBundlePackageType</key>	17	<key>CFBundlePackageType</key>
18	<string>APPL</string>	18	<string>APPL</string>
19	<key>CFBundleShortVersionString</key>	19	<key>CFBundleShortVersionString</key>
20	<string>1.0</string>	20	<string>1.0</string>
21	<key>CFBundleURLTypes</key>	21	<key>CFBundleURLTypes</key>
22	<array>	22	<array>
23	<dict/>	23	<dict/>
24	</array>	24	</array>
25	<key>CFBundleVersion</key>	25	<key>CFBundleVersion</key>
26	<string>4</string>	26	<string>5</string>
27	<key>LSApplicationQueriesSchemes</key>	27	<key>LSApplicationQueriesSchemes</key>
28	<array>	28	<array>
29	<string>line</string>	29	<string>line</string>
30	</array>	30	</array>
31	<key>LSRequiresIPhoneOS</key>	31	<key>LSRequiresIPhoneOS</key>
32	<true/>	32	<true/>
33	<key>NSAppTransportSecurity</key>	33	<key>NSAppTransportSecurity</key>
34	<dict>	34	<dict>
35	<key>NSAllowsArbitraryLoads</key>	35	<key>NSAllowsArbitraryLoads</key>
36	<true/>	36	<true/>
37	</dict>	37	</dict>
38	<key>NSCameraUsageDescription</key>	38	<key>NSCameraUsageDescription</key>
39	<string>to take photos and video</string>	39	<string>to take photos and video</string>
40	<key>NSLocationAlwaysUsageDescription</key>	40	<key>NSLocationAlwaysUsageDescription</key>
41	<string>This application requires location services to work</string>	41	<string>This application requires location services to work</string>
42	<key>NSLocationWhenInUseUsageDescription</key>	42	<key>NSLocationWhenInUseUsageDescription</key>
43	<string>This application requires location services to work</string>	43	<string>This application requires location services to work</string>
44	<key>NSMotionUsageDescription</key>	44	<key>NSMotionUsageDescription</key>
45	<string>$(PRODUCT_NAME) motion use</string>	45	<string>$(PRODUCT_NAME) motion use</string>
46	<key>NSPhotoLibraryUsageDescription</key>	46	<key>NSPhotoLibraryUsageDescription</key>
47	<string>to save photos and videos</string>	47	<string>to save photos and videos</string>
48	<key>UILaunchStoryboardName</key>	48	<key>UILaunchStoryboardName</key>
49	<string>LaunchScreen</string>	49	<string>LaunchScreen</string>
50	<key>UIRequiredDeviceCapabilities</key>	50	<key>UIRequiredDeviceCapabilities</key>
51	<array>	51	<array>
52	<string>armv7</string>	52	<string>armv7</string>
53	</array>	53	</array>
54	<key>UIStatusBarHidden</key>	54	<key>UIStatusBarHidden</key>
55	<true/>	55	<true/>
56	<key>UISupportedInterfaceOrientations</key>	56	<key>UISupportedInterfaceOrientations</key>
57	<array>	57	<array>
58	<string>UIInterfaceOrientationPortrait</string>	58	<string>UIInterfaceOrientationPortrait</string>
59	</array>	59	</array>
60	<key>UISupportedInterfaceOrientations~ipad</key>	60	<key>UISupportedInterfaceOrientations~ipad</key>
61	<array>	61	<array>
62	<string>UIInterfaceOrientationPortrait</string>	62	<string>UIInterfaceOrientationPortrait</string>
63	<string>UIInterfaceOrientationPortraitUpsideDown</string>	63	<string>UIInterfaceOrientationPortraitUpsideDown</string>
64	<string>UIInterfaceOrientationLandscapeLeft</string>	64	<string>UIInterfaceOrientationLandscapeLeft</string>
65	<string>UIInterfaceOrientationLandscapeRight</string>	65	<string>UIInterfaceOrientationLandscapeRight</string>
66	</array>	66	</array>
67	<key>UIViewControllerBasedStatusBarAppearance</key>	67	<key>UIViewControllerBasedStatusBarAppearance</key>
68	<false/>	68	<false/>
69	</dict>	69	</dict>
70	</plist>	70	</plist>
71		71

LifeLog/LifeLog/ServerAPI.h

Diff comments View file @ 3c80506

 //
 //  ServerAPI.h
 //  LifeLog
 //
 //  Created by Nguyen Van Phong on 7/30/17.
 //  Copyright © 2017 PhongNV. All rights reserved.
 //
 #import <Foundation/Foundation.h>
 #import "Entities.h"
 extern NSString *const kServerAddress;
 extern NSString *const kUser;
 extern NSString *const kToken;
 extern NSString *const kNotificationToken;
 @interface ServerAPI : NSObject
 + (instancetype) server;
 @property (nonatomic, assign) NSTimeInterval timeOutInterval;
 #pragma mark - Login and Register
 - (void)loginWithEmail:(NSString *)email Password:(NSString *)password CompletionHandler: (void (^)(User *, NSString *, NSError *)) completion;
 - (void)registerUserWithParams:(NSDictionary *)params CompletionHandler: (void (^)(User *, NSString *, NSError *)) completion;
 - (void)uploadImage:(NSString *)token andImageData:(NSData *)data CompletionHandler:(void (^)(NSString *, NSError *)) completion;
 - (void)forgetPass:(NSString *)email CompletionHandler:(void (^)(NSError *)) completion;
 - (void)confirmForgetPass:(NSString *)email withConfirm:(NSString *)confirm CompletionHandler:(void (^)(NSError *)) completion;
 #pragma mark - Home Screen Function
 - (void)requestTopWithMode:(int)mode andDate:(NSString *)date CompletionHandler:(void (^)(TopObject *, NSError *)) completion;
 - (void)requestCreateLog:(int)mode withStep:(int)numStep startDate:(NSString *)startDate endDate:(NSString *)endDate CompletionHandler:(void (^)(NSError *))completion;
 - (void)requestHomeWithMode:(int)mode andDate:(NSString *)date CompletionHandler:(void (^)(HomeObject *, NSError *)) completion;
 #pragma mark - History Screen Function
 - (void) requestHistory:(NSString *)token startDate:(NSDate *)startDate endDate:(NSDate *)endDate CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 - (void) requestHistoryList:(NSString *)token startDate:(NSDate *)startDate endDate:(NSDate *)endDate CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 - (void) requestJoinGroup:(NSString *)token groupID: (int) groupID CompletionHandler:(void (^)(NSError *)) completion;
 -(void) requestCreateGroup:(NSString *)token withGroup:(GroupObject *)group CompletionHandler:(void (^)(GroupObject *, NSError *)) completion;
 - (void) requestGroupList:(NSString *)token CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 #pragma mark - SNS Screen Function
 /*
     Get tweet of group and get recent tweet is same API
     If groupID equal -1, it will request recent tweet. Otherwise will request tweet of group
 */
 - (void) requestTweetsList:(NSString *)token groupID: (int) groupID withPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 - (void) searchGroup:(NSString *)token withKey:(NSString *)key andPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 #pragma mark - Group Function
 - (void) getGroupDetail:(NSString *)token withGroupID:(int)groupID CompletionHandler:(void (^)(GroupObject *, NSError *)) completion;
 - (void) requestMemberList:(NSString *)token groupID: (int) groupID withPage:(int)page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 #pragma mark - Ranking API
 - (void) requestRankingList:(NSString *)token startDate:(NSDate *)startDate endDate:(NSDate *)endDate mode:(int) mode page:(int) page CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 #pragma mark - Common API
 - (void)refreshToken: (NSString *)userID CompletionHandler:(void (^)(NSString *, NSError *))completion;
+#pragma mark - Get Notice
+- (void)getNoticeByDate: (NSString *)date CompletionHandler:(void (^)(NSArray *, NSError *)) completion;
 @end

LifeLog/LifeLog/ServerAPI.m

Diff comments View file @ 3c80506

1	//	1	//
2	// ServerAPI.m	2	// ServerAPI.m
3	// LifeLog	3	// LifeLog
4	//	4	//
5	// Created by Nguyen Van Phong on 7/30/17.	5	// Created by Nguyen Van Phong on 7/30/17.
6	// Copyright © 2017 PhongNV. All rights reserved.	6	// Copyright © 2017 PhongNV. All rights reserved.
7	//	7	//
8		8
9	#import "ServerAPI.h"	9	#import "ServerAPI.h"
10	#import "Utilities.h"	10	#import "Utilities.h"
11		11
12	NSString *const kServerAddress = @"http://clover.timesfun.jp:9001/";	12	NSString *const kServerAddress = @"http://clover.timesfun.jp:9001/";
13	NSString *const kUser = @"KEY_USER";	13	NSString *const kUser = @"KEY_USER";
14	NSString *const kToken = @"KEY_TOKEN";	14	NSString *const kToken = @"KEY_TOKEN";
15	NSString *const kNotificationToken = @"TOKEN_INVALID";	15	NSString *const kNotificationToken = @"TOKEN_INVALID";
16		16
17	@implementation NSString (NSString_Extended)	17	@implementation NSString (NSString_Extended)
18	- (NSString *)urlencode {	18	- (NSString *)urlencode {
19	NSMutableString *output = [NSMutableString string];	19	NSMutableString *output = [NSMutableString string];
20	const unsigned char source = (const unsigned char )[self UTF8String];	20	const unsigned char source = (const unsigned char )[self UTF8String];
21	int sourceLen = (int)strlen((const char *)source);	21	int sourceLen = (int)strlen((const char *)source);
22	for (int i = 0; i < sourceLen; ++i) {	22	for (int i = 0; i < sourceLen; ++i) {
23	const unsigned char thisChar = source[i];	23	const unsigned char thisChar = source[i];
24	if (thisChar == ' '){	24	if (thisChar == ' '){
25	[output appendString:@"+"];	25	[output appendString:@"+"];
26	} else if (thisChar == '.' \|\| thisChar == '-' \|\| thisChar == '_' \|\| thisChar == '~' \|\|	26	} else if (thisChar == '.' \|\| thisChar == '-' \|\| thisChar == '_' \|\| thisChar == '~' \|\|
27	(thisChar >= 'a' && thisChar <= 'z') \|\|	27	(thisChar >= 'a' && thisChar <= 'z') \|\|
28	(thisChar >= 'A' && thisChar <= 'Z') \|\|	28	(thisChar >= 'A' && thisChar <= 'Z') \|\|
29	(thisChar >= '0' && thisChar <= '9')) {	29	(thisChar >= '0' && thisChar <= '9')) {
30	[output appendFormat:@"%c", thisChar];	30	[output appendFormat:@"%c", thisChar];
31	} else {	31	} else {
32	[output appendFormat:@"%%%02X", thisChar];	32	[output appendFormat:@"%%%02X", thisChar];
33	}	33	}
34	}	34	}
35	return output;	35	return output;
36	}	36	}
37	@end	37	@end
38		38
39	@implementation ServerAPI	39	@implementation ServerAPI
40	static ServerAPI *_server = nil;	40	static ServerAPI *_server = nil;
41		41
42	NSURLSessionDataTask * searchTask;	42	NSURLSessionDataTask * searchTask;
43		43
44	@synthesize timeOutInterval = _timeOutInterval;	44	@synthesize timeOutInterval = _timeOutInterval;
45		45
46	+ (instancetype)server	46	+ (instancetype)server
47	{	47	{
48	@synchronized(self) {	48	@synchronized(self) {
49	if (_server == nil) {	49	if (_server == nil) {
50	_server = [[ServerAPI alloc] init];	50	_server = [[ServerAPI alloc] init];
51	}	51	}
52	}	52	}
53	return _server;	53	return _server;
54	}	54	}
55		55
56	- (instancetype)init	56	- (instancetype)init
57	{	57