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 db846b1032..4e2cec76af 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 @@ -17,9 +17,9 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON +import com.mogo.eagle.core.utilcode.util.LocationUtils import com.mogo.map.MogoMap import com.mogo.map.MogoMap.Companion.mapInstance -import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils import com.mogo.map.overlay.core.Level import com.mogo.map.overlay.point.Point import com.mogo.och.bridge.BridgeServiceManager @@ -133,28 +133,30 @@ object OchBridgeManager: IMoGoPlanningTrajectoryListener, IMoGoAutopilotIdentify isHide = true return@let } + val distance = LocationUtils.getDistance(it[0], it[1], getWgs84Lon(), getWgs84Lat()) // 只处理100m以内的 - if (DrivingDirectionUtils.distance(it[0], it[1], getWgs84Lon(), getWgs84Lat()) >= 100) { + if (distance >= 100) { Log.d(TAG, "pncActions-进站点距离自车过远,不展示!") CallerMapUIServiceManager.getOverlayManager()?.hidePoint("RenderParkingModel") isHide = true return@let } + Log.d(TAG, "pncActions-进站点距离自车${distance}米!") // owner、level、id作为key去从缓存中取 val builder = - Point.Options.Builder("TYPE_MARKER_PNC", Level.DEFAULT) + Point.Options.Builder("TYPE_MARKER_PNC", Level.MAP_MARKER) .setId("RenderParkingModel") .anchor(0.5f, 0.5f) .set3DMode(true) .isUseGps(true) .controlAngle(true) - .rotate(map!!.convertAngle(planningActionMsg.parkingLotHeading, it[0], it[1]).toFloat()) + .rotate(LocationUtils.rotateTo90(map!!.convertAngle(planningActionMsg.parkingLotHeading, it[0], it[1])).toFloat()) .icon3DRes(R.raw.parking_model) .longitude(it[0]) .latitude(it[1]) CallerMapUIServiceManager.getOverlayManager() ?.showOrUpdatePoint(builder.build()) - Log.d(TAG, "pncActions-展示进站点!") + Log.d(TAG, "pncActions-展示进站点(${it[0]},${it[1]})!") if (isHide) { Log.d(TAG, "pncActions-显示被隐藏的进站点!") CallerMapUIServiceManager.getOverlayManager()?.showPoint("RenderParkingModel") diff --git a/OCH/common/bridge/src/main/res/raw/parking_model.nt3d b/OCH/common/bridge/src/main/res/raw/parking_model.nt3d index ba34aa92fd..2d14a508fd 100644 Binary files a/OCH/common/bridge/src/main/res/raw/parking_model.nt3d and b/OCH/common/bridge/src/main/res/raw/parking_model.nt3d differ