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

Redant Drivers/Apex And Drivers/AppDelegate.m

@@ -11,6 +11,8 @@
 #import "RAHomeViewController.h"
 #import <CoreLocation/CoreLocation.h>
 
+static const NSInteger OrderTypeNew = 2;
+
 @interface AppDelegate ()<UNUserNotificationCenterDelegate,CLLocationManagerDelegate>
 
 @property (nonatomic,strong) CLLocationManager *locationManager;
@@ -21,10 +23,11 @@
 
 #pragma mark - Private
 
-- (void)showHomeVCWithOrderID:(NSString *)orderID {
+- (void)showHomeVCWithOrderID:(NSString *)orderID type:(NSInteger)type {
     
     RAHomeViewController *homeVC = [RAHomeViewController viewControllerFromStoryboard];
     homeVC.gotoDetailID = orderID;
+    homeVC.gotoDetailType = type;
     UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:homeVC];
     self.window.rootViewController = nav;
 }
@@ -38,7 +41,7 @@
         
         [[RASingleton sharedInstance] loginUser:user password:password];
         
-        [weakSelf showHomeVCWithOrderID:nil];
+        [weakSelf showHomeVCWithOrderID:nil type:OrderTypeNew];
     };
     
     UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:rootVC];
@@ -113,10 +116,13 @@
     // Override point for customization after application launch.
     
     NSString *orderID = nil;
+    NSInteger orderType = OrderTypeNew;
     if (launchOptions) {
         NSDictionary *userInfo = [launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
         NSDictionary *aps = [userInfo objectForKey:@"aps"];
         orderID = [aps objectForKey:@"order-id"];
+        orderType = [[aps objectForKey:@"order-type"] integerValue];
+        
     }
     
     // View
@@ -125,7 +131,7 @@
     self.window.backgroundColor = [UIColor whiteColor];
     
     if (RASingleton.sharedInstance.autoLogin) {
-        [self showHomeVCWithOrderID:orderID];
+        [self showHomeVCWithOrderID:orderID type:orderType];
     } else {
         [self showLoginVC];
     }
@@ -210,8 +216,9 @@
     NSDictionary *userInfo = response.notification.request.content.userInfo;
     NSDictionary *aps = [userInfo objectForKey:@"aps"];
     NSString *orderID = [aps objectForKey:@"order-id"];
+    NSInteger orderType = [[aps objectForKey:@"order-type"] integerValue];
     if (orderID) {
-        [[NSNotificationCenter defaultCenter] postNotificationName:RANotificationGoDetail object:@{@"orderID" : orderID}];
+        [[NSNotificationCenter defaultCenter] postNotificationName:RANotificationGoDetail object:@{@"orderID" : orderID,@"orderType" : @(orderType)}];
     }
     
     completionHandler();
@@ -249,6 +256,7 @@
                     },
                 "new-order" : 1,
                 "order-id" : "AFS20180530001200",
+                "order-type" : 2,
                 "sound" : "default",
                 "content-available" : 1
                 }

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

@@ -12,6 +12,7 @@
 @interface RAOrderDetailViewController : RABaseViewController
 
 @property (nonatomic,copy) NSString *orderID;
+@property (nonatomic,assign) NSInteger orderType;
 
 - (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];
+        NSDictionary *json = [RADataProvider requestOrderDetail:self.orderID type:self.orderType];
         
         dispatch_async(dispatch_get_main_queue(), ^{
             

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

@@ -16,6 +16,7 @@
 @property (nonatomic,copy) NSString *currentOrderID;
 
 @property (nonatomic,copy) NSString *gotoDetailID;
+@property (nonatomic,assign) NSInteger gotoDetailType;
 
 #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];
+        [self pushDetailViewControllerForOrderID:self.gotoDetailID type:self.gotoDetailType];
         self.gotoDetailID = nil;
     }
 }
@@ -305,16 +305,17 @@
 
 - (void)pushDetailViewControllerForModel:(RAHomeOrderModel *)model {
     
-    [self pushDetailViewControllerForOrderID:model.orderID];
+    [self pushDetailViewControllerForOrderID:model.orderID type:model.status];
 }
 
-- (void)pushDetailViewControllerForOrderID:(NSString *)orderID {
+- (void)pushDetailViewControllerForOrderID:(NSString *)orderID type:(NSInteger)type {
     
     if (!orderID) {
         return;
     }
     RAOrderDetailViewController *detailVC = [RAOrderDetailViewController viewControllerFromStoryboard];
     detailVC.orderID = orderID;
+    detailVC.orderType = type;
     [self.navigationController pushViewController:detailVC animated:YES];
 }
 
@@ -341,8 +342,9 @@
     NSDictionary *userInfo = notification.object;
     if (userInfo) {
         NSString *orderID = [userInfo objectForKey:@"orderID"];
+        NSInteger orderType = [[userInfo objectForKey:@"orderType"] integerValue];
         if (orderID) {
-            [self pushDetailViewControllerForOrderID:orderID];
+            [self pushDetailViewControllerForOrderID:orderID type:orderType];
         }
     }
 }

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;
++ (NSDictionary *)requestOrderDetail:(NSString *)orderID type:(NSInteger)type;
 
 + (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 {
++ (NSDictionary *)requestOrderDetail:(NSString *)orderID type:(NSInteger)type {
     
 //    sleep(3.0);
 //    return [self loadFakeData:@"fake_order_detail.json"];
@@ -219,6 +219,7 @@
     if (orderID) {
         [params setObject:orderID forKey:@"orderID"];
     }
+    [params setObject:@(type) forKey:@"orderType"];
     
     NSData* json=[self get_json:URL_DETAIL parameters:params  file:nil];
     
@@ -228,21 +229,25 @@
 + (NSDictionary *)requestUpdateOrder:(NSString *)orderID driverAction:(NSInteger)action {
     
 //    sleep(3.0);
-    return [self loadFakeData:@"fake_order_edit.json"];
+//    return [self loadFakeData:@"fake_order_edit.json"];
 //    return [self fakeError];
     
     NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    if (orderID) {
+        [params setObject:orderID forKey:@"orderID"];
+    }
+    [params setObject:@(action) forKey:@"action"];
     
     
-    NSData* json=[self get_json:URL_HOST parameters:params  file:nil];
+    NSData* json=[self get_json:URL_UPDATE parameters:params  file:nil];
     
     return [self handleJsonData:json];
 }
 
 + (NSDictionary *)reportAcionToURL:(NSString *)url withParams:(NSMutableDictionary *)params {
     
-    sleep(3.0);
-    return @{@"result" : @2};
+//    sleep(3.0);
+//    return @{@"result" : @2};
     
     NSData* json=[self get_json:url parameters:params  file:nil];
     

Redant Drivers/Apex And Drivers/config.h

@@ -17,6 +17,7 @@
 #define URL_HOME                APPENDING_STR(@"/j/mobile/truckPage.mo/")
 #define URL_MORE_ORDER          APPENDING_STR(@"/j/mobile/morePickupOrders.mo/")
 #define URL_DETAIL              APPENDING_STR(@"/j/mobile/orderDetails.mo/")
+#define URL_UPDATE              APPENDING_STR(@"/j/mobile/actionDetails.mo/")
 
 //#define URL_HOME                @"http://192.168.0.130:8080/MyWeb/Test"
 //#define URL_LOGIN               @"http://192.168.0.130:8080/MyWeb/Test"