diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index ac21cdf9f1..a5734f410b 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -31,7 +31,9 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager; import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.function.call.map.CallerSmpManager; +import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; @@ -43,6 +45,7 @@ import com.mogo.och.common.module.utils.AnimatorDrawableUtil; import com.mogo.och.taxi.R; import java.util.Arrays; +import java.util.Objects; import mogo.telematics.pad.MessagePad; import record_cache.RecordPanelOuterClass; @@ -176,18 +179,18 @@ public abstract class BaseTaxiTabFragment { showAiCloud = false - CallerMapIdentifyManager.clearAiCloudRoma() + MapIdentifySubscriber.instance.clearAiCloudRoma() } } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyAiCloudDataDrawer.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyAiCloudDataDrawer.kt index 182667db4d..76d1f11340 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyAiCloudDataDrawer.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyAiCloudDataDrawer.kt @@ -1,16 +1,14 @@ package com.mogo.eagle.core.function.business.identify import android.annotation.SuppressLint +import android.util.Log import androidx.collection.ArraySet import com.mogo.commons.AbsMogoApplication import com.mogo.commons.module.status.MogoStatusManager -import com.mogo.eagle.core.data.traffic.TrafficData import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.w import com.mogo.map.MogoMarkerManager -import mogo.telematics.pad.MessagePad.PlanningObject -import mogo.telematics.pad.MessagePad.TrackedObject -import mogo.yycp.api.proto.SocketDownData import java.util.concurrent.ConcurrentHashMap +import mogo.yycp.api.proto.SocketDownData class IdentifyAiCloudDataDrawer : Identify { @@ -86,6 +84,7 @@ class IdentifyAiCloudDataDrawer : Identify { val uuid = "" + data.uuid mMarkersCaches[uuid] = data trafficDataUuidList.add(uuid) + Log.d("emArrow","add uuid:${uuid.hashCode()}") mFilterTrafficData[uuid] = data } return mFilterTrafficData @@ -93,14 +92,14 @@ class IdentifyAiCloudDataDrawer : Identify { @SuppressLint("NewApi") override fun clearAiMarker() { - if(trafficDataUuidList.size == 0){ - return - } - for (uuid in trafficDataUuidList) { + trafficDataUuidList.clear() + mMarkersCaches.forEach { (uuid, _) -> + mMarkersCaches.remove(uuid) MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .removeMarker(uuid.hashCode().toString()) + Log.d("emArrow","remove uuid:${uuid.hashCode()}") } - trafficDataUuidList.clear() + mFilterTrafficData.clear() } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/MapIdentifySubscriber.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/MapIdentifySubscriber.kt index 22dbb134d3..2ecce80381 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/MapIdentifySubscriber.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/MapIdentifySubscriber.kt @@ -63,8 +63,8 @@ class MapIdentifySubscriber private constructor() : IMoGoIdentifyListener, IMoGo try { if (FunctionBuildConfig.isDrawIdentifyData) { ThreadUtils.getSinglePool().execute { - aiCloudDataDrawer.renderAiCloudResult(cloudData) -// IdentifyFactory.renderAiCloudResult(cloudData) +// aiCloudDataDrawer.renderAiCloudResult(cloudData) + IdentifyFactory.renderAiCloudResult(cloudData) } } else { clearAiCloudRoma() @@ -74,9 +74,9 @@ class MapIdentifySubscriber private constructor() : IMoGoIdentifyListener, IMoGo } } - override fun clearAiCloudRoma() { - aiCloudDataDrawer.clearAiMarker() -// IdentifyFactory.clearAiMarker() + fun clearAiCloudRoma() { +// aiCloudDataDrawer.clearAiMarker() + IdentifyFactory.clearAiMarker() } override fun onAutopilotIdentifyPlanningObj(planningObjects: List?) { diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMoGoIdentifyListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMoGoIdentifyListener.kt index 4a2569711f..ad40f975f0 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMoGoIdentifyListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMoGoIdentifyListener.kt @@ -7,5 +7,4 @@ interface IMoGoIdentifyListener :IProvider{ fun getIdentifyObj(uuid: String): MessagePad.TrackedObject? - fun clearAiCloudRoma() } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapIdentifyManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapIdentifyManager.kt index f6d239c7bf..2064246a9c 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapIdentifyManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapIdentifyManager.kt @@ -16,7 +16,4 @@ object CallerMapIdentifyManager : CallerBase() { return identifyApi.getIdentifyObj(uuid) } - fun clearAiCloudRoma(){ - identifyApi.clearAiCloudRoma() - } } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt index c01e0b89d7..a4c5b72ce9 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt @@ -242,11 +242,20 @@ object CallerVisualAngleManager { PriorityQueue() } + private var mLevel:Boolean = false + + fun updateLongSightLevel(level:Boolean){ + mLevel = level + } + fun changeVisualAngle(current: Scene) { val appIdentityMode = FunctionBuildConfig.appIdentityMode if (AppIdentityModeUtils.isBus(appIdentityMode) && AppIdentityModeUtils.isPassenger(appIdentityMode)) { return } + if(mLevel){ + return + } val triggerTime = SystemClock.elapsedRealtime() scope.launch { Log.d("${M_DEVA}${TAG}", "--- 1 ---") diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index b063d1edee..8cf0363d51 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -1129,7 +1129,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void setLockMode(boolean isLock) { if (checkAMapView()) { - mMapView.getMapAutoViewHelper().setLockMode(true); + mMapView.getMapAutoViewHelper().setLockMode(isLock); } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index 608d7305ac..884d7e9c34 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -122,14 +122,10 @@ public class AMapWrapper implements IMogoMap { markerOptionsArrayList.add(markerOptions); } }); -// markerOptionsArrayList.addAll(cwList); long time = markerOptionsArrayList.get(0).getTime(); MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 0); -// cwList.clear(); } -// private final CopyOnWriteArrayList cwList = new CopyOnWriteArrayList<>(); - @SuppressLint("NewApi") @Override public void updateBatchAiMarkerPosition(HashMap optionsArrayList) { @@ -143,7 +139,6 @@ public class AMapWrapper implements IMogoMap { markerOptionsArrayList.add(markerOptions); } }); -// cwList.addAll(markerOptionsArrayList); long time = markerOptionsArrayList.get(0).getTime(); //todo 最后一个参数，是否管理锚点的删除 MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 0); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java index e10f15850a..0d78375ba2 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java @@ -156,7 +156,7 @@ public class ObjectUtils { markerOptions.setLat(aiData.getWgslat()); markerOptions.setLon(aiData.getWgslon()); markerOptions.setTime(Double.valueOf(aiData.getSatelliteTime()).longValue()); - markerOptions.setColor("#00000000"); + markerOptions.setColor("#00ffd8FF"); } catch (Exception e) { e.printStackTrace(); }