From 141dafbbed62ea5fbae1cc9d80e6e87e173af9ee Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 29 Aug 2023 18:13:29 +0800 Subject: [PATCH] [6.0.0] roma change and update log version --- .../business/ai/AiCloudIdentifyDataManager.kt | 11 ++++++++++- .../core/data/biz/trafficlight/TrafficLightStatus.kt | 2 +- .../mogo/eagle/core/data/deva/chain/ChainConstant.kt | 1 + gradle.properties | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt index 524ec313b2..8a63e45178 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt @@ -17,6 +17,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_RO import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_CHANGE_END import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_END import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_ERROR +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_READY_START import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_START import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST_DELAY @@ -246,9 +247,17 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, 0 -> { MapBizTrace.log( CHAIN_CODE_ROMA_REQUEST_OK, + CHAIN_CODE_ROMA_MAP_READY_START, + TAG, + mutableMapOf("romaStart" to "地图准备漫游动画") + ) + } + 4 -> { + MapBizTrace.log( + CHAIN_CODE_ROMA_MAP_READY_START, CHAIN_CODE_ROMA_MAP_START, TAG, - mutableMapOf("romaStart" to "地图开始漫游") + mutableMapOf("romaStart" to "地图漫游动画结束,开始漫游") ) showAiCloud.set(true) FunctionBuildConfig.isDrawIdentifyData = false diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/TrafficLightStatus.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/TrafficLightStatus.kt index 8b4fd7ede3..7587fcf105 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/TrafficLightStatus.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/TrafficLightStatus.kt @@ -31,7 +31,7 @@ fun TrafficLightStatus.turnRedAtOnce(): Boolean { data class TrafficLightStatus( val phaseNo: String, //相位编号 val color: String, //灯态: 红灯-R,绿灯-G,绿闪-FG,黄-Y,B-黑 - val remain: Int //倒计时-秒 + val remain: Int //倒计时-秒 todo 云端string类型 如果返回 -- 解析异常 ) { } \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt index 17cc9cf1c1..f243da70ef 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt @@ -118,6 +118,7 @@ class ChainConstant { const val CHAIN_CODE_ROMA_REQUEST_ERROR = "CHAIN_CODE_ROMA_REQUEST_ERROR" const val CHAIN_CODE_ROMA_REQUEST_DELAY = "CHAIN_CODE_ROMA_REQUEST_DELAY" const val CHAIN_CODE_ROMA_MODE_INVOKE = "CHAIN_CODE_ROMA_MODE_INVOKE" + const val CHAIN_CODE_ROMA_MAP_READY_START = "CHAIN_CODE_ROMA_MAP_READY_START" const val CHAIN_CODE_ROMA_MAP_START = "CHAIN_CODE_ROMA_MAP_START" const val CHAIN_CODE_ROMA_MAP_END = "CHAIN_CODE_ROMA_MAP_END" const val CHAIN_CODE_ROMA_MAP_CHANGE_END = "CHAIN_CODE_ROMA_MAP_CHANGE_END" diff --git a/gradle.properties b/gradle.properties index cab15485b6..06be73deb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -58,7 +58,7 @@ bytex.ASM_API=ASM7 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.9.5-SNAPSHOT +LOGLIB_VERSION=1.9.6 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.4.7.16 @@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.16 MOGO_TELEMATIC_VERSION=1.4.7.16 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.14.3.4 +MAP_SDK_VERSION=2.14.3.5 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket WEBSOCKET_VERSION=1.1.7