diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt index b4e4f3a18e..08ed71c320 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt @@ -143,7 +143,7 @@ object OchBridgeManager: IMoGoPlanningTrajectoryListener, IMoGoAutopilotIdentify CallerMapUIServiceManager.getOverlayManager()?.hidePoint("RenderParkingModel") isHide = true } else { - Log.d(TAG, "pncActions-UTM度带号:${planningActionMsg.utmZone},坐标为:(${planningActionMsg.updatedTerminal.x},${planningActionMsg.updatedTerminal.y})") + Log.d(TAG, "pncActions-UTM度带号:${planningActionMsg.utmZone},坐标为:(${planningActionMsg.updatedTerminal.x},${planningActionMsg.updatedTerminal.y}),角度为:${planningActionMsg.parkingLotHeading}") val lonLatArr = map?.switchData( planningActionMsg.updatedTerminal.x, planningActionMsg.updatedTerminal.y, @@ -167,6 +167,7 @@ object OchBridgeManager: IMoGoPlanningTrajectoryListener, IMoGoAutopilotIdentify isHide = true return@let } + val angle = map!!.convertAngle(planningActionMsg.parkingLotHeading, it[0], it[1]).toFloat() // owner、level、id作为key去从缓存中取 val builder = Point.Options.Builder("TYPE_MARKER_PNC", Level.MAP_MARKER) @@ -175,13 +176,13 @@ object OchBridgeManager: IMoGoPlanningTrajectoryListener, IMoGoAutopilotIdentify .set3DMode(true) .isUseGps(true) .controlAngle(true) - .rotate(LocationUtils.rotateTo90(map!!.convertAngle(planningActionMsg.parkingLotHeading, it[0], it[1])).toFloat()) + .rotate(angle) .icon3DRes(R.raw.parking_model) .longitude(it[0]) .latitude(it[1]) CallerMapUIServiceManager.getOverlayManager() ?.showOrUpdatePoint(builder.build()) - Log.d(TAG, "pncActions-展示进站点(${it[0]},${it[1]})!") + Log.d(TAG, "pncActions-展示进站点(${it[0]},${it[1]})，角度为:${angle}!") if (isHide) { Log.d(TAG, "pncActions-显示被隐藏的进站点!") CallerMapUIServiceManager.getOverlayManager()?.showPoint("RenderParkingModel") diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt index 89089e568a..261ccbe987 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt @@ -17,7 +17,7 @@ object EnvManager { } fun isB2(): Boolean { - return AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode) + return AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) } fun isB2Driver(): Boolean { @@ -29,7 +29,7 @@ object EnvManager { } fun isT1T2(): Boolean { - return AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode) + return AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode) } fun isT1T2Driver(): Boolean { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt index d7c26644e9..a04cb103c2 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt @@ -4,6 +4,7 @@ import android.content.Context import android.media.AudioManager import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.och.common.module.manager.EnvManager import com.mogo.och.common.module.manager.audition.AuditionManager import com.mogo.och.common.module.manager.audition.MusicData import com.mogo.och.common.module.manager.audition.PlayState @@ -64,7 +65,11 @@ object AudioFocusManager : AuditionManager.MusicDataChangeListener { if(isPlaying!= isPlayingVideo) { isPlayingVideo = isPlaying if(isPlaying){ - AuditionManager.stop() + if(EnvManager.isT1T2Passenger()){ + AuditionManager.pause() + }else { + AuditionManager.stop() + } } } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt index 207561a4a7..c3feae4c51 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt @@ -64,6 +64,15 @@ object AuditionManager: AuditionCacheManager.DataChangeListener, Audition.OnAudi return Audition.isPlaying } + fun pause(){ + val playing = isPlaying() + if(playing){ + musicDataPlaying?.let { + toggle(it) + } + } + } + fun stop(){ val playing = isPlaying() if(playing){ diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java index a65047f64b..29983c3fd9 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java @@ -1,7 +1,6 @@ package com.mogo.eagle.core.function.business.routeoverlay; import static com.mogo.map.MogoMap.DEFAULT; -import static com.mogo.map.MogoMap.SMALL_DES_MAP; import android.annotation.SuppressLint; import android.graphics.Color; @@ -13,7 +12,6 @@ import androidx.core.util.Pools; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager; -import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils; @@ -188,8 +186,8 @@ public class RouteOverlayDrawer { RouteStrategy.INSTANCE.check(route.getVelocity(), route.getAcceleration(), routeList.size()); } } - double lon = CallerChassisLocationWGS84ListenerManager.INSTANCE.getWgs84Lon(); - double lat = CallerChassisLocationWGS84ListenerManager.INSTANCE.getWgs84Lat(); + double lon = CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84().getLongitude(); + double lat = CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84().getLatitude(); if (!points.isEmpty()) { MogoLatLng top = null; while (!points.isEmpty()) { @@ -200,8 +198,8 @@ public class RouteOverlayDrawer { if (first == top) { break; } - lon = CallerChassisLocationWGS84ListenerManager.INSTANCE.getWgs84Lon(); - lat = CallerChassisLocationWGS84ListenerManager.INSTANCE.getWgs84Lat(); + lon = CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84().getLongitude(); + lat = CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84().getLatitude(); long angle = isPointOnCarFront(lon, lat, bearing, first.lon, first.lat); if (angle >= 90) { if (isColorfulStrategy) { @@ -268,9 +266,6 @@ public class RouteOverlayDrawer { mPolylineOptions = options; } overlayManager.showOrUpdateLine(options,DEFAULT); - if (FunctionBuildConfig.isDrawDecIdentifyData && CallerMapIdentifyManager.INSTANCE.isDecViewLoaded()) { - overlayManager.showOrUpdateLine(options,SMALL_DES_MAP); - } } else { isExcept = true; }