From 73a5aaa681b81bf66f6f739e66489b4a02007bca Mon Sep 17 00:00:00 2001
From: nvtu <nvtu11790@gmail.com>
Date: Mon, 21 Aug 2017 11:42:43 +0700
Subject: [PATCH] Fix check null of result from History API, add some function
 to convert seconds to string, add other share

---
 LifeLog/LifeLog/HistoryObject.h           |  2 +-
 LifeLog/LifeLog/HistoryObject.m           |  9 ++-------
 LifeLog/LifeLog/HistoryViewController.m   | 19 +++++++++++--------
 LifeLog/LifeLog/HistoryViewController.xib | 20 ++++++++++----------
 LifeLog/LifeLog/ServerAPI.m               |  2 +-
 LifeLog/LifeLog/Utilities.h               |  3 +++
 LifeLog/LifeLog/Utilities.m               | 19 +++++++++++++++++++
 7 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/LifeLog/LifeLog/HistoryObject.h b/LifeLog/LifeLog/HistoryObject.h
index b483f3f..7fbb964 100644
--- a/LifeLog/LifeLog/HistoryObject.h
+++ b/LifeLog/LifeLog/HistoryObject.h
@@ -13,10 +13,10 @@
 @property (nonatomic) int step;
 @property (nonatomic) int missing;
 @property (nonatomic) int target;
+@property (nonatomic) int time;
 @property (nonatomic) float percent;
 @property (nonatomic) float distance;
 @property (nonatomic) float calories;
-@property (nonatomic, strong) NSString * time;
 @property (nonatomic, strong) NSDate *date;
 @property (nonatomic, strong) NSMutableArray *dataGraph;
 
diff --git a/LifeLog/LifeLog/HistoryObject.m b/LifeLog/LifeLog/HistoryObject.m
index 1e498af..a4975a8 100644
--- a/LifeLog/LifeLog/HistoryObject.m
+++ b/LifeLog/LifeLog/HistoryObject.m
@@ -12,7 +12,7 @@
 
 -(id) initWithData : (NSDictionary *) dict {
     if([dict objectForKey:@"steps"] != nil) {
-        self.step = [dict[@"step"] intValue];
+        self.step = [dict[@"steps"] intValue];
     }
     if([dict objectForKey:@"target"] != nil) {
         self.target = [dict[@"target"] intValue];
@@ -36,12 +36,7 @@
         self.calories = [dict[@"kcal"] floatValue];
     }
     if([dict objectForKey:@"time"] != nil) {
-        if([dict[@"time"] isKindOfClass:[NSString class]]) {
-            self.time = dict[@"time"];
-        }
-        else {
-            self.time = @"0:0";
-        }
+        self.time = [dict[@"time"] intValue];
     }
     if([dict objectForKey:@"date"] != nil) {
         NSString *dateString = dict[@"date"];
diff --git a/LifeLog/LifeLog/HistoryViewController.m b/LifeLog/LifeLog/HistoryViewController.m
index ed96bf0..76908e2 100644
--- a/LifeLog/LifeLog/HistoryViewController.m
+++ b/LifeLog/LifeLog/HistoryViewController.m
@@ -106,12 +106,14 @@
 
 -(void) updateView {
     HistoryObject * obj = [_curHisArray objectAtIndex:self.viewCollectionMode.getCurrentIndex];
-    self.lblStep.text = [NSString stringWithFormat:@"%d", obj.step];
-    self.lblRemaining.text = [NSString stringWithFormat:@"%d", obj.missing];
-    self.lblPercent.text = [NSString stringWithFormat:@"%0.2f", obj.percent * 100];
-    self.lblCalories.text = [NSString stringWithFormat:@"%0.2f", obj.calories];
-    self.lblDistance.text = [NSString stringWithFormat:@"%0.1f", obj.distance];
-    self.lblTime.text = obj.time;
+    self.lblStep.text = [NSString stringWithFormat:@"%d step", obj.step];
+    self.lblCircleStep.text = self.lblStep.text;
+    self.lblRemaining.text = [NSString stringWithFormat:@"%d step", obj.missing];
+    self.lblCircleRemain.text = [NSString stringWithFormat:@"目標まであと\n%d stepです", obj.missing];
+    self.lblPercent.text = [NSString stringWithFormat:@"%0.2f%%", obj.percent];
+    self.lblCalories.text = [NSString stringWithFormat:@"%0.2f kcal", obj.calories];
+    self.lblDistance.text = [NSString stringWithFormat:@"%0.1f KM", obj.distance];
+    self.lblTime.text = [Utilities convertSecondToShortTime:obj.time];
     [self updateGraphView];
 }
 
@@ -262,7 +264,8 @@
             case 3: // share email
                 [Utilities shareEmail:content withViewController:weakSelf];
                 break;
-            default:
+            default: //share other
+                [Utilities shareOther:content withViewController:weakSelf];
                 break;
         }
     }
@@ -275,7 +278,7 @@
     cell.lblStep.text = [NSString stringWithFormat:@"%d", obj.step];
     cell.lblPower.text = [NSString stringWithFormat:@"%0.2f", obj.calories];
     cell.lblDistance.text = [NSString stringWithFormat:@"%0.1f", obj.distance];
-    cell.lblDuration.text = obj.time;
+    cell.lblDuration.text = [Utilities convertSecondToShortTime:obj.time];
     return cell;
 }
 
diff --git a/LifeLog/LifeLog/HistoryViewController.xib b/LifeLog/LifeLog/HistoryViewController.xib
index 70589f6..e5208af 100644
--- a/LifeLog/LifeLog/HistoryViewController.xib
+++ b/LifeLog/LifeLog/HistoryViewController.xib
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -154,7 +154,7 @@
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kzk-mN-AOf">
                                             <rect key="frame" x="20" y="30" width="120" height="120"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="500 step" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oWg-A8-aCr">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 step" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oWg-A8-aCr">
                                                     <rect key="frame" x="18" y="35" width="82" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="zOX-0d-IVv"/>
@@ -170,7 +170,7 @@
                                                         <constraint firstAttribute="height" constant="42" id="zRP-Fu-qZ9"/>
                                                     </constraints>
                                                     <string key="text">目標まであと
-500 stepです</string>
+0 stepです</string>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -226,7 +226,7 @@
                                                         <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.history.title.percent"/>
                                                     </userDefinedRuntimeAttributes>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1000 step" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0pf-fX-QXT">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 step" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0pf-fX-QXT">
                                                     <rect key="frame" x="63" y="38" width="118" height="15"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="15" id="Z6o-LI-Eu9"/>
@@ -235,13 +235,13 @@
                                                     <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="500 step" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1NH-b3-ST8">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 step" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1NH-b3-ST8">
                                                     <rect key="frame" x="63" y="53" width="118" height="15"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <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="50  %" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ru-Jc-Ouv">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0  %" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ru-Jc-Ouv">
                                                     <rect key="frame" x="63" y="68" width="118" height="15"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -293,7 +293,7 @@
                                                                 <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.history.title.calories"/>
                                                             </userDefinedRuntimeAttributes>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1000 kcal" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dAE-C8-QLr">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 kcal" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dAE-C8-QLr">
                                                             <rect key="frame" x="0.0" y="17" width="111.5" height="18"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="18" id="r0d-xi-3u7"/>
@@ -328,7 +328,7 @@
                                                                 <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.history.title.distance"/>
                                                             </userDefinedRuntimeAttributes>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4.0 KM" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1tR-JC-pyw">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0.0 KM" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1tR-JC-pyw">
                                                             <rect key="frame" x="0.0" y="17" width="112" height="18"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="18" id="sNT-xl-BKH"/>
@@ -363,7 +363,7 @@
                                                                 <userDefinedRuntimeAttribute type="string" keyPath="localizeKey" value="lifelog.history.title.time"/>
                                                             </userDefinedRuntimeAttributes>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1:00 時間" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PfZ-7x-LAR">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="00:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PfZ-7x-LAR">
                                                             <rect key="frame" x="0.0" y="17" width="111.5" height="18"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="18" id="lno-Dx-ZNm"/>
diff --git a/LifeLog/LifeLog/ServerAPI.m b/LifeLog/LifeLog/ServerAPI.m
index 79e6acb..c7e0b1d 100644
--- a/LifeLog/LifeLog/ServerAPI.m
+++ b/LifeLog/LifeLog/ServerAPI.m
@@ -428,7 +428,7 @@ NSURLSessionDataTask * searchTask;
                     NSArray *arrayKey = [NSArray arrayWithObjects:@"mode_1", @"mode_2", @"mode_3", nil];
                     for(NSString * key in arrayKey) {
                         NSDictionary *mode = [arrResult objectForKey:key];
-                        if(mode.count > 0) {
+                        if(![[arrResult objectForKey:key] isKindOfClass:[NSNull class]]) {
                             HistoryObject * objectMode = [[HistoryObject alloc] initWithData:mode];
                             [arrayHistory addObject:objectMode];
                         }
diff --git a/LifeLog/LifeLog/Utilities.h b/LifeLog/LifeLog/Utilities.h
index c8846af..a68a5cb 100644
--- a/LifeLog/LifeLog/Utilities.h
+++ b/LifeLog/LifeLog/Utilities.h
@@ -21,8 +21,11 @@
 + (void) shareTwitter : (NSString *) content withViewController:(UIViewController *)vc;
 + (void) shareLine : (NSString *) content withViewController:(UIViewController *)vc;
 + (void) shareEmail : (NSString *) content withViewController:(UIViewController *)vc;
++ (void) shareOther : (NSString *) content withViewController:(UIViewController *)vc;
 
 //convert date time
 + (NSDate *) dateFromString : (NSString *) dateString withFormat: (NSString *) format;
 + (NSString *) stringFromDate : (NSDate *) date withFormat: (NSString *) format locale:(NSString *) locale;
++ (NSString *) convertSecondToShortTime : (int) seconds;
++ (NSString *) convertSecondToLongTime : (int) seconds;
 @end
diff --git a/LifeLog/LifeLog/Utilities.m b/LifeLog/LifeLog/Utilities.m
index 169056c..cc6772d 100644
--- a/LifeLog/LifeLog/Utilities.m
+++ b/LifeLog/LifeLog/Utilities.m
@@ -146,6 +146,12 @@
     [[UIApplication sharedApplication]  openURL: [NSURL URLWithString: urlEmail]];
 }
 
++ (void) shareOther : (NSString *) content withViewController:(UIViewController *)vc {
+    NSArray *items = @[content];
+    UIActivityViewController *controller = [[UIActivityViewController alloc]initWithActivityItems:items applicationActivities:nil];
+    [vc presentViewController:controller animated:true completion:nil];
+}
+
 #pragma mark convert date time
 + (NSDate *) dateFromString : (NSString *) dateString withFormat: (NSString *) format {
     NSDateFormatter *dateFormat = [[NSDateFormatter alloc] init];
@@ -167,4 +173,17 @@
     return dateString;
 }
 
++ (NSString *) convertSecondToShortTime : (int) seconds {
+    int hour = seconds / 3600;
+    int minutes = (seconds - hour * 3600) / 60;
+    return [NSString stringWithFormat:@"%02d:%02d", hour, minutes];
+}
+
++ (NSString *) convertSecondToLongTime : (int) seconds {
+    int hour = seconds / 3600;
+    int minutes = (seconds - hour * 3600) / 60;
+    int sec = seconds - hour * 3600 - minutes * 60;
+    return [NSString stringWithFormat:@"%02d:%02d:%02d", hour, minutes, sec];
+}
+
 @end
-- 
1.8.5.3