From 7ae35bf2c981f3af4abb7b85d9e369173e1a6b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 28 Sep 2021 17:34:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7OBU-sdk=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=A7=A3=E6=9E=90=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .idea/gradle.xml                                             | 1 -
 config.gradle                                                | 2 +-
 .../eagle/core/function/obu/mogo/MogoPrivateObuManager.kt    | 2 +-
 .../core/function/obu/mogo/utils/TrafficDataConvertUtils.kt  | 5 ++++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b4df482533..97a9cb7d46 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -83,6 +83,5 @@
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
-    <option name="offlineMode" value="true" />
   </component>
 </project>
\ No newline at end of file
diff --git a/config.gradle b/config.gradle
index d8da67cc7e..65f9846689 100644
--- a/config.gradle
+++ b/config.gradle
@@ -164,7 +164,7 @@ ext {
             // obu sdk
             obusdk                     : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3",
 //            mebulaobu                  : 'com.zhidao.support.nebulaobu:nebulaobu:1.0.0.3',
-            mogoobu                    : 'com.zhidao.support.obu:mogoobu:1.0.0.13',
+            mogoobu                    : 'com.zhidao.support.obu:mogoobu:1.0.0.15',
             mogoami                    : 'com.zhidao.support.obu.ami:mogoami:1.0.0.3',
 
             // 左侧面板
diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
index e48efa856e..c133fe116a 100644
--- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
+++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
@@ -46,7 +46,7 @@ class MogoPrivateObuManager private constructor() {
         mIMogoMapService = mMogoServiceApis!!.mapServiceApi
 
         //自研obu
-        MogoObuManager.getInstance().connect(context, "192.168.20.199")
+        MogoObuManager.getInstance().connect(context, "192.168.43.51")
         MogoObuManager.getInstance().registerListener(mogoObuListener)
     }
 
diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt
index ba0b28cc56..24dd349656 100644
--- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt
+++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/utils/TrafficDataConvertUtils.kt
@@ -40,7 +40,10 @@ object TrafficDataConvertUtils {
      */
     fun cvxRtiThreatIndInfo2TrafficData(info: CvxRtiThreatIndInfo): TrafficData? {
         // 这里只处理道路施工
-        if (info.rti_id == null || info.ext_info == null || info.ext_info.rti_type != 0x7
+        if(info.ext_info.rti_type != 0x7){
+            return null
+        }
+        if (info.rti_id == null || info.ext_info == null
             || info.zones_info == null || info.zones_info.first() == null
             || info.zones_info.first().path_points.first() == null
             || info.threat_info == null