From 39b57938e7152a39e55db776201105a82928504a Mon Sep 17 00:00:00 2001 From: phongnv Date: Wed, 30 Aug 2017 01:51:13 +0700 Subject: [PATCH] update api Top --- LifeLog/LifeLog/HomeViewController.m | 37 +++++++++++++++++++++++++++--------- LifeLog/LifeLog/TargetInfor.h | 8 ++++---- LifeLog/LifeLog/TargetInfor.m | 8 ++++---- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/LifeLog/LifeLog/HomeViewController.m b/LifeLog/LifeLog/HomeViewController.m index f0f6f01..05053b3 100644 --- a/LifeLog/LifeLog/HomeViewController.m +++ b/LifeLog/LifeLog/HomeViewController.m @@ -117,14 +117,15 @@ static NSInteger numberTotal = 10000; - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; [self saveStepForDay:self.dateCurrent]; - [self requestTopByDate:_dateCurrent]; + [self requestTopByDate:self.dateCurrent]; } - (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) { @@ -149,6 +150,9 @@ static NSInteger numberTotal = 10000; } if (error == nil) { NSLog(@"TopObject: %@", topObject); + dispatch_async(dispatch_get_main_queue(), ^{ + [weakSelf updateStepUI:topObject.targetInfor]; + }); } else { dispatch_async(dispatch_get_main_queue(), ^{ @@ -156,6 +160,9 @@ static NSInteger numberTotal = 10000; [Utilities showErrorMessage:message withViewController:weakSelf]; }); } + dispatch_async(dispatch_get_main_queue(), ^{ + [progressHud setHidden:YES]; + }); }]; } @@ -185,6 +192,7 @@ static NSInteger numberTotal = 10000; 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 saveStepForDay:self.dateCurrent]; + [self requestTopByDate:self.dateCurrent]; } - (IBAction)rightButtonTouchUpInside:(id)sender @@ -192,18 +200,20 @@ static NSInteger numberTotal = 10000; 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 saveStepForDay:self.dateCurrent]; + [self requestTopByDate:self.dateCurrent]; } - (IBAction)segmentValueChange:(id)sender { - [self updateStepUI]; + // [self updateStepUI]; + [self requestTopByDate:self.dateCurrent]; } #pragma mark - Functions Private - (void)saveStepForDay:(NSDate *)date { if ([CMMotionActivityManager isActivityAvailable]) { - [progressHud showAnimated:YES]; - [progressHud setHidden:NO]; +// [progressHud showAnimated:YES]; +// [progressHud setHidden:NO]; self.bike = 0; self.walking = 0; self.running = 0; @@ -286,14 +296,15 @@ static NSInteger numberTotal = 10000; }]; }); } - else { - [progressHud setHidden:YES]; - } +// else { +// [progressHud setHidden:YES]; +// } } - (void)updateStepUI { if (self.totalRequest == self.countComplete) { + /* switch (self.segmentHome.selectedSegmentIndex) { case 0: self.lblValueStep.text = [Utilities addCommaFromNumber:self.bike]; @@ -316,9 +327,10 @@ static NSInteger numberTotal = 10000; default: break; } + */ self.countComplete = 0; self.totalRequest = 0; - [progressHud setHidden:YES]; + //[progressHud setHidden:YES]; } } @@ -400,4 +412,11 @@ static NSInteger numberTotal = 10000; } } +- (void)updateStepUI:(TargetInfor *)targetInfor +{ + 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)]; +} + @end diff --git a/LifeLog/LifeLog/TargetInfor.h b/LifeLog/LifeLog/TargetInfor.h index cfa59cb..fd54f89 100644 --- a/LifeLog/LifeLog/TargetInfor.h +++ b/LifeLog/LifeLog/TargetInfor.h @@ -9,9 +9,9 @@ #import @interface TargetInfor : NSObject -@property (nonatomic) int target_step; -@property (nonatomic) int num_step; -@property (nonatomic) int remaining_step; -@property (nonatomic) float complete_percent; +@property (nonatomic, strong) NSString *target_step; +@property (nonatomic, strong) NSString *num_step; +@property (nonatomic, strong) NSString *remaining_step; +@property (nonatomic, strong) NSString *complete_percent; -(id) initWithData : (NSDictionary *) dict; @end diff --git a/LifeLog/LifeLog/TargetInfor.m b/LifeLog/LifeLog/TargetInfor.m index ecacdf8..976c8cd 100644 --- a/LifeLog/LifeLog/TargetInfor.m +++ b/LifeLog/LifeLog/TargetInfor.m @@ -11,16 +11,16 @@ @implementation TargetInfor -(id) initWithData : (NSDictionary *) dict { if([dict objectForKey:@"target_step"] != nil) { - self.target_step = [dict[@"target_step"] intValue]; + self.target_step = dict[@"target_step"]; } if([dict objectForKey:@"num_step"] != nil) { - self.num_step = [dict[@"num_step"] intValue]; + self.num_step = dict[@"num_step"]; } if([dict objectForKey:@"remaining_step"] != nil) { - self.remaining_step = [dict[@"remaining_step"] intValue]; + self.remaining_step = dict[@"remaining_step"]; } if([dict objectForKey:@"complete_percent"] != nil) { - self.complete_percent = [dict[@"complete_percent"] floatValue]; + self.complete_percent = dict[@"complete_percent"]; } return self; } -- 1.8.5.3