Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001

XFFruit.xcodeproj/project.pbxproj

@@ -122,6 +122,7 @@
 		724171721B9D30660094DF55 /* ChooseWarehouseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7241716C1B9D30660094DF55 /* ChooseWarehouseViewController.m */; };
 		724171731B9D30660094DF55 /* ChosePersonViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7241716E1B9D30660094DF55 /* ChosePersonViewController.m */; };
 		724171761B9D30DE0094DF55 /* ChooseCostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 724171751B9D30DE0094DF55 /* ChooseCostViewController.m */; };
+		7249BDD71BE794640059EB8C /* FinishTimeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7249BDD61BE794640059EB8C /* FinishTimeView.m */; settings = {ASSET_TAGS = (); }; };
 		726F4C6D1BDE5F83006A5E6D /* RejectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F4C6C1BDE5F83006A5E6D /* RejectView.m */; };
 		72805CF31BB8E1B0009E1F82 /* TransferViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72805CF21BB8E1B0009E1F82 /* TransferViewController.m */; };
 		72805CF61BB8E20B009E1F82 /* NewTransferViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72805CF51BB8E20B009E1F82 /* NewTransferViewController.m */; };
@@ -663,6 +664,8 @@
 		7241716E1B9D30660094DF55 /* ChosePersonViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChosePersonViewController.m; sourceTree = "<group>"; };
 		724171741B9D30DE0094DF55 /* ChooseCostViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseCostViewController.h; sourceTree = "<group>"; };
 		724171751B9D30DE0094DF55 /* ChooseCostViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseCostViewController.m; sourceTree = "<group>"; };
+		7249BDD51BE794640059EB8C /* FinishTimeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FinishTimeView.h; sourceTree = "<group>"; };
+		7249BDD61BE794640059EB8C /* FinishTimeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FinishTimeView.m; sourceTree = "<group>"; };
 		726F4C6B1BDE5F83006A5E6D /* RejectView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RejectView.h; sourceTree = "<group>"; };
 		726F4C6C1BDE5F83006A5E6D /* RejectView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RejectView.m; sourceTree = "<group>"; };
 		72805CF11BB8E1B0009E1F82 /* TransferViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransferViewController.h; sourceTree = "<group>"; };
@@ -1403,6 +1406,8 @@
 				FE2FCC8A1B74A9EE00BBC6FB /* SurveyResultCell.m */,
 				FEAE16E71B79C9F9009D9E01 /* ResultView.h */,
 				FEAE16E81B79C9F9009D9E01 /* ResultView.m */,
+				7249BDD51BE794640059EB8C /* FinishTimeView.h */,
+				7249BDD61BE794640059EB8C /* FinishTimeView.m */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -2905,6 +2910,7 @@
 				C17DE85A1AD81D1600581AA6 /* NSMutableArray+SafeInsert.m in Sources */,
 				721B5DB61BA02A2B006CA199 /* GXFProcessMaterial.m in Sources */,
 				35C3C0B91AE9567B0035AC8A /* ICRNavigationViewController.mm in Sources */,
+				7249BDD71BE794640059EB8C /* FinishTimeView.m in Sources */,
 				35321F6A1B97EF3600E5C670 /* GXFPopNewProductViewController.m in Sources */,
 				C123A8FB1B2561E1003C0C36 /* JTPopOverWindow.m in Sources */,
 				72F56CB21B76EC200077F0C9 /* SurveyUser.m in Sources */,

XFFruit/AppDelegate/ICRAppDelegate.m

@@ -35,7 +35,8 @@
     NSString * path = [NSSearchPathForDirectoriesInDomains(NSDocumentationDirectory, NSUserDomainMask, YES) lastObject];
     CLog(@"%@",path);
     
-    
+    [self enterpriseUpdate];
+
     // Required
 #if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_7_1
     if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
@@ -66,7 +67,6 @@
     [self setupBMKMapMgr];
     _m_appViewControllerMgr = [ICRAppViewControllerManager getAppViewControllerManager];
 #pragma 版本更新
-    [self enterpriseUpdate];
     [self.window makeKeyAndVisible];
     return YES;
 }
@@ -96,13 +96,11 @@
                 NSDictionary *dictData = data[@"data"];
                 NSString*serverVeision=[dictData objectForKey:@"version"];
                 NSString*serverUrl=[dictData objectForKey:@"url"];
-                BOOL forceUpdate=[dictData objectForKey:@"forceUpdate"];
+                BOOL forceUpdate= [dictData objectForKey:@"forceUpdate"];
                 self.severVersion=serverVeision;
                 self.severUrl=serverUrl;
                 self.severForceUpdate=forceUpdate;
                 [strongSelf  comperVersion];
-                
-                
             }else{
                 [IBTLoadingView showTips:message];
             }
@@ -120,33 +118,29 @@
 //比较版本号及是否下载
 -(void)comperVersion
 {
-    NSComparisonResult comResult = [self p_compareVersions: self.version betweenVersion2:self.severVersion];
-    
-    if (comResult == NSOrderedAscending) {
-        //299企业版的更新  @"有新的版本可供下载"
-        //    NSOrderedAscending  self.version<self.severVersion
-        //    NSOrderedDescending self.version>self.severVersion
-        //    NSOrderedSame  self.version==self.severVersion
-        if (self.severForceUpdate) {
-            //强制更新
-//            UIAlertView *alertV = [[UIAlertView alloc]initWithTitle:@"新版本告知" message:  @"有新版本发布请您下载最新版本" delegate:self cancelButtonTitle:nil otherButtonTitles: @"去下载", nil];
-//            alertV.tag = 1001;
-//            [alertV show];
-        }else
-        {
-            UIAlertView *alertV = [[UIAlertView alloc]initWithTitle:@"新版本告知" message:  @"有新版本发布请您下载最新版本" delegate:self cancelButtonTitle:@"下次再说"otherButtonTitles: @"去下载", nil];//
-            alertV.tag = 1002;
-            [alertV show];
-        }
-        
-        
-    }else{
-        [IBTLoadingView showProgressLabel:@"暂无新版本"];
+    if (self.version && self.severVersion) {
+        NSComparisonResult comResult = [self p_compareVersions: self.version betweenVersion2:self.severVersion];
         
+        if (comResult == NSOrderedAscending) {
+            if (self.severForceUpdate) {
+                //强制更新
+                UIAlertView *alertV = [[UIAlertView alloc]initWithTitle:@"新版本告知" message:  @"有新版本发布请您下载最新版本" delegate:self cancelButtonTitle:nil otherButtonTitles: @"去下载", nil];
+                alertV.tag = 1001;
+                [alertV show];
+            }else
+            {
+                UIAlertView *alertV = [[UIAlertView alloc]initWithTitle:@"新版本告知" message:  @"有新版本发布请您下载最新版本" delegate:self cancelButtonTitle:@"下次再说"otherButtonTitles: @"去下载", nil];//
+                alertV.tag = 1002;
+                [alertV show];
+            }
+            
+            
+        }else{
+            [IBTLoadingView showProgressLabel:@"暂无新版本"];
+            
+        }
+ 
     }
-    
-    
-    
 }
 - (void) alertView:(UIAlertView *)alertView
 clickedButtonAtIndex:(NSInteger)buttonIndex {

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -243,7 +243,7 @@ static NSString * const ICRHTTPInterface[] = {
     //收货
     [XFFHttp_SaveRctinfo]                   =@"transfer/save_rctinfo",
     [XFFHttp_SaveReceipt]                   =@"transfer/receipt",
-    [XFFHttp_getVersionId]     = @"rest/ipapk",
+    [XFFHttp_getVersionId]                  =@"ipapk",
 
 };
 
@@ -2944,7 +2944,7 @@ acceptTypeJson:YES
         }
     };
     
-    NSString *urlStr = [NSString stringWithFormat:@"%@/%@?type=%@",Server_Url,ICRHTTPInterface[XFFHttp_getVersionId],type];
+    NSString *urlStr = [NSString stringWithFormat:@"%@/%@?type=%@",HTTP_REST_API_BASE_URL,ICRHTTPInterface[XFFHttp_getVersionId],type];
     NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     
     [self GET:encodeUrlStr

XFFruit/Macro/ICRAppMacro.h

@@ -24,14 +24,9 @@
 
 //阿里云内部测试环境
 //#define HTTP_REST_API_BASE_URL  @"http://218.244.151.129:7580/cruiser-server/rest"
-#define Server_Url  @"http://218.244.151.129:7580/cruiser-server"
 
 //现场测试环境
 #define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7280/cruiser-server/rest"
-//#define Server_Url   @"http://122.224.171.126:7280/cruiser-server"
-
-
-
 
 
 // HTTP

XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m

@@ -16,7 +16,7 @@
 #import "PurchaseNoticeCell.h"
 #import "NoticeProductViewController.h"
 #import "NoticeProduct.h"
-#import "StartTimeView.h"
+#import "FinishTimeView.h"
 #import "PurchaseBillProduct.h"
 #define LeftMargin 15
 #define LeftWidth 40
@@ -38,7 +38,7 @@ typedef enum : NSUInteger {
     SaveTag = 8000,
     CommitTag,
 } BtnTag;
-@interface NewPurchaseNoticeViewController()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate,HPGrowingTextViewDelegate,UIAlertViewDelegate,StartTimeViewDelegate>
+@interface NewPurchaseNoticeViewController()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate,HPGrowingTextViewDelegate,UIAlertViewDelegate,FinishTimeViewDelegate>
 {
     NSString *_clickState;
     UITableView *_tableView;
@@ -55,7 +55,7 @@ typedef enum : NSUInteger {
     id billNumberObject;
     NSNumber *versionObject;
     NSString *title;
-    StartTimeView *_startTimeView;
+    FinishTimeView *_startTimeView;
     
 }
 @property (nonatomic,strong)NSString *titleStr;
@@ -539,7 +539,14 @@ typedef enum : NSUInteger {
 }
 - (void)startDatePickView{
     if (!_startTimeView) {
-        _startTimeView = [[StartTimeView alloc] initWithFrame:CGRectMake(0, ScreenSize.height, ScreenSize.width, ScreenSize.height - 64) withMode:UIDatePickerModeDateAndTime];
+        NSString *currentStr  = @"";
+        if ([_finishDateLabel.text isEqualToString:@"选择要求完成日期"] || _finishDateLabel.text.length < 1) {
+            currentStr = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd HH:mm"];
+        }else{
+            currentStr = _finishDateLabel.text;
+        }
+        
+        _startTimeView = [[FinishTimeView alloc] initWithFrame:CGRectMake(0, ScreenSize.height, ScreenSize.width, ScreenSize.height - 64) withDate:currentStr];
         _startTimeView.delegate = self;
         _startTimeView.backgroundColor        = RGBA(0, 0, 0 ,0.5);
         [self.view addSubview:_startTimeView];
@@ -556,11 +563,11 @@ typedef enum : NSUInteger {
 - (void)cancelTimeView{
     [self clearDatePickView];
 }
-- (void)okTimeView:(NSDate *)time{
+- (void)okTimeView:(NSString *)time{
     
     _finishDateLabel.textColor = GXF_CONTENT_COLOR;
-    _finishDateLabel.text = [IBTCommon stringFromDateWithFormat:time format:@"yyyy-MM-dd HH:mm"];
-    self.finishDateStr = [time httpParameterString];
+    _finishDateLabel.text = time;
+    self.finishDateStr = time;
     // 关闭选择器
     [self clearDatePickView];
 }

XFFruit/ViewControllers/Survey/Views/FinishTimeView.h

+//
+//  FinishTimeView.h
+//  XFFruit
+//
+//  Created by 陈俊俊 on 15/11/2.
+//  Copyright © 2015年 Xummer. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+@protocol FinishTimeViewDelegate <NSObject>
+
+- (void)cancelTimeView;
+- (void)okTimeView:(NSString *)time;
+
+@end
+
+@interface FinishTimeView : UIView<UIPickerViewDataSource,UIPickerViewDelegate>
+@property (nonatomic,weak)id<FinishTimeViewDelegate>delegate;
+- (instancetype)initWithFrame:(CGRect)frame withDate:(NSString *)dateStr;
+@end

XFFruit/ViewControllers/Survey/Views/StartTimeView.h

@@ -17,6 +17,5 @@
 
 @interface StartTimeView : UIView
 @property (nonatomic,weak)id<StartTimeViewDelegate>delegate;
-- (instancetype)initWithFrame:(CGRect)frame withMode:(UIDatePickerMode)timeMode
-;
+- (instancetype)initWithFrame:(CGRect)frame withDate:(NSDate *)currentDate;
 @end

XFFruit/ViewControllers/Survey/Views/StartTimeView.m

@@ -13,7 +13,7 @@
     UIView *_bgView;
     UIDatePicker *_timePicker;
 }
-@property (nonatomic,assign)UIDatePickerMode timeMode;
+@property (nonatomic,strong)NSDate *currentDate;
 @end
 
 @implementation StartTimeView
@@ -21,16 +21,15 @@
 {
     self = [super initWithFrame:frame];
     if (self) {
-        self.timeMode = UIDatePickerModeDate;
         [self bulidLayout];
     }
     return self;
 }
-- (instancetype)initWithFrame:(CGRect)frame withMode:(UIDatePickerMode)timeMode
+- (instancetype)initWithFrame:(CGRect)frame withDate:(NSDate *)currentDate
 {
     self = [super initWithFrame:frame];
     if (self) {
-        self.timeMode = timeMode;
+        self.currentDate = currentDate;
         [self bulidLayout];
     }
     return self;
@@ -48,7 +47,8 @@
     
     _timePicker= [[UIDatePicker alloc] initWithFrame:CGRectMake(0, 30,ScreenSize.width, DateViewHeight - 30)];
     _timePicker.backgroundColor  = [UIColor whiteColor];
-    _timePicker.datePickerMode   = self.timeMode;
+    _timePicker.date = self.currentDate;
+    _timePicker.datePickerMode = UIDatePickerModeDate;
     _timePicker.locale = [[NSLocale alloc]initWithLocaleIdentifier:@"zh_CN"];
 //    // 设置最小时间段，防止用户的出现已过去的时间
 //    _timePicker.minimumDate      = [NSDate date];

XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.m

@@ -452,7 +452,21 @@ typedef enum : NSUInteger {
 
 - (void)startDatePickView{
     if (!_startTimeView) {
-        _startTimeView = [[StartTimeView alloc] initWithFrame:CGRectMake(0, ScreenSize.height, ScreenSize.width, ScreenSize.height - 64)];
+        NSDate *currentDate;
+        if (_isClickStart) {
+            if ([_startDateLabel.text isEqualToString:@"选择日期"] || _startDateLabel.text.length < 1) {
+                currentDate = [NSDate date];
+            }else{
+                currentDate =  [IBTCommon convertToDateFrom:_startDateLabel.text];
+            }
+        }else{
+            if ([_endDateLabel.text isEqualToString:@"选择日期"] || _endDateLabel.text.length < 1) {
+                currentDate = [NSDate date];
+            }else{
+                currentDate =  [IBTCommon convertToDateFrom:_endDateLabel.text];
+            }
+        }
+        _startTimeView = [[StartTimeView alloc] initWithFrame:CGRectMake(0, ScreenSize.height, ScreenSize.width, ScreenSize.height - 64) withDate:currentDate];
         _startTimeView.delegate = self;
         _startTimeView.backgroundColor        = RGBA(0, 0, 0 ,0.5);
         [self.view addSubview:_startTimeView];

XFFruit/ViewControllers/Survey/controllers/SurveyDetailViewController.m

@@ -87,7 +87,7 @@ typedef enum : NSUInteger {
             NSString *message  = data[@"message"] ;
             if (success == 1) {
                 NSString *dataStr = data[@"data"];
-               NSString *urlStr = [NSString stringWithFormat:@"%@/DisplayChart?filename=%@",Server_Url,dataStr];
+               NSString *urlStr = [NSString stringWithFormat:@"%@/DisplayChart?filename=%@",@"http://122.224.171.126:7280/cruiser-server",dataStr];
                 [_chartImageView sd_setImageWithURL:[NSURL URLWithString:urlStr]];
             }else{
                 [IBTLoadingView showTips:message];

XFFruit/ViewControllers/Transfer/Controllers/NewTransferViewController.m

@@ -477,6 +477,10 @@ typedef enum : NSUInteger {
     if(self.transfer && [self.state isEqualToString:TRANSFER_STATE_INITIAL]){
         [ICRUserUtil sharedInstance].needFresh = YES;
     }
+    if (_sheetView.startTimeView) {
+        [_sheetView.startTimeView removeFromSuperview];
+        _sheetView.startTimeView = nil;
+    }
 }
 
 /*

XFFruit/ViewControllers/Transfer/Views/TopTransferView.h

@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "HPGrowingTextView.h"
 #import "Transfer.h"
+#import "FinishTimeView.h"
 @protocol TopTransferViewDelegate <NSObject>
 
 - (void)hiddenKeyBoard;
@@ -40,4 +41,7 @@
 @property (nonatomic,strong)NSString *arriveDate;
 @property (nonatomic,strong)NSString *note;
 @property (nonatomic,strong)Transfer *transfer;
+
+@property (nonatomic,strong)FinishTimeView *startTimeView;
+
 @end

XFFruit/ViewControllers/Transfer/Views/TopTransferView.m

@@ -13,18 +13,16 @@
 #import "Warehouse.h"
 #import "ChooseWarehouseViewController.h"
 #import "ChooseTypeViewController.h"
-#import "StartTimeView.h"
 #define LeftMargin 15
 #define TopMargin 20
 #define LeftWidth 80
 #define TableHeight 44
 #define SpaceHeight 10
 
-@interface TopTransferView ()<UITableViewDataSource,UITableViewDelegate,HPGrowingTextViewDelegate,UITextFieldDelegate,StartTimeViewDelegate>
+@interface TopTransferView ()<UITableViewDataSource,UITableViewDelegate,HPGrowingTextViewDelegate,UITextFieldDelegate,FinishTimeViewDelegate>
 {
     UITableView *_tableView;
     NSMutableArray *_dataArr;
-    StartTimeView *_startTimeView;
 
 }
 @property (nonatomic,strong)NSString *selectType;
@@ -247,16 +245,22 @@
     
 }
 - (void)startDatePickView{
-    if (!_startTimeView) {
-        _startTimeView = [[StartTimeView alloc] initWithFrame:CGRectMake(0, ScreenSize.height, ScreenSize.width, ScreenSize.height - 64)withMode:UIDatePickerModeDateAndTime];
-        _startTimeView.delegate = self;
-        _startTimeView.backgroundColor        = RGBA(0, 0, 0 ,0.5);
-        [AppWindow addSubview:_startTimeView];
+    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"];
+        }else{
+            currentStr = self.arriveDateLabel.text;
+        }
+        self.startTimeView = [[FinishTimeView alloc] initWithFrame:CGRectMake(0, ScreenSize.height, ScreenSize.width, ScreenSize.height - 64) withDate:currentStr];
+        self.startTimeView.delegate = self;
+        self.startTimeView.backgroundColor        = RGBA(0, 0, 0 ,0.5);
+        [AppWindow addSubview:self.startTimeView];
         
         [UIView animateWithDuration:0.15 animations:^{
-            CGRect startFrame =  _startTimeView.frame;
+            CGRect startFrame =  self.startTimeView.frame;
             startFrame.origin.y =  64;
-            _startTimeView.frame = startFrame;
+            self.startTimeView.frame = startFrame;
         } completion:^(BOOL finished) {
             
         }];
@@ -265,23 +269,23 @@
 - (void)cancelTimeView{
     [self clearDatePickView];
 }
-- (void)okTimeView:(NSDate *)time{
+- (void)okTimeView:(NSString *)time{
     
     _arriveDateLabel.textColor = GXF_CONTENT_COLOR;
-    _arriveDateLabel.text = [IBTCommon stringFromDateWithFormat:time format:@"yyyy-MM-dd HH:mm"];
-    self.arriveDate = [time httpParameterString];
+    _arriveDateLabel.text = time;
+    self.arriveDate = time;
     // 关闭选择器
     [self clearDatePickView];
 }
 #pragma mark - 取消
 - (void)clearDatePickView{
     [UIView animateWithDuration:0.15 animations:^{
-        CGRect startFrame =  _startTimeView.frame;
+        CGRect startFrame =  self.startTimeView.frame;
         startFrame.origin.y = ScreenSize.height;
-        _startTimeView.frame = startFrame;
+        self.startTimeView.frame = startFrame;
     } completion:^(BOOL finished) {
-        [_startTimeView removeFromSuperview];
-        _startTimeView = nil;
+        [self.startTimeView removeFromSuperview];
+        self.startTimeView = nil;
     }];
 }
 

XFFruit/ViewControllers/Transport/Controllers/NewTransportViewController.m

@@ -425,6 +425,10 @@ typedef enum : NSUInteger {
     if(self.transport && [self.state isEqualToString:TRANSPORT_STATE_INITIAL]){
         [ICRUserUtil sharedInstance].needFresh = YES;
     }
+    if (_sheetView.startTimeView) {
+        [_sheetView.startTimeView removeFromSuperview];
+        _sheetView.startTimeView = nil;
+    }
 }
 
 /*

XFFruit/ViewControllers/Transport/Views/TopTransportView.h

@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "HPGrowingTextView.h"
 #import "Transport.h"
+#import "FinishTimeView.h"
 @protocol TopTransportViewDelegate <NSObject>
 
 - (void)hiddenKeyBoard;
@@ -23,6 +24,7 @@
 @property (nonatomic,strong)UITextField *phoneTextFiled;    //电话
 @property (nonatomic,strong)UILabel *arriveDateLabel;       //预计收货时间
 @property (nonatomic,strong)HPGrowingTextView *remarkTextView;//备注
+@property (nonatomic,strong)FinishTimeView *startTimeView;
 
 
 @property (nonatomic,weak)id <TopTransportViewDelegate>delegate;

XFFruit/ViewControllers/Transport/Views/TopTransportView.m

@@ -11,18 +11,16 @@
 #import "Warehouse.h"
 #import "ChooseWarehouseViewController.h"
 #import "ChooseTypeViewController.h"
-#import "StartTimeView.h"
 #define LeftMargin 15
 #define TopMargin 20
 #define LeftWidth 80
 #define TableHeight 44
 #define SpaceHeight 10
 
-@interface TopTransportView ()<UITableViewDataSource,UITableViewDelegate,HPGrowingTextViewDelegate,UITextFieldDelegate,StartTimeViewDelegate>
+@interface TopTransportView ()<UITableViewDataSource,UITableViewDelegate,HPGrowingTextViewDelegate,UITextFieldDelegate,FinishTimeViewDelegate>
 {
     UITableView *_tableView;
     NSMutableArray *_dataArr;
-    StartTimeView *_startTimeView;
 }
 @property (nonatomic,strong)NSString *selectType;
 @property (nonatomic,strong)NSString *selectRwarehouse;
@@ -246,16 +244,22 @@
 
 }
 - (void)startDatePickView{
-    if (!_startTimeView) {
-        _startTimeView = [[StartTimeView alloc] initWithFrame:CGRectMake(0, ScreenSize.height, ScreenSize.width, ScreenSize.height - 64) withMode:UIDatePickerModeDateAndTime];
-        _startTimeView.delegate = self;
-        _startTimeView.backgroundColor        = RGBA(0, 0, 0 ,0.5);
-        [AppWindow addSubview:_startTimeView];
+    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"];
+        }else{
+            currentStr = self.arriveDateLabel.text;
+        }
+        self.startTimeView = [[FinishTimeView alloc] initWithFrame:CGRectMake(0, ScreenSize.height, ScreenSize.width, ScreenSize.height - 64) withDate:currentStr];
+        self.startTimeView.delegate = self;
+        self.startTimeView.backgroundColor        = RGBA(0, 0, 0 ,0.5);
+        [AppWindow addSubview:self.startTimeView];
         
         [UIView animateWithDuration:0.15 animations:^{
-            CGRect startFrame =  _startTimeView.frame;
+            CGRect startFrame =  self.startTimeView.frame;
             startFrame.origin.y =  64;
-            _startTimeView.frame = startFrame;
+            self.startTimeView.frame = startFrame;
         } completion:^(BOOL finished) {
             
         }];
@@ -264,23 +268,23 @@
 - (void)cancelTimeView{
     [self clearDatePickView];
 }
-- (void)okTimeView:(NSDate *)time{
+- (void)okTimeView:(NSString *)time{
     
     _arriveDateLabel.textColor = GXF_CONTENT_COLOR;
-    _arriveDateLabel.text = [IBTCommon stringFromDateWithFormat:time format:@"yyyy-MM-dd HH:mm"];
-    self.arriveDate = [time httpParameterString];
+    _arriveDateLabel.text = time;
+    self.arriveDate = time;
     // 关闭选择器
     [self clearDatePickView];
 }
 #pragma mark - 取消
 - (void)clearDatePickView{
     [UIView animateWithDuration:0.15 animations:^{
-        CGRect startFrame =  _startTimeView.frame;
+        CGRect startFrame =  self.startTimeView.frame;
         startFrame.origin.y = ScreenSize.height;
-        _startTimeView.frame = startFrame;
+        self.startTimeView.frame = startFrame;
     } completion:^(BOOL finished) {
-        [_startTimeView removeFromSuperview];
-        _startTimeView = nil;
+        [self.startTimeView removeFromSuperview];
+        self.startTimeView = nil;
     }];
 }