日期格式转换

Podfile

@@ -8,6 +8,6 @@ pod 'SSKeychain', '~> 1.2.3'
 pod 'FMDB', '~> 2.5'
 pod 'Base64nl', '~> 1.2'
 pod 'Reveal-iOS-SDK', '~> 1.5.1'
-pod 'BaiduMapAPI', '~> 2.8.0’
+pod 'BaiduMapAPI', '~> 2.8.1’
 pod 'MJRefresh', '~> 2.2.0'
 pod 'IQKeyboardManager', '~> 3.2.3'

Podfile.lock

@@ -20,14 +20,11 @@ PODS:
   - AFNetworking/UIKit (2.5.4):
     - AFNetworking/NSURLConnection
     - AFNetworking/NSURLSession
-  - BaiduMapAPI (2.8.0):
-    - BaiduMapAPI/All (= 2.8.0)
-  - BaiduMapAPI/All (2.8.0):
-    - BaiduMapAPI/Core
-    - BaiduMapAPI/Extend
-  - BaiduMapAPI/Core (2.8.0)
-  - BaiduMapAPI/Extend (2.8.0):
-    - BaiduMapAPI/Core
+  - BaiduMapAPI (2.8.1):
+    - BaiduMapAPI/Default (= 2.8.1)
+  - BaiduMapAPI/Default (2.8.1):
+    - BaiduMapAPI/Universal
+  - BaiduMapAPI/Universal (2.8.1)
   - Base64nl (1.2)
   - FMDB (2.5):
     - FMDB/standard (= 2.5)
@@ -45,7 +42,7 @@ PODS:
 
 DEPENDENCIES:
   - AFNetworking (~> 2.5.4)
-  - BaiduMapAPI (~> 2.8.0)
+  - BaiduMapAPI (~> 2.8.1)
   - Base64nl (~> 1.2)
   - FMDB (~> 2.5)
   - IQKeyboardManager (~> 3.2.3)
@@ -57,7 +54,7 @@ DEPENDENCIES:
 
 SPEC CHECKSUMS:
   AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
-  BaiduMapAPI: e066aa1e85f9fee77a1bc071afb67552852bb0fb
+  BaiduMapAPI: 2d03e12a51d5c6c49ece555c6bdda8562635cc02
   Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
   FMDB: 96e8f1bcc1329e269330f99770ad4285d9003e52
   IQKeyboardManager: 555b1231fefafb21b19278d7cca72986a27b748b

XFFruit/AppDelegate/ICRAppDelegate.m

@@ -133,22 +133,10 @@
                 alertV.tag = 1002;
                 [alertV show];
             }
-
-            
-            
-        }else{
-            [IBTLoadingView showProgressLabel:@"暂无新版本"];
-            [self performSelector:@selector(scale_2) withObject:nil afterDelay:1.5f];
-            
-           
-
         }
     }
 }
--(void)scale_2
-{
-  [IBTLoadingView hideHUDWithText:nil];
-}
+
 - (void) alertView:(UIAlertView *)alertView
 clickedButtonAtIndex:(NSInteger)buttonIndex {
     if (alertView.tag==1001) {

XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m

@@ -541,7 +541,7 @@ typedef enum : NSUInteger {
     if (!_startTimeView) {
         NSString *currentStr  = @"";
         if ([_finishDateLabel.text isEqualToString:@"选择要求完成日期"] || _finishDateLabel.text.length < 1) {
-            currentStr = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd HH:mm"];
+            currentStr = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd HH:mm:ss"];
         }else{
             currentStr = _finishDateLabel.text;
         }
@@ -566,7 +566,9 @@ typedef enum : NSUInteger {
 - (void)okTimeView:(NSString *)time{
     
     _finishDateLabel.textColor = GXF_CONTENT_COLOR;
-    _finishDateLabel.text = time;
+    if (time.length > 15) {
+        _finishDateLabel.text = [time substringToIndex:16];
+    }
     self.finishDateStr = time;
     // 关闭选择器
     [self clearDatePickView];

XFFruit/ViewControllers/Survey/Views/FinishTimeView.m

@@ -303,9 +303,9 @@
     NSArray *array2 = [NSArray arrayWithObjects:hour,minute, nil];
     NSString *date1 = [array1 componentsJoinedByString:@"-"];
     NSString *date2 = [array2 componentsJoinedByString:@":"];
-    NSString *date = [NSString stringWithFormat:@"%@ %@",date1,date2];
+    NSString *date = [NSString stringWithFormat:@"%@ %@:00",date1,date2];
     NSDateFormatter *formatter = [[NSDateFormatter alloc]init];
-    formatter.dateFormat = @"yyyy-MM-dd HH:mm";
+    formatter.dateFormat = @"yyyy-MM-dd HH:mm:ss";
     
     return [formatter stringFromDate:[formatter dateFromString:date]];
     

XFFruit/ViewControllers/Transfer/Views/TopTransferView.m

@@ -272,7 +272,9 @@
 - (void)okTimeView:(NSString *)time{
     
     _arriveDateLabel.textColor = GXF_CONTENT_COLOR;
-    _arriveDateLabel.text = time;
+    if (time.length > 15) {
+        _arriveDateLabel.text = [time substringToIndex:16];
+    }
     self.arriveDate = time;
     // 关闭选择器
     [self clearDatePickView];

XFFruit/ViewControllers/Transport/Views/TopTransportView.m

@@ -247,7 +247,7 @@
     if (!self.startTimeView) {
         NSString *currentStr  = @"";
         if ([self.arriveDateLabel.text isEqualToString:@"选择预计到货时间"] || self.arriveDateLabel.text.length < 1) {
-            currentStr = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd HH:mm"];
+            currentStr = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd HH:mm:ss"];
         }else{
             currentStr = self.arriveDateLabel.text;
         }
@@ -271,7 +271,9 @@
 - (void)okTimeView:(NSString *)time{
     
     _arriveDateLabel.textColor = GXF_CONTENT_COLOR;
-    _arriveDateLabel.text = time;
+    if (time.length > 15) {
+        _arriveDateLabel.text = [time substringToIndex:16];
+    }
     self.arriveDate = time;
     // 关闭选择器
     [self clearDatePickView];