[code_opt_3.3.0] remove unuse log and fix bug of trace link

2023-06-15 11:51:17 +08:00
parent 23ed2e4315
commit fef4bf97bb
13 changed files with 165 additions and 137 deletions
--- 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
@@ -9,9 +9,12 @@ import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_CLICK
-import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_CLICK_END
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_CLOSE_CLICK
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_CLOUD_ERROR
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_CLOUD_PUSH
+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_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_ERROR
@@ -29,6 +32,7 @@ import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.updateLongSightLevel
 import com.mogo.eagle.core.function.utils.MapBizTrace
+import com.mogo.eagle.core.function.utils.MapBizTrace.Companion.getCurrentCNode
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.map.MogoMapUIController
@@ -44,6 +48,10 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
    companion object {
        private const val TAG = "AiCloudIdentifyData"

+        private const val H_ERROR_CLOUD = 1
+        private const val H_ERROR_MAP = 2
+        private const val H_DELAY_TIME = 3_000L
+
        var START_METRE = 3
        var END_METRE = 2000

@@ -57,18 +65,40 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,

    private var aiCloudDataChange = AtomicBoolean(false)

+    @Volatile
+    private var cloudDataSize = 0
+
    private val handler = Handler {
-        if (it.what == 1) {
+        if (it.what == H_ERROR_CLOUD) {
            if (!aiCloudDataChange.get()) {
                MapBizTrace.log(
                    CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_CLOUD_ERROR, TAG, GsonUtils.toJson(
                        mutableMapOf(
-                            "msg" to "云端5秒内无感知数据下发",
+                            "msg" to "云端 $H_DELAY_TIME 秒内无感知数据下发",
                            "socketStatus" to MogoStatusManager.getInstance().isSocketOnLine,
                            "cityCode" to CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().cityCode
                        )
                    )
                )
+            } else {
+                MapBizTrace.log(
+                    CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_CLOUD_PUSH, TAG, GsonUtils.toJson(
+                        mutableMapOf(
+                            "msg" to "延迟 $H_DELAY_TIME 秒内获取云端下发感知数据大小",
+                            "cloudDataSize" to cloudDataSize
+                        )
+                    )
+                )
+            }
+        }
+        if (it.what == H_ERROR_MAP) {
+            MapBizTrace.log(
+                CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_MAP_ERROR, TAG, GsonUtils.toJson(
+                    mutableMapOf("msg" to "地图漫游模式启动失败")
+                )
+            )
+            if (DebugConfig.isDebug()) {
+                ToastUtils.showShort("进入漫游模式失败")
            }
        }
        true
@@ -96,13 +126,16 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
                        obj?.let {
                            obj.data?.let {
                                if (it.allListList != null && it.allListList.size > 0) {
-                                    aiCloudDataChange.set(true)
+                                    if (!aiCloudDataChange.get()) {
+                                        aiCloudDataChange.set(true)
+                                    }
                                }
                                if (showAiCloud.get()) {
                                    if (it.allListList == null || it.allListList.size == 0) {
                                        MapIdentifySubscriber.instance.clearAiCloudRoma()
                                        return
                                    }
+                                    cloudDataSize = it.allListList.size
                                    MapIdentifySubscriber.instance.renderAiCloudResult(it.allListList)
                                }
                            }
@@ -112,17 +145,20 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
    }

    fun trigger(romaStatus: Boolean) {
-        MapBizTrace.log(
-            "",
-            CHAIN_CODE_ROMA_CLICK,
-            TAG,
-            GsonUtils.toJson(mutableMapOf("trigger" to romaStatus))
-        )
        // 乘客司机屏屏各自单独控制漫游
        if (romaStatus) {
            // 开启roma，当前非漫游，开启
+            MapBizTrace.log(
+                "",
+                CHAIN_CODE_ROMA_CLICK,
+                TAG,
+                GsonUtils.toJson(mutableMapOf("trigger" to true))
+            )
            openRoma()
        } else {
+            // 跟上次关联，需要确认parent进度
+            MapBizTrace.log(getCurrentCNode(), CHAIN_CODE_ROMA_CLOSE_CLICK, TAG, "")
+            handler.removeMessages(H_ERROR_CLOUD)
            closeRoma()
        }
    }
@@ -134,13 +170,13 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
        }
    }

+    @Synchronized
    private fun closeRoma(manual: Boolean = true) {
        updateLongSightLevel(false)
        requestRangeOfIdentify(false)
        MapIdentifySubscriber.instance.clearAiCloudRoma()
        // 主动关闭roma，回到中景视角
        if (manual) {
-            MapBizTrace.logEnd(CHAIN_CODE_ROMA_CLICK, CHAIN_CODE_ROMA_CLICK_END, TAG, "")
            MogoMapUIController.getInstance()
                .changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
        }
@@ -160,7 +196,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
                    "socketStatus" to MogoStatusManager.getInstance().isSocketOnLine,
                    "cityCode" to CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().cityCode
                )
-            )
+            ), !dataReceive
        )
        aiCloudIdentifyNetWorkModel.requestIdentifyRange(
            dataReceive,
@@ -178,7 +214,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
                            "startRange" to START_METRE,
                            "endRange" to END_METRE,
                        )
-                    )
+                    ), !dataReceive
                )
                if (dataReceive) {
                    // 请求地图开始漫游
@@ -190,7 +226,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
            },
            { errorMsg ->
                // false，改变父节点信息
-                MapBizTrace.logEnd(
+                MapBizTrace.log(
                    if (dataReceive) CHAIN_CODE_ROMA_REQUEST else "",
                    CHAIN_CODE_ROMA_REQUEST_ERROR,
                    TAG,
@@ -201,7 +237,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
                            "startRange" to START_METRE,
                            "endRange" to END_METRE
                        )
-                    )
+                    ), true
                )
                updateLongSightLevel(false)
                CallerMapRomaListener.invokeMapRoma(false)
@@ -214,35 +250,53 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
    //status 0：进入漫游模式成功 1；进入漫游模式失败 2：正常结束漫游 3：切换视角结束漫游
    override fun mapRomaStatus(status: Int, msg: String) {
        super.mapRomaStatus(status, msg)
-        MapBizTrace.log(
-            CHAIN_CODE_ROMA_REQUEST_OK,
-            CHAIN_CODE_ROMA_MAP_START,
-            TAG,
-            GsonUtils.toJson(mutableMapOf("mapStatus" to status, "mapRomaMsg" to msg))
-        )
        when (status) {
            0 -> {
+                MapBizTrace.log(
+                    CHAIN_CODE_ROMA_REQUEST_OK,
+                    CHAIN_CODE_ROMA_MAP_START,
+                    TAG,
+                    GsonUtils.toJson(mutableMapOf("romaStart" to "地图开始漫游"))
+                )
                showAiCloud.set(true)
                FunctionBuildConfig.isDrawIdentifyData = false
                // 5秒没有触发 则预警日志写入
-                handler.sendEmptyMessageDelayed(1, 5_000L)
+                handler.sendEmptyMessageDelayed(H_ERROR_CLOUD, H_DELAY_TIME)
            }
            1 -> {
-                if (DebugConfig.isDebug()) {
-                    ToastUtils.showShort("进入漫游模式失败，msg:$msg")
-                }
+                handler.sendEmptyMessage(H_ERROR_MAP)
+                reset()
            }
-            2, 3 -> {
-                if (showAiCloud.get()) {
-                    MapBizTrace.logEnd(
-                        CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_MAP_END, TAG, GsonUtils.toJson(
-                            mutableMapOf("romaEnd" to "地图结束回调，状态：$status")
-                        )
-                    )
-                    showAiCloud.set(false)
-                    closeRoma(false)
-                    FunctionBuildConfig.isDrawIdentifyData = true
-                }
+            2 -> { // 地图自动漫游结束，重置状态，调用close通知服务端
+                MapBizTrace.log(
+                    CHAIN_CODE_ROMA_MAP_START, CHAIN_CODE_ROMA_MAP_END, TAG, GsonUtils.toJson(
+                        mutableMapOf("romaEnd" to "地图结束回调，状态：$status")
+                    ), true
+                )
+                reset()
+            }
+            3 -> { // 业务释放地图视角锁定，回调切换视角结束漫游
+                MapBizTrace.log(
+                    CHAIN_CODE_ROMA_CLOSE_CLICK,
+                    CHAIN_CODE_ROMA_MAP_CHANGE_END,
+                    TAG,
+                    GsonUtils.toJson(
+                        mutableMapOf("romaEnd" to "地图结束回调，状态：$status")
+                    ),
+                    true
+                )
+                reset(false)
+            }
+        }
+    }
+
+    private fun reset(invokeCloud: Boolean = true) {
+        if (showAiCloud.get()) {
+            showAiCloud.set(false)
+            aiCloudDataChange.set(false)
+            FunctionBuildConfig.isDrawIdentifyData = true
+            if (invokeCloud) {
+                closeRoma(false)
            }
        }
    }
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyAiCloudDataDrawer.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyAiCloudDataDrawer.kt
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import androidx.collection.ArraySet
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.module.status.MogoStatusManager
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.w
 import com.mogo.map.identify.MogoIdentifyManager
 import mogo.yycp.api.proto.SocketDownData
 import java.util.concurrent.ConcurrentHashMap
@@ -36,12 +35,10 @@ class IdentifyAiCloudDataDrawer : Identify {
    override fun renderAiCloudResult(resultList: List<SocketDownData.CloudRoadDataProto>) {
        if (resultList.isEmpty()) {
            clearOldMarker()
-            w(TAG, "感知数据为空无需渲染……")
            return
        }
        if (!MogoStatusManager.getInstance().isVrMode) {
            clearOldMarker()
-            w(TAG, "渲染 adas 识别的数据 当前不是VR模式")
            return
        }

--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyBeautifyDataDrawer.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyBeautifyDataDrawer.kt
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.data.traffic.TrafficData
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.w
 import com.mogo.map.identify.MogoIdentifyManager
 import mogo.telematics.pad.MessagePad
 import mogo.telematics.pad.MessagePad.TrackedObject
@@ -35,12 +34,10 @@ class IdentifyBeautifyDataDrawer : Identify {
    override fun renderAdasRecognizedResult(resultList: List<TrackedObject>?) {
        if (resultList == null || resultList.isEmpty()) {
            TrackManager.getInstance().clearAll()
-            w(TAG, "感知数据为空无需渲染……")
            return
        }
        if (!MogoStatusManager.getInstance().isVrMode) {
            TrackManager.getInstance().clearAll()
-            w(TAG, "渲染 adas 识别的数据 当前不是VR模式")
            return
        }

--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt
@@ -5,7 +5,6 @@ import androidx.collection.ArraySet
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.data.traffic.TrafficData
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.w
 import com.mogo.map.identify.MogoIdentifyManager
 import mogo.telematics.pad.MessagePad.PlanningObject
 import mogo.telematics.pad.MessagePad.TrackedObject
@@ -57,12 +56,10 @@ class IdentifyOriginDataDrawer : Identify {
    override fun renderAdasRecognizedResult(resultList: List<TrackedObject>?) {
        if (resultList == null || resultList.isEmpty()) {
            clearOldMarker()
-            w(TAG, "感知数据为空无需渲染……")
            return
        }
        if (!MogoStatusManager.getInstance().isVrMode) {
            clearOldMarker()
-            w(TAG, "渲染 adas 识别的数据 当前不是VR模式")
            return
        }

--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapBizTrace.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapBizTrace.kt
@@ -11,27 +11,55 @@ import com.zhjt.service.chain.ParentNodeAlias
 class MapBizTrace {

    companion object {
-        @ChainLog(
-            linkChainLog = ChainConstant.CHAIN_TYPE_HD_MAP,
-            linkCode = ChainConstant.CHAIN_SOURCE_MAP,
-            paramIndexes = [2, 3],
-            endPoint = false
-        )
-        fun log(@ParentNodeAlias pN: String, @ChildNodeAlias cN: String, data: Any, data1: Any) {
+
+        private var cNode: String = ""
+
+        fun log(pN: String, cN: String, data: Any, data1: Any, end: Boolean = false) {
+            if (end) {
+                logEnd(pN, cN, data, data1)
+            } else {
+                realLog(pN, cN, data, data1)
+            }
            if (DebugConfig.isDebug()) {
                CallerLogger.d("$M_MAP${data.toString()}", data1)
            }
        }

+        @ChainLog(
+            linkChainLog = ChainConstant.CHAIN_TYPE_HD_MAP,
+            linkCode = ChainConstant.CHAIN_SOURCE_MAP,
+            paramIndexes = [2, 3],
+            endPoint = false
+        )
+        private fun realLog(
+            @ParentNodeAlias pN: String,
+            @ChildNodeAlias cN: String,
+            data: Any,
+            data1: Any
+        ) {
+            if (pN.isNotEmpty() && cN != ChainConstant.CHAIN_CODE_ROMA_CLOUD_ERROR) {
+                cNode = cN
+            }
+        }
+
        @ChainLog(
            linkChainLog = ChainConstant.CHAIN_TYPE_HD_MAP,
            linkCode = ChainConstant.CHAIN_SOURCE_MAP,
            paramIndexes = [2, 3]
        )
-        fun logEnd(@ParentNodeAlias pN: String, @ChildNodeAlias cN: String, data: Any, data1: Any) {
-            if (DebugConfig.isDebug()) {
-                CallerLogger.d("$M_MAP${data.toString()}", data1)
+        private fun logEnd(
+            @ParentNodeAlias pN: String,
+            @ChildNodeAlias cN: String,
+            data: Any,
+            data1: Any
+        ) {
+            if (pN.isNotEmpty() && cN != ChainConstant.CHAIN_CODE_ROMA_CLOUD_ERROR) {
+                cNode = cN
            }
        }
+
+        fun getCurrentCNode():String{
+            return cNode
+        }
    }
 }