From f5088b61d0fe93e6510c26c980309137466b0fa0 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 29 Feb 2024 18:00:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[6.3.0][Feat]=E6=96=B0=E5=A2=9E=E5=B7=A5?= =?UTF-8?q?=E6=8E=A7=E6=9C=BA=E8=BF=9E=E6=8E=A5=E7=8A=B6=E6=80=81=E3=80=81?= =?UTF-8?q?SSM=E7=AD=89=E6=B6=88=E6=81=AF=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/msgbox/DataManager.kt | 4 ++-- .../com/mogo/eagle/core/data/msgbox/AutopilotMsg.kt | 11 +++++++++++ .../com/mogo/eagle/core/data/msgbox/MsgBoxType.kt | 4 ++-- .../java/com/mogo/eagle/core/data/msgbox/SSMMsg.kt | 11 +++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/AutopilotMsg.kt create mode 100644 core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/SSMMsg.kt diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt index b185e1543e..6a67044de7 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt @@ -135,13 +135,13 @@ object DataManager { MsgBoxType.VOICE -> { CallerMsgBoxListenerManager.invokeListener(MsgCategory.VOICE_INFO, msg) } - MsgBoxType.OBU, MsgBoxType.NOTICE, MsgBoxType.OPERATION -> { + MsgBoxType.OBU, MsgBoxType.NOTICE, MsgBoxType.OPERATION, MsgBoxType.AUTOPILOT -> { synchronized(this) { notifyList.add(msg) } CallerMsgBoxListenerManager.invokeListener(MsgCategory.NOTICE, msg) } - MsgBoxType.REPORT -> { + MsgBoxType.REPORT, MsgBoxType.SSMINFO -> { synchronized(this) { sysInfoList.add(msg) } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/AutopilotMsg.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/AutopilotMsg.kt new file mode 100644 index 0000000000..dbab931fb8 --- /dev/null +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/AutopilotMsg.kt @@ -0,0 +1,11 @@ +package com.mogo.eagle.core.data.msgbox + +/** + * 工控机相关的消息 + */ +data class AutopilotMsg( + val type: Int, + val title: String?, + val content: String?, + val timestamp : Long +) \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxType.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxType.kt index d96f98507c..15596db66c 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxType.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxType.kt @@ -1,6 +1,6 @@ package com.mogo.eagle.core.data.msgbox enum class MsgBoxType { - // 按功能划分为几大类：运营、通知、V2X模块、OBU模块、工控机Report、录制、交通、FM、语音等 - OPERATION, NOTICE, V2X, OBU, REPORT, RECORD, TRAFFIC, FMINFO, VOICE + // 按功能划分为几大类：运营、通知、V2X模块、OBU模块、工控机Report、录制、交通、FM、语音、SSM、工控机相关等 + OPERATION, NOTICE, V2X, OBU, REPORT, RECORD, TRAFFIC, FMINFO, VOICE, SSMINFO, AUTOPILOT } \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/SSMMsg.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/SSMMsg.kt new file mode 100644 index 0000000000..9d13c101f0 --- /dev/null +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/SSMMsg.kt @@ -0,0 +1,11 @@ +package com.mogo.eagle.core.data.msgbox + +/** + * SSM消息 + */ +data class SSMMsg( + val type: Int, + val title: String?, + val content: String?, + val timestamp : Long +) \ No newline at end of file From 63dc46bd1b16d2ca124561873d7d9adf535969f0 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Mon, 4 Mar 2024 15:31:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.3.0][Fix]=E8=A7=A3=E5=86=B3=E5=A4=A9?= =?UTF-8?q?=E7=A9=BA=E7=9B=92=E5=AD=90=E5=8A=A8=E7=94=BB=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/sdk/inner/common/ConstantExt.kt | 1 + .../map/sdk/inner/map/MapController.kt | 75 ++++++++++++------- 2 files changed, 50 insertions(+), 26 deletions(-) diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt index d8e4c79f82..ff37048d58 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt @@ -138,6 +138,7 @@ object ConstantExt { const val MAP_STYLE_VR_OVER_LOOK_ANGLE_SKYBOX = 13f//视角 const val MAP_STYLE_VR_ZOOM_VAL_SKYBOX = 0.8f//缩放 const val MAP_STYLE_VR_EYE_HEIGHT_SKYBOX = 12f//高度 + const val MAP_STYLE_VR_ANIMATE_TIME_SKYBOX = 1500 //默认尾灯不亮 const val SELF_CAR_DEFAULT = 0 diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt index 61b3a263e2..61ef97b489 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt @@ -1297,6 +1297,45 @@ class MapController(private var context: Context?, private val mMapView: IMapVie var remainList = CopyOnWriteArrayList() var mLastPosition = LonLatPoint() var mRoamPostion = 0 + var lastViewType = ConstantExt.MAP_STYLE_VR_ANGLE_MIDDLE + + fun enableSkybox(){ + mMapView.getMapEngine().setCfgKeyVal(ConstantExt.SKYBOX, "enable;" + + "${ConstantExt.MAP_STYLE_VR_ANIMATE_TIME_SKYBOX}") + interpolation( + ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_SKYBOX, + ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_SKYBOX, + ConstantExt.MAP_STYLE_VR_ZOOM_VAL_SKYBOX, + ConstantExt.MAP_STYLE_VR_SKY_BOX, + -1 + ) + } + fun disableSkybox(eyeHeight: Float, angle: Float, zoomVal: Float, mode: Int, duration: Int){ + if(lastViewType==ConstantExt.MAP_STYLE_VR_SKY_BOX){ + mMapView.getMapEngine().setCfgKeyVal(ConstantExt.SKYBOX, "disable;" + + "${eyeHeight};" + + "${angle};" + + "${zoomVal};" + + "${ConstantExt.MAP_STYLE_VR_ANIMATE_TIME_SKYBOX}") + } + } + fun disableSkyboxAndInterpolation(eyeHeight: Float, angle: Float, zoomVal: Float, mode: Int, duration: Int){ + disableSkybox( + eyeHeight, + angle, + zoomVal, + mode, + duration, + ) + interpolation( + eyeHeight, + angle, + zoomVal, + mode, + duration, + ) + } + override fun setMapViewVisualAngle(type: Int) { mHandler.removeMessages(LOCK_CAR) mHandler.removeMessages(CHANGE_VIEW_ANGLE) @@ -1323,17 +1362,13 @@ class MapController(private var context: Context?, private val mMapView: IMapVie if (!mLockLocation.getLockCar() && type != ConstantExt.MAP_STYLE_VR_ROAM) { mLockLocation.setLockCar(true) } - if (type != ConstantExt.MAP_STYLE_VR_SKY_BOX) { - mMapView.getMapEngine().setCfgKeyVal(ConstantExt.FOG, "disable") - mMapView.getMapEngine().setCfgKeyVal(ConstantExt.SKYBOX, "disable") - } if(type != ConstantExt.MAP_STYLE_VR_BRIDGE){ mMapView.getMapEngine().setCfgKeyVal(ConstantExt.BRIDGE, "disable") } // mMapView.setIsFarViewAngel(false) when (type) { ConstantExt.MAP_STYLE_VR_ANGLE_MIDDLE -> { - interpolation( + disableSkyboxAndInterpolation( ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_MIDDLE, ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_MIDDLE, ConstantExt.MAP_STYLE_VR_ZOOM_VAL_MIDDLE, @@ -1343,7 +1378,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } ConstantExt.MAP_STYLE_VR_ANGLE_MIDDLE_XIAOBA -> { - interpolation( + disableSkyboxAndInterpolation( ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_MIDDLE_XIAOBA, ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_MIDDLE_XIAOBA, ConstantExt.MAP_STYLE_VR_ZOOM_VAL_MIDDLE_XIAOBA, @@ -1353,7 +1388,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } ConstantExt.MAP_STYLE_VR_ERHAI_B2 -> { - interpolation( + disableSkyboxAndInterpolation( ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_ERHAI, ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_ERHAI, ConstantExt.MAP_STYLE_VR_ZOOM_VAL_ERHAI, @@ -1363,26 +1398,13 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } ConstantExt.MAP_STYLE_VR_SKY_BOX -> { - skyJob = getDemaningScope()?.launch(Dispatchers.IO) { - interpolation( - ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_SKYBOX, - ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_SKYBOX, - ConstantExt.MAP_STYLE_VR_ZOOM_VAL_SKYBOX, - ConstantExt.MAP_STYLE_VR_SKY_BOX, - -1 - ) - delay(1000) - //mMapView.getMapEngine().setCfgKeyVal("isSkyBoxFastChange", "disable") - mMapView.getMapEngine().setCfgKeyVal(ConstantExt.FOG, "enable") - mMapView.getMapEngine().setCfgKeyVal(ConstantExt.SKYBOX, "enable") - } -// + enableSkybox() } ConstantExt.MAP_STYLE_VR_ANGLE_FAR -> { // mMapView.setScreenToOriginDis(ConstantExt.MAP_STYLE_VR_POSITION_FAR) // mMapView.setDAngle(ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_FAR) - interpolation( + disableSkyboxAndInterpolation( ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_FAR, ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_FAR, ConstantExt.MAP_STYLE_VR_ZOOM_VAL_FAR, @@ -1428,7 +1450,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } ConstantExt.MAP_STYLE_VR_ANGLE_300 -> { - interpolation( + disableSkyboxAndInterpolation( ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_300, ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_300, ConstantExt.MAP_STYLE_VR_ZOOM_VAL_300, @@ -1439,7 +1461,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } ConstantExt.MAP_STYLE_VR_ANGLE_TOP -> { - interpolation( + disableSkyboxAndInterpolation( ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_TOP, ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_TOP, ConstantExt.MAP_STYLE_VR_ZOOM_VAL_TOP, @@ -1450,7 +1472,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } ConstantExt.MAP_STYLE_VR_ANGLE_CROSS -> { - interpolation( + disableSkyboxAndInterpolation( ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_CROSS, ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_CROSS, ConstantExt.MAP_STYLE_VR_ZOOM_VAL_CROSS, @@ -1500,7 +1522,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie ConstantExt.MAP_STYLE_VR_BRIDGE->{ mMapView.getMapEngine().setCfgKeyVal(ConstantExt.BRIDGE, "enable") - interpolation( + disableSkyboxAndInterpolation( ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_BRIDGE, ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_BRIDGE, ConstantExt.MAP_STYLE_VR_ZOOM_VAL_BRIDGE, @@ -1513,6 +1535,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie if(type != ConstantExt.MAP_STYLE_VR_ROAM) { mEventController?.dispatchMapViewVisualAngleChangeListener(type) } + lastViewType = type } fun setRoamStyle() {