[3.3.0]merge

This commit is contained in:
zhongchao
2023-06-15 16:30:47 +08:00
parent 489fb32adb
commit adf993b473
46 changed files with 440 additions and 461 deletions

View File

@@ -5,7 +5,6 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
import com.zhjt.service.chain.ChainLog
import com.zhjt.service.chain.TracingConstants
class V2XBizTrace {
@@ -14,10 +13,8 @@ class V2XBizTrace {
@ChainLog(
linkChainLog = ChainConstant.CHAIN_LINK_LOG_CLOUD_V2N,
linkCode = ChainConstant.CHAIN_LINK_CLOUD,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_CLOUD_V2N,
paramIndexes = [0, 1],
clientPkFileName = "sn"
paramIndexes = [0, 1]
)
fun onAck(data: Any, data1: Any) {
if (DebugConfig.isDebug()) {

View File

@@ -150,10 +150,8 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
@ChainLog(
linkChainLog = CHAIN_LINK_LOG_CLOUD_V2N,
linkCode = CHAIN_LINK_CLOUD,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_V2N,
paramIndexes = [0],
clientPkFileName = "sn"
paramIndexes = [0]
)
override fun onAck(event: V2XEvent) {
Log.d("$M_V2X$TAG", "OK->: $event")
@@ -187,10 +185,8 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
@ChainLog(
linkChainLog = CHAIN_LINK_LOG_CLOUD_V2N,
linkCode = CHAIN_LINK_CLOUD,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_V2N,
paramIndexes = [0],
clientPkFileName = "sn"
paramIndexes = [0]
)
override fun onAutopilotIdentifyPlanningObj(planningObjects: List<PlanningObject>?) {
super.onAutopilotIdentifyPlanningObj(planningObjects)

View File

@@ -200,13 +200,6 @@ internal object V2NIdentifyDrawer {
override fun onAutopilotIdentifyDataUpdate(trafficData: List<TrackedObject>?) {
super.onAutopilotIdentifyDataUpdate(trafficData)
try {
if (trafficData != null) {
V2XBizTrace.onAck("onAutopilotIdentifyDataUpdate", trafficData)
}
} catch (t: Throwable) {
t.printStackTrace()
}
val shiGong = trafficData?.filter { it.type == 501 || it.type == 502 }
if (shiGong != null && shiGong.isNotEmpty()) {
drawShiGong(shiGong)