From 9485fd7cc8e20d10afa73d2b4fe4c22b9e5d5f0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 27 Apr 2021 20:59:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=87=BA=E7=A7=9F?=
 =?UTF-8?q?=E8=BD=A6=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=86=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/taxi/MogoOCHTaxiModel.java   |  6 ++-
 .../src/main/res/raw/taxi_order.json          | 11 ++++++
 .../src/main/res/raw/taxi_order_detail.json   | 39 +++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 OCH/mogo-och-taxi/src/main/res/raw/taxi_order.json
 create mode 100644 OCH/mogo-och-taxi/src/main/res/raw/taxi_order_detail.json

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
index 3b8a60b226..1f095f1887 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
@@ -430,7 +430,10 @@ class MogoOCHTaxiModel {
 
         @Override
         public void onMsgReceived( OCHTaxiOrderResponse obj ) {
-            Logger.d( TAG, "收到新订单" );
+            if ( obj == null ) {
+                return;
+            }
+            Logger.d( TAG, "收到新订单"  + GsonUtil.jsonFromObject(obj));
             mCurrentOCHOrder = obj;
             cacheOrderInfo2Native( mCurrentOCHOrder );
             Location location = MogoApisHandler.getInstance()
@@ -497,6 +500,7 @@ class MogoOCHTaxiModel {
             if ( obj == null ) {
                 return;
             }
+            Logger.d(TAG, "订单状态被改变:" + GsonUtil.jsonFromObject(obj));
             OCHOrderStatus status = OCHOrderStatus.valueOf( obj.orderDispatchType );
             switch ( status ) {
                 case Cancel:
diff --git a/OCH/mogo-och-taxi/src/main/res/raw/taxi_order.json b/OCH/mogo-och-taxi/src/main/res/raw/taxi_order.json
new file mode 100644
index 0000000000..d182881984
--- /dev/null
+++ b/OCH/mogo-och-taxi/src/main/res/raw/taxi_order.json
@@ -0,0 +1,11 @@
+{
+  "drivingRoutes": [
+
+  ],
+  "endStation": "第二十一站",
+  "orderDispatchType": 1,
+  "orderNo": "CZ20210427000016",
+  "orderType": 9,
+  "startStation": "0409第一站",
+  "travelDistance": 0.3
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/raw/taxi_order_detail.json b/OCH/mogo-och-taxi/src/main/res/raw/taxi_order_detail.json
new file mode 100644
index 0000000000..7d62fcacb7
--- /dev/null
+++ b/OCH/mogo-och-taxi/src/main/res/raw/taxi_order_detail.json
@@ -0,0 +1,39 @@
+{
+  "code": 0,
+  "msg": "",
+  "detailMsg": "",
+  "result": {
+    "_id": "5352c1d2c9d84ab3ab9ecf1e47e13bdd",
+    "orderNo": "CZ20210427000016",
+    "orderType": 9,
+    "userName": "董QAD",
+    "userPhone": "15631204018",
+    "startStationId": 10000,
+    "startStation": "0409第一站",
+    "startStationCoordinate": [
+      116.7389159039,
+      40.1992312592
+    ],
+    "endStationId": 21,
+    "endStation": "第二十一站",
+    "endStationCoordinate": [
+      116.737866,
+      40.19646
+    ],
+    "orderDispatchType": 1,
+    "carNum": "京NB010",
+    "sn": "F803EB2046PZD00149",
+    "orderStartTime": "Apr 27, 2021 8:55:44 PM",
+    "arrivedStartStationTime": "",
+    "arrivedEndStationTime": "",
+    "cityCode": "010",
+    "areaCode": "1001",
+    "createTime": "Apr 27, 2021 8:55:44 PM",
+    "updateTime": "Apr 27, 2021 8:55:56 PM",
+    "personNum": 1,
+    "travelDistance": 0.3,
+    "vehicleColour": "黑色",
+    "lastBrandName": "",
+    "headImgUrl": "https://thirdwx.qlogo.cn/mmopen/vi_32/DYAIOgq83ep4YkeZqjiazTK87NQtYp6KMYvAdJcxNpxyJ2gibeNNheH1HFaJdX4hB15eIR3zZdGMWNanKzIn460w/132"
+  }
+}
\ No newline at end of file