From a44070508ba57dc595963c6d49b7ed0c413d082d Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Tue, 29 Jun 2021 12:01:50 +0800
Subject: [PATCH] note the car color code

---
 .../adas/receiver/TestAdasFuncManager.java    |  2 +-
 .../mogo/module/common/drawer/BaseDrawer.java | 48 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/TestAdasFuncManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/TestAdasFuncManager.java
index 429e5149a2..cfcb213500 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/TestAdasFuncManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/TestAdasFuncManager.java
@@ -65,7 +65,7 @@ public class TestAdasFuncManager {
             LineOverlayManager lineOverlayManager = new LineOverlayManager(AbsMogoApplication.getApp().getApplicationContext());
             MogoLocation mogoLocation = new MogoLocation();
             mogoLocation.setLongitude(lon);
-            mogoLocation.setLongitude(lat);
+            mogoLocation.setLatitude(lat);
             lineOverlayManager.draw(mogoLocation, vals);
         } catch (Exception e) {
             e.printStackTrace();
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 341bfb820f..1642b729bc 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
@@ -209,35 +209,35 @@ class BaseDrawer {
      */
     protected String getModelRenderColor(int type, int fromType, double speed, double lon, double lat, double angle) {
 
-        AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type);
-        if (recognizedType == AdasRecognizedType.classIdUnKnow) {
-            return Car3DModelColor.Normal.color;
-        }
+//        AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type);
+//        if (recognizedType == AdasRecognizedType.classIdUnKnow) {
+//            return Car3DModelColor.Normal.color;
+//        }
         // 距离策略 todo 此处两种策略是临时方案
-        double[] coordinates = getCurCoordinates();
-        double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100;
-        if (distance < 15) {
-            return Car3DModelColor.Dangerous.color; // todo 方案1
-//            return Car3DTestModelColor.getTestModelColor(fromType, Waring_Dangerous); // todo 方案2
-        } else if (distance < 50 && distance >= 15) {
-            return Car3DModelColor.Warming.color; // todo 方案1
-//            return Car3DTestModelColor.getTestModelColor(fromType, Waring_Close); // todo 方案2
-        }
+//        double[] coordinates = getCurCoordinates();
+//        double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100;
+//        if (distance < 15) {
+//            return Car3DModelColor.Dangerous.color; // todo 方案1
+////            return Car3DTestModelColor.getTestModelColor(fromType, Waring_Dangerous); // todo 方案2
+//        } else if (distance < 50 && distance >= 15) {
+//            return Car3DModelColor.Warming.color; // todo 方案1
+////            return Car3DTestModelColor.getTestModelColor(fromType, Waring_Close); // todo 方案2
+//        }
 
 //         他车车速和自车车速对比速度策略
 //         自车速度 >= 50% 危险
 //         10% < 自车速度 < 50% 警告
-        double curSpeed = getCurSpeed();
-        if (curSpeed > 0 && speed > curSpeed) {
-            double rate = ((speed - curSpeed) / curSpeed) * 100;
-            if (rate >= 50) {
-                return Car3DModelColor.Dangerous.color; // todo 方案1
-//                return Car3DTestModelColor.getTestModelColor(fromType, Waring_Dangerous); // todo 方案2
-            } else if (rate > 10 && rate < 50) {
-                return Car3DModelColor.Warming.color; // todo 方案1
-//                return Car3DTestModelColor.getTestModelColor(fromType, Waring_Close);  // todo 方案2
-            }
-        }
+//        double curSpeed = getCurSpeed();
+//        if (curSpeed > 0 && speed > curSpeed) {
+//            double rate = ((speed - curSpeed) / curSpeed) * 100;
+//            if (rate >= 50) {
+//                return Car3DModelColor.Dangerous.color; // todo 方案1
+////                return Car3DTestModelColor.getTestModelColor(fromType, Waring_Dangerous); // todo 方案2
+//            } else if (rate > 10 && rate < 50) {
+//                return Car3DModelColor.Warming.color; // todo 方案1
+////                return Car3DTestModelColor.getTestModelColor(fromType, Waring_Close);  // todo 方案2
+//            }
+//        }
 
         // 默认颜色  // todo 方案1
 //        switch (fromType) {