From 681629c03228a06af53bc218bcd64b024aade8e0 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 29 Dec 2022 17:43:12 +0800 Subject: [PATCH] [2.13.0-arch-opt] locationUtil move --- .../main/java/com/mogo/och/taxi/TaxiOverlayManager.java | 2 +- .../mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt | 2 +- .../v2x/events/overlay/V2XOptimalRouteOverlay.java | 2 +- .../function/v2x/redlightwarning/RedLightWarningManager.kt | 1 + .../com/mogo/eagle/core/utilcode/util}/LocationUtils.java | 2 +- .../main/java/com/mogo/commons}/utils/LocationUtils.java | 7 +------ 6 files changed, 6 insertions(+), 10 deletions(-) rename core/{function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning => mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util}/LocationUtils.java (97%) rename {core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => foudations/mogo-commons/src/main/java/com/mogo/commons}/utils/LocationUtils.java (79%) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiOverlayManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiOverlayManager.java index bc3ae739ce..d525f97b1b 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiOverlayManager.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiOverlayManager.java @@ -5,7 +5,7 @@ import android.content.Context; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; -import com.mogo.eagle.core.function.v2x.events.utils.LocationUtils; +import com.mogo.commons.utils.LocationUtils; import com.mogo.eagle.core.utilcode.util.ColorUtils; import com.mogo.map.overlay.IMogoOverlayManager; import com.mogo.map.overlay.IMogoPolyline; diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt index 539658cf16..092b78905e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt @@ -76,7 +76,7 @@ class PncActionsView @JvmOverloads constructor( if (it.state == STATUS_AUTOPILOT_RUNNING) { UiThreadHandler.post { var actions: String? = null - planningActionMsg.actionMsg?.let { + planningActionMsg.actionMsg?.let { it -> actions = PncActionsHelper.getAction(it.drivingState.number, it.drivingAction.number) //如果是存在云端红绿灯数据条件下，设置云端数据 diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/overlay/V2XOptimalRouteOverlay.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/overlay/V2XOptimalRouteOverlay.java index 47f35b5e86..d922119aff 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/overlay/V2XOptimalRouteOverlay.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/overlay/V2XOptimalRouteOverlay.java @@ -4,7 +4,7 @@ import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; -import com.mogo.eagle.core.function.v2x.events.utils.LocationUtils; +import com.mogo.commons.utils.LocationUtils; import com.mogo.eagle.core.utilcode.util.ColorUtils; import com.mogo.map.overlay.IMogoOverlayManager; import com.mogo.map.overlay.IMogoPolyline; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt index 49004bae3e..4bc32e9a9c 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt @@ -25,6 +25,7 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.data.msgbox.V2XMsg import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager +import com.mogo.eagle.core.utilcode.util.LocationUtils import com.zhjt.service_biz.BizConfig import kotlin.math.abs import kotlin.math.ceil diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/LocationUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LocationUtils.java similarity index 97% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/LocationUtils.java rename to core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LocationUtils.java index fc062a3f45..72d2d21990 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/LocationUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LocationUtils.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.redlightwarning; +package com.mogo.eagle.core.utilcode.util; public class LocationUtils { /** diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/LocationUtils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/LocationUtils.java similarity index 79% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/LocationUtils.java rename to foudations/mogo-commons/src/main/java/com/mogo/commons/utils/LocationUtils.java index dcbb89611c..27303ea247 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/LocationUtils.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/LocationUtils.java @@ -1,16 +1,11 @@ -package com.mogo.eagle.core.function.v2x.events.utils; +package com.mogo.commons.utils; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X; -import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils; -import com.mogo.map.location.IMogoLocationClient; -import com.mogo.map.uicontroller.IMogoMapUIController; /** * author : donghongyu