diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt index f42e1f0c49..1b80f54363 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt @@ -90,10 +90,14 @@ class CameraListView : FrameLayout { !cameraEntity.isCarLive() -> { // 开启摄像头推流 cameraEntity.ip?.let { ip -> - // 华哥那边现在只支持一个ip"183.242.46.150" + // 华哥那边现在只支持一个ip"183.242.46.150",现在不用这一套 // CallerMonitorManager.openCameraStream(ip) - // 测试一直打开的顺义摄像头,不需要调接口让摄像头开启推流 - if (!cameraEntity.flvUrl.isNullOrEmpty()) gsyVideoPlay(cameraEntity.flvUrl!!) + // 测试一直打开的顺义摄像头,不需要调接口让摄像头开启推流,现在走这一套流程 + if (!cameraEntity.flvUrl.isNullOrEmpty()) { + gsyVideoPlay(cameraEntity.flvUrl!!) + } else { + Logger.e(TAG, "视频播放地址为空!") + } } } else -> { @@ -142,6 +146,7 @@ class CameraListView : FrameLayout { isPlaySuccess = true } else -> { + Logger.w(TAG, "播放视频异常,event is:$event") showNoSignalView() if (!valueAnimator.isStarted && !valueAnimator.isRunning) { valueAnimator.start() diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt index 18eba08b79..d6cc93e729 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt @@ -37,6 +37,7 @@ class RedLightWarningManager : IMoGoTrafficLightListener { private fun handleRedLightWarning(trafficLightStatus: TrafficLightStatus, yellowLightTime: Int = 0) { // 如果是Vip则不处理 if (SPUtils.getInstance().getLong("vip") > 0) { + Logger.w(TAG, "Vip用户不处理闯红灯预警逻辑!") return } // 路口100m闯红灯预警 @@ -52,6 +53,7 @@ class RedLightWarningManager : IMoGoTrafficLightListener { when { trafficLightStatus.isRed() -> { + Logger.d(TAG, "=====当前为红灯=====") // 到达路口时红灯还没走完 if (arriveTime <= remainTime) { redLightWarning() @@ -60,6 +62,7 @@ class RedLightWarningManager : IMoGoTrafficLightListener { } } trafficLightStatus.isYellow() -> { + Logger.d(TAG, "=====当前为黄灯=====") // 到达路口时黄灯还没走完 if (arriveTime <= remainTime) { redLightWarning() @@ -68,8 +71,9 @@ class RedLightWarningManager : IMoGoTrafficLightListener { } } trafficLightStatus.isGreen() -> { + Logger.d(TAG, "=====当前为绿灯=====") // 到达路口时绿灯已经走完 - if (arriveTime > remainTime) { + if (arriveTime >= remainTime) { redLightWarning() } else if (arriveTime < remainTime) { greenLightWarning() @@ -85,6 +89,7 @@ class RedLightWarningManager : IMoGoTrafficLightListener { * 闯红灯预警 */ private fun redLightWarning() { + Logger.d(TAG, "=====闯红灯预警=====") ThreadUtils.runOnUiThread { CallerHmiManager.showWarningV2X( EventTypeEnum.TYPE_USECASE_ID_IVP.poiType.toInt(), @@ -100,6 +105,7 @@ class RedLightWarningManager : IMoGoTrafficLightListener { * 绿灯通行提示 */ private fun greenLightWarning() { + Logger.d(TAG, "=====绿灯通行预警=====") ThreadUtils.runOnUiThread { val content = String.format( EventTypeEnum.getWarningContent(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType),