1.修改iOS Apex Drivers Update Order日期提交格式。

Redant Drivers/Apex And Drivers/Base.lproj/Localizable.strings

@@ -6,8 +6,6 @@
   Copyright © 2018年 USAI. All rights reserved.
 */
 
-CFBundleDisplayName="Apex & Drivers";
-
 "alert_title_retrieve_success"="Retrieve successfully!!";
 "alert_msg_email_sent"="Email has been sent.";
 "ok"="Ok";

Redant Drivers/Apex And Drivers/Login/LoginViewController.m

@@ -81,7 +81,7 @@
     
     if (RASingleton.sharedInstance.backgroundReportType == RABackgroundReportTypeNone) {
     
-        UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Warning", nil) message:[NSString localizedStringWithFormat:NSLocalizedString(@"%@ need background send location", nil),NSLocalizedString(@"CFBundleDisplayName", nil)] preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Warning", nil) message:[NSString localizedStringWithFormat:NSLocalizedString(@"%@ need background send location", nil),NSLocalizedStringFromTable(@"CFBundleDisplayName", @"InfoPlist", nil)] preferredStyle:UIAlertControllerStyleAlert];
         
         UIAlertAction *rejectAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Reject", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             RASingleton.sharedInstance.backgroundReportType = RABackgroundReportTypeReject;

Redant Drivers/Apex And Drivers/Offline/RAOfflineHandler.m

@@ -49,6 +49,40 @@ static dispatch_semaphore_t _lock;
     return handler;
 }
 
+- (void)prepareParams:(NSMutableDictionary* )params {
+    
+    NSAssert(params != nil, @"params can't be nil");
+    
+    NSString *user = RASingleton.sharedInstance.encryptUser;
+    NSString *password = RASingleton.sharedInstance.encryptPassword;
+    
+    if (user.length && password.length) {
+        [params setObject:user forKey:@"name"];
+        [params setObject:password forKey:@"password"];
+    }
+    
+    [params setObject:@"iOS" forKey:@"platform"];
+    
+    NSDictionary* infoDict =[[NSBundle mainBundle] infoDictionary];
+    NSString* short_version =[infoDict objectForKey:@"CFBundleShortVersionString"];
+    [params setValue:short_version forKey:@"app_short_ver"];
+    
+    NSString *localeLanguageCode = [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode];
+    [params setValue:localeLanguageCode forKey:@"language"];
+    
+    NSString *time = [self currentDate];
+    [params setObject:time forKey:@"date"];
+    [params setObject:@(1) forKey:@"offline"];
+    
+#if TARGET_IPHONE_SIMULATOR//模拟器
+    [params setValue:@"simulator_uuid" forKey:@"deviceid"];
+#elif TARGET_OS_IPHONE//真机
+    UIDevice * dev = [UIDevice currentDevice];
+    NSUUID* uuid =dev.identifierForVendor;
+    [params setValue:uuid.UUIDString forKey:@"deviceid"];
+#endif
+}
+
 - (NSString *)offlineDir {
     if (!_offlineDir) {
         
@@ -118,6 +152,8 @@ static dispatch_semaphore_t _lock;
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
        
         NSMutableDictionary *params = [NSMutableDictionary dictionary];
+        [self prepareParams:params];
+        
         [NetworkUtils downloadFileOffset:0 Param:params from:@"" method:@"POST" toPath:self.offlineDir progressHandler:^(NSURLSessionTask *task, double progress) {
             
         } completionHandler:^(NSMutableDictionary *result) {
@@ -568,7 +604,7 @@ static dispatch_semaphore_t _lock;
     // 组织参数
     NSString *time = [self currentDate];
     NSMutableDictionary *mParams = [params mutableCopy];
-    [mParams setObject:time forKey:@"date"];
+    [self prepareParams:mParams];
     
     NSMutableDictionary *task = [@{
                                    @"order" : orderId,
@@ -713,8 +749,8 @@ static dispatch_semaphore_t _lock;
     // 修改Params
     NSString *time = [self currentDate];
     NSMutableDictionary *mParams = [params mutableCopy];
-    [mParams setObject:@"time" forKey:@"date"];
-    [mParams setObject:@(1) forKey:@"offline"];
+    [self prepareParams:mParams];
+
 
 //    // 将params写入目录
 //    NSString *paramPath = [upDir stringByAppendingPathComponent:@"params.json"];

Redant Drivers/Apex And Drivers/RADataProvider.m

@@ -36,7 +36,8 @@
     NSString* short_version =[infoDict objectForKey:@"CFBundleShortVersionString"];
     [params setValue:short_version forKey:@"app_short_ver"];
     
-    
+    NSString *localeLanguageCode = [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode];
+    [params setValue:localeLanguageCode forKey:@"language"];
     
 #if TARGET_IPHONE_SIMULATOR//模拟器
     [params setValue:@"simulator_uuid" forKey:@"deviceid"];

Redant Drivers/Apex And Drivers/Setting/Model/RASettingAboutModel.m

@@ -22,7 +22,7 @@
 - (NSString *)appName {
     if (!_appName) {
 //        NSDictionary *infoDic = [[NSBundle mainBundle] infoDictionary];
-        _appName = NSLocalizedString(@"CFBundleDisplayName", nil);
+        _appName = NSLocalizedStringFromTable(@"CFBundleDisplayName", @"InfoPlist", nil);
     }
     return _appName;
 }

Redant Drivers/Apex And Drivers/Update/Cell/RAEditDateCell.m

@@ -58,7 +58,7 @@
 - (void)refresh {
     self.titleLabel.text = self.model.title;
     self.startLabel.hidden = !self.model.required;
-    self.dateLabel.text = self.model.value;
+    self.dateLabel.text = self.model.display;
 }
 
 - (void)unbind {

Redant Drivers/Apex And Drivers/Update/Model/RAEditDateModel.h

@@ -19,7 +19,9 @@ typedef enum {
 @interface RAEditDateModel : RAEditBaseModel
 
 @property (nonatomic,copy) NSString *format;
-@property (nonatomic,copy) NSString *value;
+@property (nonatomic,strong) NSDate *date;
+@property (nonatomic,copy,readonly) NSString *value;
+@property (nonatomic,copy) NSString *display;
 @property (nonatomic,assign) RAEditTypeMode mode;
 
 @end

Redant Drivers/Apex And Drivers/Update/Model/RAEditDateModel.m

@@ -17,14 +17,32 @@
 - (void)updateDefaultValue {
     
     NSDate *date = [NSDate date];
+    self.date = date;
+}
+
+- (void)updateDisplay {
+    
     NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+    formatter.timeZone = [NSTimeZone localTimeZone];
     formatter.dateFormat = self.format;
+    self.display = [formatter stringFromDate:self.date];
+}
+
+- (NSString *)value {
+    if (!self.date) {
+        return @"0";
+    }
+    return [NSString stringWithFormat:@"%f",[self.date timeIntervalSince1970]];
+}
+
+- (void)setDate:(NSDate *)date {
+    _date = date;
     
-    self.value = [formatter stringFromDate:date];
+    [self updateDisplay];
 }
 
-- (void)setValue:(NSString *)value {
-    _value = value;
+- (void)setDisplay:(NSString *)display {
+    _display = display;
     
     if (self.delegate && [self.delegate respondsToSelector:@selector(refresh)]) {
         [self.delegate refresh];

Redant Drivers/Apex And Drivers/Update/RAOrderEditViewController+TableDataSource.m

@@ -223,13 +223,7 @@
         }
         
         [RADatePickerViewController presentDatePicker:self title:model.title dateMode:mode withSetBlk:^(NSDate *date) {
-            
-            NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
-            formatter.timeZone = [NSTimeZone localTimeZone];
-            formatter.dateFormat = model.format;
-            NSString *dateStr = [formatter stringFromDate:date];
-            
-            model.value = dateStr;
+            model.date = date;
         }];
     }
 }

Redant Drivers/Apex And Drivers/Update/RAOrderEditViewController.m

@@ -709,6 +709,16 @@
                     }
                 }
                     break;
+                case RAEditTypeDate: {
+                    RAEditDateModel *dateModel = (RAEditDateModel *)model;
+                    if (model.required && dateModel.value.length == 0) {
+                        [emptyArr addObject:[NSString stringWithFormat:@"%ld.%@",emptyArr.count + 1,model.title]];
+                        continue;
+                    }
+                    if (model.key && dateModel.value) {
+                        [params setObject:dateModel.value forKey:model.key];
+                    }
+                }
                     
                 default:
                     break;

Redant Drivers/Apex And Drivers/en.lproj/Localizable.strings

@@ -6,8 +6,6 @@
   Copyright © 2018年 USAI. All rights reserved.
 */
 
-CFBundleDisplayName="Apex & Drivers";
-
 "alert_title_retrieve_success"="Retrieve successfully!!";
 "alert_msg_email_sent"="Email has been sent.";
 "ok"="Ok";

Redant Drivers/Apex And Drivers/zh-Hans.lproj/Localizable.strings

@@ -6,8 +6,6 @@
   Copyright © 2018年 USAI. All rights reserved.
 */
 
-CFBundleDisplayName="汽车人";
-
 "alert_title_retrieve_success"="成功找回密码!!";
 "alert_msg_email_sent"="邮件已发送，请查看邮箱.";
 "ok"="确定";