From 0a9f187f0eaff3391716d4afde1c515cb78ef48b Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Thu, 3 Jun 2021 15:31:39 +0800
Subject: [PATCH] to fix the data problem of advise the adas and cloud data

---
 .../mogo/module/common/drawer/BaseDrawer.java | 28 +++++++++----------
 .../common/drawer/SnapshotSetDataDrawer.java  |  3 +-
 .../service/marker/MapMarkerManager.java      |  4 +--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
index ff80923ded..b91e5c6c64 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
@@ -181,10 +181,10 @@ class BaseDrawer {
      */
     public int getModelRes(int type) {
         AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type);
-        if (recognizedType == AdasRecognizedType.classIdCar
-                || recognizedType == AdasRecognizedType.classIdTrafficTruck) {
+        if (recognizedType == AdasRecognizedType.classIdCar) {
             return R.raw.othercar;
-        } else if (recognizedType == AdasRecognizedType.classIdTrafficBus) {
+        } else if (recognizedType == AdasRecognizedType.classIdTrafficBus
+                || recognizedType == AdasRecognizedType.classIdTrafficTruck) {
             return R.raw.bus;
         } else if (recognizedType == AdasRecognizedType.classIdBicycle
                 || recognizedType == AdasRecognizedType.classIdMoto) {
@@ -243,15 +243,15 @@ class BaseDrawer {
         }
 
         // 默认颜色  // todo 方案1
-        switch (fromType) {
-            case FROM_ADAS:
-                return Car3DModelColor.Normal_Visual.color;
-            case FROM_ROAD_UNIT:
-                return Car3DModelColor.Normal_Cloud.color;
-            default:
-                return Car3DModelColor.Normal.color;
-        }
-//        return Car3DModelColor.Normal.color;
+//        switch (fromType) {
+//            case FROM_ADAS:
+//                return Car3DModelColor.Normal_Visual.color;
+//            case FROM_ROAD_UNIT:
+//                return Car3DModelColor.Normal_Cloud.color;
+//            default:
+//                return Car3DModelColor.Normal.color;
+//        }
+        return Car3DModelColor.Normal.color;
         // todo 方案2
 //        return Car3DTestModelColor.getTestModelColor(fromType, Waring_Normal);
     }
@@ -306,7 +306,7 @@ class BaseDrawer {
 
         Normal("#D8D8D8FF"),
         Normal_Visual("#D8CFF8BD"),
-        Normal_Cloud("#D8F8D69B"),
+        Normal_Cloud("#D8F83F94"),
 
         Warming("#FFD53EFF"),
         Warming_Visual("#FFC192F1"),
@@ -336,7 +336,7 @@ class BaseDrawer {
 
         Normal_Type(FROM_MY_LOCATION, Waring_Normal, "#D8D8D8FF"),
         Normal_Type_Visual(FROM_ADAS, Waring_Normal, "#D8CFF8BD"),
-        Normal_Type_Cloud(FROM_ROAD_UNIT, Waring_Normal, "#D8F8D69B"),
+        Normal_Type_Cloud(FROM_ROAD_UNIT, Waring_Normal, "#D8F83F94"),
 
         Warming_Type(FROM_MY_LOCATION, Waring_Close, "#FFD53EFF"),
         Warming_Type_Visual(FROM_ADAS, Waring_Close, "#FFC192F1"),
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
index 1c905e167e..787aba2807 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
@@ -338,7 +338,8 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
      */
     private void prepareData(List<SocketDownData.CloudRoadDataProto> in, List<SocketDownData.CloudRoadDataProto> out) {
         filterData(in);
-        foreCastPoint(in, out);
+//        foreCastPoint(in, out);
+        out.addAll(in);
     }
 
     /**
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index 46e1f51581..2029b70339 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -144,7 +144,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
             @Override
             public void onMsgReceived(SocketDownData.LauncherSnapshotProto mogoSnapshotSetData) {
                 DebugConfig.setStatus(DebugConfig.sDownloadSnapshot, true);
-                SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData);  //todo 6月4号 提测版本中去掉云端下发数据展示
+//                SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData);  //todo 6月4号 提测版本中去掉云端下发数据展示
 //                Message msg = mSnapshotHandler.obtainMessage();
 //                msg.obj = mogoSnapshotSetData;
 //                msg.what = MSG_SNAPSHOT;
@@ -154,7 +154,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
 
         // adas 每隔一定频率传递过来的数据
         MarkerServiceHandler.getApis().getAdasControllerApi().addAdasRecognizedDataCallback(resultList -> {
-//            AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult(resultList);  // todo 单项验证再开
+            AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult(resultList);  // todo 单项验证再开
 //            Message msg = mSnapshotHandler.obtainMessage();
 //            msg.obj = resultList;
 //            msg.what = MSG_ADAS;