1.修改Apex CRM日期选择。

RedAnt CRM/APEX CRM/APEX CRM.xcodeproj/project.pbxproj

@@ -37,6 +37,10 @@
 		42F53F8721B617E4008EAEFC /* Signature.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 42F53F8121B617E3008EAEFC /* Signature.xcassets */; };
 		42F53F8821B617E4008EAEFC /* SignatureView.m in Sources */ = {isa = PBXBuildFile; fileRef = 42F53F8321B617E3008EAEFC /* SignatureView.m */; };
 		42F53F8921B617E4008EAEFC /* SignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42F53F8521B617E3008EAEFC /* SignatureViewController.m */; };
+		42F53F9221B651B6008EAEFC /* date.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42F53F8B21B651B6008EAEFC /* date.storyboard */; };
+		42F53F9321B651B6008EAEFC /* date.strings in Resources */ = {isa = PBXBuildFile; fileRef = 42F53F8D21B651B6008EAEFC /* date.strings */; };
+		42F53F9421B651B6008EAEFC /* RADatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42F53F9021B651B6008EAEFC /* RADatePickerViewController.m */; };
+		42F53F9821B65255008EAEFC /* RAPresentationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42F53F9721B65255008EAEFC /* RAPresentationController.m */; };
 		7106E80A21A684F20056DD20 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7106E80921A684F20056DD20 /* AppDelegate.m */; };
 		7106E80D21A684F20056DD20 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7106E80C21A684F20056DD20 /* ViewController.m */; };
 		7106E81021A684F20056DD20 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7106E80E21A684F20056DD20 /* Main.storyboard */; };
@@ -112,6 +116,13 @@
 		42F53F8321B617E3008EAEFC /* SignatureView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignatureView.m; sourceTree = "<group>"; };
 		42F53F8421B617E3008EAEFC /* SignatureViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SignatureViewController.h; sourceTree = "<group>"; };
 		42F53F8521B617E3008EAEFC /* SignatureViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignatureViewController.m; sourceTree = "<group>"; };
+		42F53F8C21B651B6008EAEFC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/date.storyboard; sourceTree = "<group>"; };
+		42F53F8E21B651B6008EAEFC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/date.strings; sourceTree = "<group>"; };
+		42F53F8F21B651B6008EAEFC /* RADatePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RADatePickerViewController.h; sourceTree = "<group>"; };
+		42F53F9021B651B6008EAEFC /* RADatePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RADatePickerViewController.m; sourceTree = "<group>"; };
+		42F53F9121B651B6008EAEFC /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/date.strings"; sourceTree = "<group>"; };
+		42F53F9621B65255008EAEFC /* RAPresentationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPresentationController.h; sourceTree = "<group>"; };
+		42F53F9721B65255008EAEFC /* RAPresentationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPresentationController.m; sourceTree = "<group>"; };
 		7106E80521A684F20056DD20 /* APEX CRM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "APEX CRM.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7106E80821A684F20056DD20 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7106E80921A684F20056DD20 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -373,6 +384,28 @@
 			path = "../../../RedAnt ERP Mobile/common/Functions/signature";
 			sourceTree = "<group>";
 		};
+		42F53F8A21B651B6008EAEFC /* DatePicker */ = {
+			isa = PBXGroup;
+			children = (
+				42F53F8B21B651B6008EAEFC /* date.storyboard */,
+				42F53F8D21B651B6008EAEFC /* date.strings */,
+				42F53F8F21B651B6008EAEFC /* RADatePickerViewController.h */,
+				42F53F9021B651B6008EAEFC /* RADatePickerViewController.m */,
+			);
+			name = DatePicker;
+			path = ../../../common/DatePicker;
+			sourceTree = "<group>";
+		};
+		42F53F9521B65255008EAEFC /* PresentationController */ = {
+			isa = PBXGroup;
+			children = (
+				42F53F9621B65255008EAEFC /* RAPresentationController.h */,
+				42F53F9721B65255008EAEFC /* RAPresentationController.m */,
+			);
+			name = PresentationController;
+			path = ../../../common/PresentationController;
+			sourceTree = "<group>";
+		};
 		7106E7FC21A684F20056DD20 = {
 			isa = PBXGroup;
 			children = (
@@ -392,6 +425,8 @@
 		7106E80721A684F20056DD20 /* APEX CRM */ = {
 			isa = PBXGroup;
 			children = (
+				42F53F9521B65255008EAEFC /* PresentationController */,
+				42F53F8A21B651B6008EAEFC /* DatePicker */,
 				42F53F7F21B617E3008EAEFC /* signature */,
 				4214C4A221B25EA40091A528 /* NSString */,
 				4277784C21AFB96700BCF7FA /* MapNavigation */,
@@ -511,6 +546,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				42F53F9321B651B6008EAEFC /* date.strings in Resources */,
 				42F53F8721B617E4008EAEFC /* Signature.xcassets in Resources */,
 				42A8A21A21AE8309003B854B /* RAPhotoPreview.xcassets in Resources */,
 				7106E81521A684F50056DD20 /* LaunchScreen.storyboard in Resources */,
@@ -522,6 +558,7 @@
 				4212ABA321AD2B7300BE4E45 /* Localizable.strings in Resources */,
 				4212AB9121AD22AB00BE4E45 /* camera.xcassets in Resources */,
 				42A8A21421AE7828003B854B /* PhotoList.storyboard in Resources */,
+				42F53F9221B651B6008EAEFC /* date.storyboard in Resources */,
 				4212AB9021AD22AB00BE4E45 /* Camera.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -556,6 +593,8 @@
 				7106E80D21A684F20056DD20 /* ViewController.m in Sources */,
 				7106E84421AF71310056DD20 /* NSDictionary+Extension.m in Sources */,
 				4212ABC021AD389200BE4E45 /* RAReachability.m in Sources */,
+				42F53F9421B651B6008EAEFC /* RADatePickerViewController.m in Sources */,
+				42F53F9821B65255008EAEFC /* RAPresentationController.m in Sources */,
 				4212ABC121AD389200BE4E45 /* Reachability.m in Sources */,
 				7106E81821A684F50056DD20 /* main.m in Sources */,
 				7106E82F21AD1ACD0056DD20 /* RAUtils.m in Sources */,
@@ -591,6 +630,23 @@
 			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
+		42F53F8B21B651B6008EAEFC /* date.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42F53F8C21B651B6008EAEFC /* Base */,
+			);
+			name = date.storyboard;
+			sourceTree = "<group>";
+		};
+		42F53F8D21B651B6008EAEFC /* date.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42F53F8E21B651B6008EAEFC /* en */,
+				42F53F9121B651B6008EAEFC /* zh-Hans */,
+			);
+			name = date.strings;
+			sourceTree = "<group>";
+		};
 		7106E80E21A684F20056DD20 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (

RedAnt CRM/APEX CRM/APEX CRM/RAWKWebView.m

@@ -22,6 +22,7 @@
 #import "RAMapNavigateHandler.h"
 #import "NSString+RAJavascript.h"
 #import "SignatureViewController.h"
+#import "RADatePickerViewController.h"
 
 
 @interface RAWKWebView () <UINavigationControllerDelegate,UIImagePickerControllerDelegate,MFMailComposeViewControllerDelegate>
@@ -390,6 +391,36 @@
 
 - (void)ra_dateTimePicker:(NSDictionary *)params {
     
+    NSString *type = [params objectForKey:@"type"];
+    NSString *value = [params objectForKey:@"value"];
+    NSString *title = [params objectForKey:@"title"];
+    
+    NSString *format = @"MM/dd/YYYY";
+    UIDatePickerMode mode = UIDatePickerModeDate;
+    
+    if ([type isEqualToString:@"date"]) {
+        
+    } else if ([type isEqualToString:@"time"]) {
+        
+        format = @"HH:mm:ss";
+        mode = UIDatePickerModeTime;
+        
+    } else if ([type isEqualToString:@"dateTime"]) {
+        
+        format = @"MM/dd/YYYY HH:mm:ss";
+        mode = UIDatePickerModeDateAndTime;
+    }
+    
+    NSDateFormatter *dateFormatter = [NSDateFormatter new];
+    dateFormatter.dateFormat = format;
+    NSDate *date = [dateFormatter dateFromString:value];
+    
+    __weak typeof(self) weakSelf = self;
+    [RADatePickerViewController presentDatePicker:self.ra_viewController title:title dateMode:mode defaultDate:date withSetBlk:^(NSDate *date) {
+        
+        NSString *dateStr = [dateFormatter stringFromDate:date];
+        [weakSelf returnToWebPage:params value:dateStr];
+    }];
 }
 
 #pragma mark - Web Callback

RedAnt CRM/APEX CRM/APEX CRM/ViewController.m

@@ -26,8 +26,9 @@
 //    vc.url=@"http://192.168.0.138:8080/backend_test/index.html";
     
     
-    vc.url = @"http://192.168.0.124:8081/j/crm/mobile/login";
-//    vc.url = @"http://192.168.0.130:8080/MyWeb/html/test.html";
+//    vc.url = @"http://192.168.0.124:8081/j/crm/mobile/login";
+    vc.url = @"http://192.168.0.130:8080/MyWeb/html/test.html";
+//    vc.url = @"http://192.168.0.124:8081/j/crm/mobile/login";
     [self.navigationController pushViewController:vc animated:YES];