From 77516e5c3184440251e2fe34e2a9030802a1e901 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Tue, 21 Jul 2020 15:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BA=A2=E7=BB=BF=E7=81=AF?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8D=E6=B6=88=E5=A4=B1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                              |  2 +-
 .../com/zhidao/mogo/module/obu/ObuManager.kt   | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a297ca442a..72d486645f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -73,7 +73,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT
 # 在线车辆F
 MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2
 # v2x
-MOGO_MODULE_V2X_VERSION=1.1.68-shunyi
+MOGO_MODULE_V2X_VERSION=1.1.67-shunyi
 # 推送
 # 推送
 MOGO_MODULE_PUSH_VERSION=1.1.5.7-shunyi
diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuManager.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuManager.kt
index bea61e7177..08403ac718 100644
--- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuManager.kt
+++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuManager.kt
@@ -132,12 +132,24 @@ class ObuManager: IMogoObuManager,Handler.Callback {
      * 17号路口红绿灯倒计时出现了，如果[TrafficLightInfo.lightStatus]为0，或者说，不为G/Y/R时，此条红绿灯数据无效
      */
     override fun showTrafficLightInfo(info: TrafficLightInfo?) {
-        Logger.d(TAG, "thread: ${Thread.currentThread()} showTrafficLightInfo: ${info?.id}")
-        handler.post{
-            dataChangedListener?.showTrafficLightInfo(info)
+        Logger.d(TAG, "thread: ${Thread.currentThread()} showTrafficLightInfo: $info")
+        Logger.d(TAG, "isTrafficLightInfoValid: ${isTrafficLightInfoValid(info)}")
+        if(isTrafficLightInfoValid(info)) {
+            handler.post {
+                dataChangedListener?.showTrafficLightInfo(info)
+            }
         }
     }
 
+    /**
+     * 判断红绿灯信息是否有效
+     *
+     * @return true 有效
+     */
+    private fun isTrafficLightInfoValid(info:TrafficLightInfo?):Boolean{
+        return info == null||(info.lightStatus=="G"||info.lightStatus=="Y"||info.lightStatus=="R")
+    }
+
     /**
      * 场景触发事件信息回调接口
      */