From 18c720152a05bf8e2291a7105f3800c4acb980a9 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 25 Mar 2022 20:39:50 +0800
Subject: [PATCH] fixed bug

---
 .../adapter/MoGoHandAdasMsgManager.java       | 23 ++++++-------------
 .../bindingcar/BindingcarProvider.java        |  1 -
 .../obu/mogo/MogoPrivateObuManager.kt         |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
index ab0e846755..f55d0ebf11 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
@@ -9,6 +9,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager;
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager;
@@ -30,8 +31,7 @@ import record_cache.RecordPanelOuterClass;
 public class MoGoHandAdasMsgManager implements
         IMoGoAutopilotIdentifyListener,
         IMoGoAutopilotVehicleStateListener,
-        IMoGoAutopilotCarConfigListener,
-        OnAdasConnectStatusListener {
+        IMoGoAutopilotCarConfigListener {
 
     private final String TAG = "AdasEventManager";
 
@@ -40,6 +40,7 @@ public class MoGoHandAdasMsgManager implements
     private MoGoHandAdasMsgManager() {
         CallerAutopilotIdentifyListenerManager.INSTANCE.addListener(TAG, this);
         CallerAutopilotVehicleStateListenerManager.INSTANCE.addListener(TAG, this);
+        CallerAutopilotCarConfigListenerManager.INSTANCE.addListener(TAG, this);
     }
 
     public static MoGoHandAdasMsgManager getInstance() {
@@ -133,21 +134,11 @@ public class MoGoHandAdasMsgManager implements
 
     @Override
     public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) {
-//        Log.d("liyz", "onAutopilotCarConfig ---------> ");
-//        if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) {
+        if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) {
 //            Log.d("liyz", " carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress());
-//            if (!isIPCConnect) {
-//                CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress());
-//                isIPCConnect = true;
-//            }
-//        }
+//            CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress());
+        }
     }
 
-    @Override
-    public void onConnectionIPCStatus(int ipcConnectionStatus, String failedMsg) {
-//        Log.d("liyz", "onConnectionIPCStatus ---------> ipcConnectionStatus = " + ipcConnectionStatus);
-//        if (ipcConnectionStatus != Constants.IPC_CONNECTION_STATUS.CONNECTED) {
-//            isIPCConnect = false;
-//        }
-    }
+
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
index 4b8c9cf4ef..997b493866 100644
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
+++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
@@ -51,7 +51,6 @@ public class BindingcarProvider implements IMoGoBindingcarProvider {
     public void getBindingcarInfo(String macAddress) {
         mAddress = macAddress;
         BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress);
-        Log.d("liyz", "BindingcarProvider getBindingcarInfo  macAddress = " + macAddress);
     }
 
     @Override
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 24ae8b1e45..f8bf6c8add 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
@@ -534,7 +534,7 @@ class MogoPrivateObuManager private constructor() {
                 //预警信息,预警类型 threat_level 2、3
                 info.threat_info?.let {
                     //预警方位
-                    val direction = getMessageDirection(info.ext_info.target_classification)
+                    val direction = getMessageDirection(if (info.ext_info != null) info.ext_info.target_classification else -1)
                     //处理预警类型
                     val appId = info.threat_info.app_id
                     val level = info.threat_info.threat_level