Merge branch 'dev_robobus-d_241202_6.8.4' into dev_robotaxi-d_241210_6.9.0

# Conflicts:
#	OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
This commit is contained in:
yangyakun
2024-12-26 15:31:03 +08:00
57 changed files with 822 additions and 142 deletions

View File

@@ -65,7 +65,7 @@ dependencies {
implementation 'com.zhidaoauto.map:net:1.0.1'
implementation "com.zhidaoauto.machine:mapcore:${MAP_SDK_VERSION}"
implementation "com.zhidaoauto.machine:mapcore:${MAP_SDK_CORE_VERSION}"
implementation "com.zhidaoauto.machine:mapdata:${MAP_SDK_DATA_VERSION}"
}

View File

@@ -129,4 +129,12 @@ interface IMogoData {
* 获取路口数据
*/
fun getCrossRoad(lon: Double, lat: Double, angle: Double): CrossRoad?
fun listenTileFileLog()
fun stopListenTileFileLog()
fun openTileFileLog(isOpen: Boolean)
fun isTileFileLogOpen(): Boolean
}

View File

@@ -39,6 +39,8 @@ object MapDataWrapper : IMogoData {
mogoMapData.init(this)
}
private var isTileFileLogOpen = false
/**
* 设置debug模式
*/
@@ -376,4 +378,21 @@ object MapDataWrapper : IMogoData {
}
return temp.get()
}
override fun listenTileFileLog() {
MapAutoApi.setTileFileCallback(TileFileLogCallback())
}
override fun stopListenTileFileLog() {
MapAutoApi.clearTileFileCallback()
}
override fun openTileFileLog(isOpen: Boolean) {
MapAutoApi.openTileLog(isOpen)
isTileFileLogOpen = isOpen
}
override fun isTileFileLogOpen(): Boolean {
return isTileFileLogOpen
}
}

View File

@@ -0,0 +1,28 @@
package com.mogo.map
import com.autonavi.nge.hdmap.ITileCallback
import com.mogo.eagle.core.data.deva.chain.ChainConstant
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
import com.zhjt.service.chain.ChainLog
class TileFileLogCallback: ITileCallback {
companion object {
private const val TAG = "TileFileLogCallback"
}
override fun onLogCallback(msg: String) {
invokeNettyConnResult(msg)
}
@ChainLog(
linkChainLog = ChainConstant.CHAIN_TYPE_WEAK_NETWORK,
linkCode = ChainConstant.CHAIN_SOURCE_WEAK_NETWORK,
nodeAliasCode = ChainConstant.CHAIN_CODE_RECORD_WEAK_NETWORK,
paramIndexes = [0]
)
private fun invokeNettyConnResult(msg: String) {
d(M_MAP + TAG, " TileFileLogCallback : $msg")
}
}