yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_robotaxi-d_250603_8.1.0' into dev_robotaxi-d_250603_8.1.0

Browse Source
This commit is contained in:
xuxinchao
2025-06-25 17:37:57 +08:00
parent ec91c73ebb ea3b4397ce
commit 03b3c37894
5 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt
View File

@@ -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")

4
OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt
View File

@@ -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 {

7
OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt
View File

@@ -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()
}
}
}
}

9
OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt
View File

@@ -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){

13
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java
View File

@@ -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;
}