fix the logger add add func of vip check and take over

2022-09-19 19:01:13 +08:00
parent e3e7ba5050
commit 5303103646
23 changed files with 482 additions and 427 deletions
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java
@@ -12,7 +12,7 @@ import com.mogo.eagle.core.function.v2x.events.manager.V2XStatusManager;
 import com.mogo.eagle.core.function.v2x.events.scenario.impl.AbsV2XScenario;
 import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker;
 import com.mogo.eagle.core.network.utils.GsonUtil;
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
@@ -41,7 +41,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
    @Override
    public void init(V2XMessageEntity<V2XRoadEventEntity> v2XMessageEntity) {
        try {
-            Logger.d(M_V2X + TAG, "v2XMessageEntity:" + GsonUtil.jsonFromObject(v2XMessageEntity));
+            CallerLogger.INSTANCE.d(M_V2X + TAG, "v2XMessageEntity:" + GsonUtil.jsonFromObject(v2XMessageEntity));
            V2XRoadEventEntity v2XRoadEventEntity = v2XMessageEntity.getContent();
            if (v2XRoadEventEntity != null) {
                if (v2XMessageEntity.isShowState()) {
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightProvider.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightProvider.kt
@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.v2x.trafficlight
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.constants.MogoServicePaths
+import com.mogo.eagle.core.data.trafficlight.TrafficLightControl
 import com.mogo.eagle.core.data.trafficlight.TrafficLightDetail
 import com.mogo.eagle.core.function.api.trafficlight.ITrafficLightProvider
 import com.mogo.eagle.core.function.v2x.trafficlight.TrafficLightConst.Companion.MODULE_NAME
@@ -31,7 +32,7 @@ class TrafficLightProvider : ITrafficLightProvider {
        crossingNo: String,
        heading: Double,
        controlTime: Int,
-        onSuccess: (() -> Unit),
+        onSuccess: ((TrafficLightControl) -> Unit),
        onError: ((String) -> Unit)
    ) {
        return MogoTrafficLightManager.INSTANCE.turnLightToGreen(
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
@@ -4,11 +4,8 @@ import android.content.Context
 import android.location.Location
 import android.os.Handler
 import android.os.Looper
+import com.mogo.eagle.core.data.trafficlight.*
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
-import com.mogo.eagle.core.data.trafficlight.RoadIDResult
-import com.mogo.eagle.core.data.trafficlight.TrafficLightDetail
-import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
-import com.mogo.eagle.core.data.trafficlight.isInRange
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
@@ -159,7 +156,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
        crossingNo: String,
        heading: Double,
        controlTime: Int,
-        onSuccess: (() -> Unit),
+        onSuccess: ((TrafficLightControl) -> Unit),
        onError: ((String) -> Unit)
    ) {
        trafficLightNetWorkModel.turnLightToGreen(
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightApiService.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightApiService.kt
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.v2x.trafficlight.network

 import com.mogo.eagle.core.data.BaseResponse
 import com.mogo.eagle.core.data.trafficlight.RoadIDResult
+import com.mogo.eagle.core.data.trafficlight.TrafficLightControl
 import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
 import retrofit2.http.FieldMap
 import retrofit2.http.FormUrlEncoded
@@ -22,6 +23,6 @@ interface TrafficLightApiService {
    //变灯
    @FormUrlEncoded
    @POST("mec-etl-server/light/bdg/newTask")
-    suspend fun changeLight(@FieldMap turnLight: Map<String, String>): BaseResponse<Any>
+    suspend fun changeLight(@FieldMap turnLight: Map<String, String>): BaseResponse<TrafficLightControl>

 }
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt
@@ -107,10 +107,10 @@ class TrafficLightNetWorkModel {
        crossingNo: String,
        heading: Double,
        controlTime: Int,
-        onSuccess: (() -> Unit),
+        onSuccess: ((TrafficLightControl) -> Unit),
        onError: ((String) -> Unit)
    ) {
-        request<BaseResponse<Any>> {
+        request<BaseResponse<TrafficLightControl>> {
            val map = hashMapOf<String, String>()
            start {
                val trafficLightRequestData =
@@ -124,7 +124,7 @@ class TrafficLightNetWorkModel {
                }
            }
            onSuccess {
-                onSuccess.invoke()
+                onSuccess.invoke(it.result)
            }
            onError {
                if (it.message != null) {
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
@@ -1,16 +1,17 @@
 package com.mogo.eagle.core.function.v2x.vip

 import android.content.Context
-import android.location.Location
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
-import com.mogo.cloud.commons.utils.CoordinateUtils
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_VIP
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2N
-import com.mogo.eagle.core.data.trafficlight.*
+import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
+import com.mogo.eagle.core.data.trafficlight.currentRoadTrafficLight
+import com.mogo.eagle.core.data.trafficlight.isGreen
 import com.mogo.eagle.core.data.v2x.VipMessage
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
@@ -22,10 +23,10 @@ import com.mogo.eagle.core.function.v2x.trafficlight.core.MogoTrafficLightManage
 import com.mogo.eagle.core.function.v2x.vip.network.VipNetWorkModel
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
+import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.module.common.enums.EventTypeEnum
 import com.zhjt.service_biz.BizConfig
-import kotlin.math.abs

 class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListener,
    Handler.Callback {
@@ -42,7 +43,6 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
    }

    private var mContext: Context? = null
-    private var mLocation: Location? = null
    private var turnLightFirst = false
    private var turnLightEnd = true
    private var vip: Boolean = false
@@ -51,7 +51,6 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
    private var exit: Boolean = false

    private var result: TrafficLightResult? = null
-    private var lastResult: TrafficLightStatus? = null

    private val vipNetWorkModel = VipNetWorkModel()
    private val handler = Handler(Looper.getMainLooper(), this)
@@ -101,9 +100,9 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
    }

    override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) {
-        if (!vip) {
-            return
-        }
+//        if (!vip) {
+//            return
+//        }

        if (exit) {
            CallerLogger.d("$M_V2X$TAG", "驶离路口，返回 , then  resetConditions")
@@ -115,14 +114,14 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
        if (trafficLightResult.currentRoadTrafficLight() == null) {
            CallerLogger.d(
                "$M_V2X$TAG",
-                "vip 获取到灯态，但没找到对应车道数据 result : $trafficLightResult , then resetConditions"
+                "vip 获取到灯态，但没找到对应车道数据 trafficLightResult : $trafficLightResult , then resetConditions"
            )
            resetConditions()
            return
        }

        val currentResult = trafficLightResult.currentRoadTrafficLight()
-        lastResult = result?.currentRoadTrafficLight()
+        val lastResult = result?.currentRoadTrafficLight()
        CallerLogger.d(
            "$M_V2X$TAG",
            "检查是否变灯 last.remain  : ${lastResult?.remain} , color : ${lastResult?.color} , current.remain : ${currentResult?.remain} , color : ${currentResult?.color}, turnLightFirst : $turnLightFirst"
@@ -130,32 +129,6 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe

        this.result = trafficLightResult

-        lastResult?.let {
-            //如果上次结果和本次灯态结果变化比较大，则已变灯，控制HMI展示弹窗
-            if (abs(currentResult!!.remain - it.remain) > 5 && currentResult.isGreen()) {
-                CallerLogger.d("$M_V2X$TAG", "调用showWarningV2X to show")
-                CallerHmiManager.showWarningV2X(
-                    EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType,
-                    EventTypeEnum.TYPE_VIP_IDENTIFICATION.content,
-                    EventTypeEnum.TYPE_VIP_IDENTIFICATION.tts,
-                    EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType,
-                    object : IMoGoWarningStatusListener {
-                        override fun onShow() {}
-                        override fun onDismiss() {
-                            CallerLogger.d(
-                                "$M_V2X$TAG",
-                                "showWarningV2X vip dismiss , resetConditions"
-                            )
-                            resetConditions()
-                        }
-                    },
-                    true,
-                    5000L
-                )
-            }
-        }
-
-
        if (!turnLightFirst) {
            // 首次判断，变灯
            turnLightFirst = true
@@ -164,19 +137,12 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
            turnLight(controlTime)
        }

-        //可作为补偿措施，暂不启用
-//        mLocation?.let {
-//            if (canGetThroughCross(it, trafficLightResult)) {
-//                turnLight()
-//            }
-//        }
    }

    private fun resetConditions() {
        turnLightFirst = false
        turnLightEnd = true
        result = null
-        lastResult = null
    }

    private fun setVip(cancelDelayTime: Long) {
@@ -196,32 +162,13 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
        if (handler.hasMessages(MSG_WHAT_VIP_CANCEL)) {
            handler.removeMessages(MSG_WHAT_VIP_CANCEL)
        }
+        resetConditions()
        CallerHmiManager.vipIdentification(false)
        CallVipSetListenerManager.invokeVipSetStatus(false)
        CallerTrafficLightListenerManager.unRegisterTrafficLightListener(TAG)
        CallerTrafficLightListenerManager.unRegisterEnterCrossRoadListener(TAG)
    }

-    private fun canGetThroughCross(
-        it: Location,
-        trafficLightResult: TrafficLightResult
-    ): Boolean {
-        return if (CoordinateUtils.calculateLineDistance(
-                it.longitude,
-                it.latitude,
-                trafficLightResult.lon,
-                trafficLightResult.lat
-            ) < 20
-            && turnLightEnd
-            && trafficLightResult.laneList.mid.turnRedAtOnce()
-        ) {
-            turnLightEnd = false
-            false
-        } else {
-            true
-        }
-    }
-
    private fun requestVip() {
        vipNetWorkModel.requestVip({
            if (handler.hasMessages(MSG_WHAT_VIP_SEARCH)) {
@@ -249,20 +196,60 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
        if (result == null || mContext == null) return
        val locationClient = CallerMapUIServiceManager.getSingletonLocationClient(mContext!!)
        if (locationClient != null) {
-            var bearing =
+            val bearing =
                locationClient.lastKnowLocation.bearing.toDouble()
            CallerLogger.d("$M_V2X$TAG", "turnLight -- bearing : $bearing")
            MogoTrafficLightManager.INSTANCE.turnLightToGreen(
                result!!.lightId, result!!.crossId, bearing, controlTime,
                {
-                    CallerLogger.d("$M_V2X$TAG", "变灯请求成功")
+                    if (it.sn == MoGoAiCloudClientConfig.getInstance().sn && it.code == 0) {
+                        CallerLogger.d("$M_V2X$TAG", "变灯请求成功")
+                        showWarning(
+                            EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType,
+                            EventTypeEnum.TYPE_VIP_IDENTIFICATION.content,
+                            EventTypeEnum.TYPE_VIP_IDENTIFICATION.tts,
+                            EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType
+                        )
+                    } else {
+                        val time = if (it.countDown / 60 > 1) {
+                            "${it.countDown / 60}分${it.countDown % 60}秒后重试"
+                        } else {
+                            "${it.countDown}秒后重试"
+                        }
+                        showWarning(
+                            EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.poiType,
+                            EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.content + time,
+                            EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.tts,
+                            EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.poiType
+                        )
+                    }
                },
                { errorMsg ->
                    CallerLogger.e("$M_V2X$TAG", "变灯请求失败 msg : $errorMsg")
+                    ToastUtils.showLong("服务异常，请稍后重试")
                })
        }
    }

+    private fun showWarning(
+        v2xType: String,
+        alertContent: CharSequence,
+        ttsContent: String,
+        tag: String
+    ) {
+        CallerHmiManager.showWarningV2X(
+            v2xType, alertContent, ttsContent, tag,
+            object : IMoGoWarningStatusListener {
+                override fun onShow() {}
+                override fun onDismiss() {
+                    resetConditions()
+                }
+            },
+            true,
+            5000L
+        )
+    }
+
    fun destroy() {
        MogoAiCloudSocketManager.getInstance(mContext)
            .unregisterLifecycleListener(401025)