From 2285ad73d37637e275919c679ec1d1370fce09fc Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Mon, 23 Jun 2025 19:05:44 +0800 Subject: [PATCH] =?UTF-8?q?[8.1.0][opt]=E6=9B=BF=E6=8D=A2=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E8=BD=A6=E4=BD=8D=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bridge/bridge/OchBridgeManager.kt | 12 +++++++----- .../src/main/res/raw/parking_model.nt3d | Bin 26917 -> 33493 bytes 2 files changed, 7 insertions(+), 5 deletions(-) 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 ba34aa92fd57de927d26f8c037690b984a75e709..2d14a508fd4a4d5fb4dea3a321df24e358fc15eb 100644 GIT binary patch literal 33493 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≫@94h^qO1Bix@-9SB`?N>$Nqx!556>;#|N}N{z>bV^+xUaEOG z{4M%>l%wZ6<1;Qi_UY=g|Ml-x{zXQTcbF1oK9wLfprdgFNokInw#9K`sH3y-~z_QjOe4|zPTKKH@-`ukm@ zz66g=UgWV(&&x-&A9)_aW0M!>EXHSCc^>;t_;jzh! zb0Xt2E9U-!egJK^?Zo>InO!z2Ymw`o97;R@O=CK z=h`SgZ1Unc$M}p3kIi$B_bc9;9$lg}s(RtEU)MS5p=b5X9bMrsRNp#JdU)(hmEW7B z=L%09@YvMJ`yt~K7aqH`UjFbo_0Q22p1APX%ccA5cAZZ~S9r#S$L4pTRHJy2iXN9&y{{AxYFUzQ#o`&{W)O3xLZbqbHodgXna`JhgC>=W0jcWZvQ!c!+a z_6xVFmuP;t!ZQ!>*z8Z<$CwZ5gvUNpec(UUFS)`~Cp`9FtDjx2e#RA^d4R{JzwrHn z`JhgC>?7CdyNuQ+S9t1#$G%hjdyD!3S9sV(Js zb3K1H&#&SN&pg0m^E}{t5c5Hu@Yts*{ui~cxx!N?Jof#1-u|fcT;Z7qcx;}3d@o== zs1qK0r{;h0JM~^Ly24W@JoYB(7HB@X!ZQ!>*dLSL=ZhP(?))Cld{8Gm_Di~7H*Txq z3QwKz*vq6}AU#)j<^dj?^9tWzm=EfN$M*Z>6`CKe@YD&9eWUa%G(TM7nFn}m&Rcx1 zWIm`99{WSu?{C+41g`MZ36Fi1=KV39XSu>N5AfKWFZrIud{8Gm_6d5fEz$ku3QwKz z*z2W#O?s~I%mX|&=VP7|%m;PCWAl9A3QwKz*gPM&!ZQ!>*gQA*KFEAfCp`9d^?tTc z{gx{{b;4s`wpj1K(sPAp9^kQgpW*u^;}aJid%oTqm+Se+6`r{8*pEs7_tJBPXIyw} z-uL)E%lO2F$G&~h@H+@sc;doifA-X>lXNEL3eULk*t`$(eVOrz3y*z+?$^26UtHmd z3y*z;?$_SZbA@MIcx=8G@O_-|i3^YYb;j z?7y#=KRNQmYjrtb#n~5pLjPx_!~APr-E_<0`Zn^8dn<4JSu~$Ln$$3X}IM#P$`7fMv)}}Kq XS~dLpnf^&k_m@@tbFzScf3NyKTue?0 literal 26917 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