From e5d4f3a10b5adc6bd62f19a656ac679852c8a8bb Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Fri, 5 Nov 2021 23:16:11 +0800
Subject: [PATCH] rebase problem and renote the traffic light code ,wait to
 know origin logic

---
 .../function/v2x/trafficlight/TrafficLightHMIManager.kt   | 8 ++++----
 .../com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt | 3 +--
 foudations/mogo-utils/build.gradle                        | 2 +-
 .../src/main/java/com/mogo/module/share/TanluManager.java | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt
index 77d9c1ae24..b0c789cf2f 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt
@@ -22,11 +22,11 @@ class TrafficLightHMIManager {
     }
 
     fun updateTrafficLight(trafficLightResult: TrafficLightResult) {
-        if (!initView) {
-            initView = true
-            CallerHmiManager.showWarningTrafficLight(0)
-        }
         //todo 需要确认场景是否一致
+//        if (!initView) {
+//            initView = true
+//            CallerHmiManager.showWarningTrafficLight(0)
+//        }
 //        val leftTrafficLightStatus = trafficLightResult.laneList.left
 //        callerHMIToChangeLight(leftTrafficLightStatus)
 //
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
index d3c0d29fc6..0c3492011c 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
@@ -12,7 +12,6 @@ import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightListenerManager
 import com.mogo.eagle.core.function.v2x.trafficlight.core.MogoTrafficLightManager
-import com.mogo.map.location.MogoLocation
 import com.mogo.map.navi.IMogoCarLocationChangedListener2
 import com.mogo.module.common.MogoApisHandler
 import com.mogo.module.common.enums.EventTypeEnum
@@ -91,7 +90,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
     }
 
     private fun canGetThroughCross(
-        it: MogoLocation,
+        it: Location,
         trafficLightResult: TrafficLightResult
     ): Boolean {
         return if (CoordinateUtils.calculateLineDistance(
diff --git a/foudations/mogo-utils/build.gradle b/foudations/mogo-utils/build.gradle
index f7efc7fe2a..0e04911b9a 100644
--- a/foudations/mogo-utils/build.gradle
+++ b/foudations/mogo-utils/build.gradle
@@ -45,7 +45,7 @@ dependencies {
     api rootProject.ext.dependencies.mogoaicloudnetwork
     api rootProject.ext.dependencies.mogoaicloudpassport
 
-    if (Boolean.valueOf(RELEASE)) {
+    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         implementation rootProject.ext.dependencies.mogo_core_data
     } else {
         implementation project(':core:mogo-core-data')
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
index 893236063f..84938ecf3c 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
@@ -17,6 +17,7 @@ import com.mogo.cloud.tanlu.bean.MarkerExploreWayItemCloud;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.IMogoMarkerManager;