[master] merge 6.7.4 conflict gradle version

This commit is contained in:
zhongchao
2024-11-11 14:27:10 +08:00
12 changed files with 196 additions and 60 deletions

View File

@@ -15,11 +15,16 @@ object CallerMapRoadListenerManager : CallerBase<IMoGoMapRoadListener>() {
private var mRoadId: String? = null
private var mStopLine: StopLine? = null
@Volatile
private var mRoadChange = false
@Volatile
private var mRoadCross: RoadCross? = null
@Volatile
private var mTrigger = false
private var mCross: Int by Delegates.observable(-1) { _, oldValue, newValue ->
if (oldValue != newValue) {
CallerLogger.d("$M_MAP onRoadChange observable", newValue)
@@ -40,9 +45,9 @@ object CallerMapRoadListenerManager : CallerBase<IMoGoMapRoadListener>() {
mStopLine?.let {
listener.onStopLineInfo(it)
}
if (mCross != -1 && mRoadCross != null) {
listener.onRoadChange(mRoadChange, mRoadCross)
}
// 启动默认false
listener.onRoadChange(mRoadChange, mRoadCross)
listener.onCrossDevice(mTrigger)
}
fun invokeListenersOnRoadIdGet(roadId: String) {
@@ -116,4 +121,17 @@ object CallerMapRoadListenerManager : CallerBase<IMoGoMapRoadListener>() {
entry.value.onCrossLiveInfo(info)
}
}
@ChainLog(
linkChainLog = ChainConstant.CHAIN_TYPE_STATUS,
linkCode = ChainConstant.CHAIN_SOURCE_MAP,
nodeAliasCode = ChainConstant.CHAIN_CODE_HD_MAP_ROAD_DEVICE_TRIGGER,
paramIndexes = [0]
)
fun invokeCrossDevice(trigger:Boolean){
mTrigger = trigger
M_LISTENERS.forEach { entry ->
entry.value.onCrossDevice(trigger)
}
}
}