From c9f26de53b208cd3ed24d4ab188381300c380805 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Wed, 23 Jun 2021 20:46:18 +0800
Subject: [PATCH] fix bug and renote the code

---
 .../com/mogo/module/adas/AdasAutoPilotManager.java     | 10 +++++++---
 .../com/mogo/module/adas/model/AdasServiceModel.java   |  8 +++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
index 5287ddf6b6..ac010dab5c 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
@@ -11,6 +11,10 @@ import com.mogo.utils.logger.Logger;
 import com.zhidao.support.adas.high.bean.AutopilotRoute;
 import com.zhidao.support.adas.high.bean.AutopilotStatus;
 
+import static com.mogo.module.adas.model.AdasServiceModel.DISPATCH_RESULT_AFFIRM;
+import static com.mogo.module.adas.model.AdasServiceModel.DISPATCH_RESULT_MANUAL_CANCEL;
+import static com.mogo.module.adas.model.AdasServiceModel.DISPATCH_RESULT_TIMER_CANCEL;
+
 //负责监听自动驾驶状态并进行状态上报，自动驾驶路线上报，接收调度指令展示指令弹窗
 public class AdasAutoPilotManager implements IMogoOnMessageListener<AdasAutoPilotLocReceiverBean>
         , IAdasDataListener
@@ -77,13 +81,13 @@ public class AdasAutoPilotManager implements IMogoOnMessageListener<AdasAutoPilo
 
     @Override
     public void affirm() {
-//        AdasServiceModel.getInstance().dispatchResultUpload(DISPATCH_RESULT_AFFIRM);
+        AdasServiceModel.getInstance().dispatchResultUpload(DISPATCH_RESULT_AFFIRM);
     }
 
     @Override
     public void cancel(boolean manualTrigger) {
-//        AdasServiceModel.getInstance().dispatchResultUpload(manualTrigger ?
-//                DISPATCH_RESULT_MANUAL_CANCEL : DISPATCH_RESULT_TIMER_CANCEL);
+        AdasServiceModel.getInstance().dispatchResultUpload(manualTrigger ?
+                DISPATCH_RESULT_MANUAL_CANCEL : DISPATCH_RESULT_TIMER_CANCEL);
     }
 
     public void test() {
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
index ce1543c1d6..0d707a0a4b 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
@@ -1,5 +1,6 @@
 package com.mogo.module.adas.model;
 
+import com.google.gson.Gson;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.data.BaseData;
 import com.mogo.commons.network.SubscribeImpl;
@@ -9,6 +10,7 @@ import com.mogo.module.adas.network.IAdasApiService;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.RequestOptions;
+import com.mogo.utils.network.utils.GsonUtil;
 import com.zhidao.support.adas.high.bean.AutopilotRoute;
 import com.zhidao.support.adas.high.bean.AutopilotStatus;
 
@@ -60,7 +62,7 @@ public class AdasServiceModel {
         ReportedRoute reportedRoute = new ReportedRoute(sn, autopilotStatus.getValues());
         Map<String, Object> map = new HashMap<>();
         map.put("sn", sn);
-        map.put("reportedRoute", reportedRoute);
+        map.put("reportedRoute", GsonUtil.jsonFromObject(reportedRoute));
         mAdasApiService.uploadAutopilotState(map)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -94,7 +96,7 @@ public class AdasServiceModel {
         ReportedRoute reportedRoute = new ReportedRoute(sn, Arrays.toString(list.toArray()));
         Map<String, Object> map = new HashMap<>();
         map.put("sn", sn);
-        map.put("reportedRoute", reportedRoute);
+        map.put("reportedRoute", GsonUtil.jsonFromObject(reportedRoute));
         mAdasApiService.uploadAutopilotRoute(map)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -128,7 +130,7 @@ public class AdasServiceModel {
         ReportDispatchResult reportDispatchResult = new ReportDispatchResult(sn, dispatchResultType);
         Map<String, Object> map = new HashMap<>();
         map.put("sn", sn);
-        map.put("reportDispatchResult", reportDispatchResult);
+        map.put("reportDispatchResult", GsonUtil.jsonFromObject(reportDispatchResult));
         mAdasApiService.uploadDispatchResult(map)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())