[6.5.0] merge

This commit is contained in:
EmArrow
2024-06-27 19:05:12 +08:00
parent 1f06c9a89e
commit 46f3eccecf
47 changed files with 908 additions and 127 deletions

View File

@@ -1,5 +1,6 @@
package com.mogo.eagle.core.function.call.map
import android.util.Log
import com.mogo.eagle.core.data.deva.chain.ChainConstant
import com.mogo.eagle.core.data.road.RoadCameraLive
import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener
@@ -38,7 +39,7 @@ object CallerMapRoadListenerManager : CallerBase<IMoGoMapRoadListener>() {
mStopLine?.let {
listener.onStopLineInfo(it)
}
if(mCross != -1 && mRoadCross != null){
if (mCross != -1 && mRoadCross != null) {
listener.onRoadChange(mRoadChange, mRoadCross)
}
}
@@ -57,8 +58,16 @@ object CallerMapRoadListenerManager : CallerBase<IMoGoMapRoadListener>() {
}
}
fun getCrossInfo(): RoadCross? {
return mRoadCross
fun getCrossEndInfo(): String? {
return mRoadCross?.cross_id_end
}
fun getStopLineLatLng(): Pair<Double, Double>? {
return if (mStopLine == null) {
null
} else {
Pair(mStopLine!!.points[0].latitude, mStopLine!!.points[0].longitude)
}
}
@ChainLog(
@@ -77,13 +86,19 @@ object CallerMapRoadListenerManager : CallerBase<IMoGoMapRoadListener>() {
}
fun invokeRoadCrossClick() {
M_LISTENERS.forEach { entry ->
entry.value.onRoadCrossClick()
}
}
@ChainLog(
linkChainLog = ChainConstant.CHAIN_TYPE_STATUS,
linkCode = ChainConstant.CHAIN_SOURCE_MAP,
nodeAliasCode = ChainConstant.CHAIN_CODE_HD_MAP_ROAD_LIVE,
paramIndexes = [0]
)
fun invokeRoadCrossLive(info: RoadCameraLive){
fun invokeRoadCrossLive(info: RoadCameraLive) {
M_LISTENERS.forEach { entry ->
entry.value.onCrossLiveInfo(info)
}

View File

@@ -25,4 +25,8 @@ object CallerSkinModeListenerManager : CallerBase<IMoGoSkinModeChangeListener>()
}
}
fun getMode():Int{
return CallerMoGoUiSettingManager.getDayMode()
}
}