1.修改iOS Apex Drivers Detail数据请求。

Redant Drivers/Apex And Drivers/AppDelegate.m

@@ -23,11 +23,12 @@ static const NSInteger OrderTypeNew = 2;
 
 #pragma mark - Private
 
-- (void)showHomeVCWithOrderID:(NSString *)orderID type:(NSInteger)type {
+- (void)showHomeVCWithOrderID:(NSString *)orderID type:(NSInteger)type type2:(NSString *)type2 {
     
     RAHomeViewController *homeVC = [RAHomeViewController viewControllerFromStoryboard];
     homeVC.gotoDetailID = orderID;
     homeVC.gotoDetailType = type;
+    homeVC.gotoDetailType2 = type2;
     UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:homeVC];
     self.window.rootViewController = nav;
 }
@@ -41,7 +42,7 @@ static const NSInteger OrderTypeNew = 2;
         
         [[RASingleton sharedInstance] loginUser:user password:password];
         
-        [weakSelf showHomeVCWithOrderID:nil type:OrderTypeNew];
+        [weakSelf showHomeVCWithOrderID:nil type:OrderTypeNew type2:nil];
     };
     
     UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:rootVC];
@@ -117,11 +118,13 @@ static const NSInteger OrderTypeNew = 2;
     
     NSString *orderID = nil;
     NSInteger orderType = OrderTypeNew;
+    NSString *orderType2 = nil;
     if (launchOptions) {
         NSDictionary *userInfo = [launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
         NSDictionary *aps = [userInfo objectForKey:@"aps"];
         orderID = [aps objectForKey:@"order-id"];
         orderType = [[aps objectForKey:@"order-type"] integerValue];
+        orderType2 = [aps objectForKey:@"order-type2"];
         
     }
     
@@ -131,7 +134,7 @@ static const NSInteger OrderTypeNew = 2;
     self.window.backgroundColor = [UIColor whiteColor];
     
     if (RASingleton.sharedInstance.autoLogin) {
-        [self showHomeVCWithOrderID:orderID type:orderType];
+        [self showHomeVCWithOrderID:orderID type:orderType type2:orderType2];
     } else {
         [self showLoginVC];
     }
@@ -217,8 +220,12 @@ static const NSInteger OrderTypeNew = 2;
     NSDictionary *aps = [userInfo objectForKey:@"aps"];
     NSString *orderID = [aps objectForKey:@"order-id"];
     NSInteger orderType = [[aps objectForKey:@"order-type"] integerValue];
+    NSString *orderType2 = [aps objectForKey:@"order-type2"];
+    if (!orderType2) {
+        orderType2 = @"";
+    }
     if (orderID) {
-        [[NSNotificationCenter defaultCenter] postNotificationName:RANotificationGoDetail object:@{@"orderID" : orderID,@"orderType" : @(orderType)}];
+        [[NSNotificationCenter defaultCenter] postNotificationName:RANotificationGoDetail object:@{@"orderID" : orderID,@"orderType" : @(orderType),@"orderType2" : orderType2}];
     }
     
     completionHandler();
@@ -256,6 +263,7 @@ static const NSInteger OrderTypeNew = 2;
                     },
                 "new-order" : 1,
                 "order-id" : "AFS20180530001200",
+                "order-type2" : "Pick Up",
                 "order-type" : 2,
                 "sound" : "default",
                 "content-available" : 1

Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController.h

@@ -13,6 +13,7 @@
 
 @property (nonatomic,copy) NSString *orderID;
 @property (nonatomic,assign) NSInteger orderType;
+@property (nonatomic,copy) NSString *orderType2;
 
 - (NSInteger)sectionNumber;
 - (NSString *)titleForSection:(NSInteger)section;

Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController.m

@@ -155,7 +155,7 @@
     
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
         
-        NSDictionary *json = [RADataProvider requestOrderDetail:self.orderID type:self.orderType];
+        NSDictionary *json = [RADataProvider requestOrderDetail:self.orderID type:self.orderType type2:self.orderType2];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             

Redant Drivers/Apex And Drivers/Home/More/RAHomeMoreViewController.m

@@ -113,16 +113,18 @@ typedef enum {
 
 - (void)pushDetailViewControllerForModel:(RAHomeOrderModel *)model {
     
-    [self pushDetailViewControllerForOrderID:model.orderID];
+    [self pushDetailViewControllerForOrderID:model.orderID type:model.status type2:model.order_type2];
 }
 
-- (void)pushDetailViewControllerForOrderID:(NSString *)orderID {
+- (void)pushDetailViewControllerForOrderID:(NSString *)orderID type:(NSInteger)type type2:(NSString *)type2 {
     
     if (!orderID) {
         return;
     }
     RAOrderDetailViewController *detailVC = [RAOrderDetailViewController viewControllerFromStoryboard];
     detailVC.orderID = orderID;
+    detailVC.orderType = type;
+    detailVC.orderType2 = type2;
     [self.navigationController pushViewController:detailVC animated:YES];
 }
 

Redant Drivers/Apex And Drivers/Home/RAHomeOrderModel.h

@@ -22,5 +22,6 @@ typedef enum {
 @property (nonatomic,copy) NSString *containerNo;
 @property (nonatomic,copy) NSString *date;
 @property (nonatomic,copy) NSString *orderID;
+@property (nonatomic,copy) NSString *order_type2;
 
 @end

Redant Drivers/Apex And Drivers/Home/RAHomeViewController.h

@@ -17,6 +17,7 @@
 
 @property (nonatomic,copy) NSString *gotoDetailID;
 @property (nonatomic,assign) NSInteger gotoDetailType;
+@property (nonatomic,copy) NSString *gotoDetailType2;
 
 #pragma mark - Getter
 

Redant Drivers/Apex And Drivers/Home/RAHomeViewController.m

@@ -107,7 +107,7 @@
     [super viewDidAppear:animated];
     
     if (self.gotoDetailID) {
-        [self pushDetailViewControllerForOrderID:self.gotoDetailID type:self.gotoDetailType];
+        [self pushDetailViewControllerForOrderID:self.gotoDetailID type:self.gotoDetailType type2:self.gotoDetailType2];
         self.gotoDetailID = nil;
     }
 }
@@ -305,10 +305,10 @@
 
 - (void)pushDetailViewControllerForModel:(RAHomeOrderModel *)model {
     
-    [self pushDetailViewControllerForOrderID:model.orderID type:model.status];
+    [self pushDetailViewControllerForOrderID:model.orderID type:model.status type2:model.order_type2];
 }
 
-- (void)pushDetailViewControllerForOrderID:(NSString *)orderID type:(NSInteger)type {
+- (void)pushDetailViewControllerForOrderID:(NSString *)orderID type:(NSInteger)type type2:(NSString *)type2 {
     
     if (!orderID) {
         return;
@@ -316,6 +316,7 @@
     RAOrderDetailViewController *detailVC = [RAOrderDetailViewController viewControllerFromStoryboard];
     detailVC.orderID = orderID;
     detailVC.orderType = type;
+    detailVC.orderType2 = type2;
     [self.navigationController pushViewController:detailVC animated:YES];
 }
 
@@ -343,8 +344,9 @@
     if (userInfo) {
         NSString *orderID = [userInfo objectForKey:@"orderID"];
         NSInteger orderType = [[userInfo objectForKey:@"orderType"] integerValue];
+        NSString *orderType2 = [userInfo objectForKey:@"orderType2"];
         if (orderID) {
-            [self pushDetailViewControllerForOrderID:orderID type:orderType];
+            [self pushDetailViewControllerForOrderID:orderID type:orderType type2:orderType2];
         }
     }
 }

Redant Drivers/Apex And Drivers/RADataProvider.h

@@ -18,7 +18,7 @@
 
 + (NSDictionary *)requestMoreOrder:(NSInteger)orderType offset:(NSInteger)offset limit:(NSInteger)limit;
 
-+ (NSDictionary *)requestOrderDetail:(NSString *)orderID type:(NSInteger)type;
++ (NSDictionary *)requestOrderDetail:(NSString *)orderID type:(NSInteger)type type2:(NSString *)type2;
 
 + (NSDictionary *)requestUpdateOrder:(NSString *)orderID driverAction:(NSInteger)action;
 

Redant Drivers/Apex And Drivers/RADataProvider.m

@@ -209,7 +209,7 @@
     return [self handleJsonData:json];
 }
 
-+ (NSDictionary *)requestOrderDetail:(NSString *)orderID type:(NSInteger)type {
++ (NSDictionary *)requestOrderDetail:(NSString *)orderID type:(NSInteger)type type2:(NSString *)type2 {
     
 //    sleep(3.0);
 //    return [self loadFakeData:@"fake_order_detail.json"];
@@ -220,6 +220,9 @@
         [params setObject:orderID forKey:@"orderID"];
     }
     [params setObject:@(type) forKey:@"orderType"];
+    if (type2) {
+        [params setObject:type2 forKey:@"orderType2"];
+    }
     
     NSData* json=[self get_json:URL_DETAIL parameters:params  file:nil];