1.修改iOS Apex Drivers网络请求。

Redant Drivers/Apex And Drivers/FakeData/fake_order_list.json

@@ -64,7 +64,7 @@
       ]
     },
     {
-      "type": 0,
+      "type": 3,
       "title": "Finish Order",
       "totalCount":23,
       "orders": [
@@ -73,7 +73,7 @@
           "orderNo": "AFS180530001200",
           "containerNo": "TCNU6432476",
           "date": "5/30/2018",
-          "status": 0,
+          "status": 3,
           "title": "Pickup Order New"
         },
         {
@@ -81,7 +81,7 @@
           "orderNo": "AFS180530001201",
           "containerNo": "TCNU6432477",
           "date": "5/30/2018",
-          "status": 0,
+          "status": 3,
           "title": "Pickup Order New"
         },
         {
@@ -89,7 +89,7 @@
           "orderNo": "AFS180530001202",
           "containerNo": "TCNU6432478",
           "date": "5/30/2018",
-          "status": 0,
+          "status": 3,
           "title": "Pickup Order New"
         }
       ]

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

@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 
 typedef enum {
-    RAOrderStatusFinish = 0,
+    RAOrderStatusFinish = 3,
     RAOrderStatusProcessing = 1,
     RAOrderStatusNew = 2
 } RAOrderStatus;

Redant Drivers/Apex And Drivers/RADataProvider.m

@@ -25,7 +25,7 @@
     NSString *password = RASingleton.sharedInstance.encryptPassword;
     
     if (user.length && password.length) {
-        [params setObject:user forKey:@"user"];
+        [params setObject:user forKey:@"name"];
         [params setObject:password forKey:@"password"];
     }
     
@@ -59,6 +59,7 @@
         int result=[[jsobj valueForKey:@"result"] intValue];
         
         switch (result) {
+            case -9:
             case 0:
                 [jsobj setValue:MSG_USERAUTH_ERROR forKey:@"err_msg"];
                 break;
@@ -74,8 +75,14 @@
             case RESULT_TIMEOUT:
                 [jsobj setValue:MSG_TIMEOUT forKey:@"err_msg"];
                 break;
-            default:
-                [jsobj setValue:MSG_ERROR forKey:@"err_msg"];
+            default: {
+                NSString *msg = [jsobj valueForKey:@"msg"];
+                if (msg.length == 0) {
+                    [jsobj setValue:MSG_ERROR forKey:@"err_msg"];
+                } else {
+                    [jsobj setValue:msg forKey:@"err_msg"];
+                }
+            }
                 break;
         }
         
@@ -173,29 +180,31 @@
 + (NSDictionary *)requestOrderList {
     
 //    sleep(3.0);
-    return [self loadFakeData:@"fake_order_list.json"];
+//    return [self loadFakeData:@"fake_order_list.json"];
 //    return [self fakeError];
     
     
     NSMutableDictionary *params = [NSMutableDictionary dictionary];
     
     
-    NSData* json=[self get_json:URL_HOST parameters:params  file:nil];
+    NSData* json=[self get_json:URL_HOME parameters:params  file:nil];
     
     return [self handleJsonData:json];
 }
 
 + (NSDictionary *)requestMoreOrder:(NSInteger)orderType offset:(NSInteger)offset limit:(NSInteger)limit {
     
-    sleep(2.0);
-    return [self loadFakeData:@"fake_more_order.json"];
+//    sleep(2.0);
+//    return [self loadFakeData:@"fake_more_order.json"];
     //    return [self fakeError];
     
     
     NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    [params setObject:@(orderType) forKey:@"type"];
+    [params setObject:@(offset) forKey:@"offset"];
+    [params setObject:@(limit) forKey:@"limit"];
     
-    
-    NSData* json=[self get_json:URL_HOST parameters:params  file:nil];
+    NSData* json=[self get_json:URL_MORE_ORDER parameters:params  file:nil];
     
     return [self handleJsonData:json];
 }
@@ -203,13 +212,15 @@
 + (NSDictionary *)requestOrderDetail:(NSString *)orderID {
     
 //    sleep(3.0);
-    return [self loadFakeData:@"fake_order_detail.json"];
+//    return [self loadFakeData:@"fake_order_detail.json"];
 //    return [self fakeError];
     
     NSMutableDictionary *params = [NSMutableDictionary dictionary];
+    if (orderID) {
+        [params setObject:orderID forKey:@"orderID"];
+    }
     
-    
-    NSData* json=[self get_json:URL_HOST parameters:params  file:nil];
+    NSData* json=[self get_json:URL_DETAIL parameters:params  file:nil];
     
     return [self handleJsonData:json];
 }

Redant Drivers/Apex And Drivers/config.h

@@ -13,6 +13,11 @@
 #define APPENDING_STR(var)      [URL_HOST stringByAppendingString:var]
 
 #define URL_ERR_LOG             @""
-#define URL_LOGIN               APPENDING_STR(@"/j/userLogin.do/")
+#define URL_LOGIN               APPENDING_STR(@"/j/mobile/login.mo/")
+#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_HOME                @"http://192.168.0.130:8080/MyWeb/Test"
+//#define URL_LOGIN               @"http://192.168.0.130:8080/MyWeb/Test"
 #endif /* config_h */