diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java index 6cf28e9879..30e6993f02 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java @@ -199,7 +199,24 @@ public class AdasNoticeHelper implements IMogoAdasWarnMessageCallback, IMogoLoca if (tvTrafficLight != null && !handler.hasMessages(MSG_HIDE_TRAFFIC_LIGHT_BY_OBU)) { handler.removeMessages(MSG_HIDE_TRAFFIC_LIGHT_BY_CLOUD); // todo drawTrafficLight - + String lightStatus; + switch (roadData.getLightStatus()) { + case 1: + // 红灯 + lightStatus = "R"; + break; + case 3: + // 黄灯 + lightStatus = "Y"; + break; + default: + // 默认绿灯 + lightStatus = "G"; + break; + } + int diff = (int) ((System.currentTimeMillis() - roadData.getSystemTime())/1000); + int leftTime = roadData.getLightLeftTime() - diff; + drawTrafficLight(lightStatus, "" + leftTime); handler.sendEmptyMessageDelayed(MSG_HIDE_TRAFFIC_LIGHT_BY_CLOUD, HIDE_TRAFFIC_LIGHT_DELAY); } @@ -239,6 +256,8 @@ public class AdasNoticeHelper implements IMogoAdasWarnMessageCallback, IMogoLoca if (roadData != null) { Logger.d(TAG, "收到红绿灯数据"); handleCloudTrafficLight(roadData); + }else{ + handler.sendEmptyMessage(MSG_HIDE_TRAFFIC_LIGHT_BY_CLOUD); } } } diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt index 3508d407eb..f145d475cd 100644 --- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt +++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt @@ -85,6 +85,16 @@ class MockUtil:Handler.Callback { view.findViewById