From 41a1c60718b90dbb96e0446a193f61ffa7d1629b Mon Sep 17 00:00:00 2001
From: tongchenfei <tonghenfei@zhidaoauto.com>
Date: Tue, 26 Jan 2021 18:47:22 +0800
Subject: [PATCH] opt adas callback

---
 .../src/main/java/com/mogo/och/BaseOchFragment.java  | 12 ++----------
 .../mogo/service/impl/adas/MogoADASController.java   |  4 +++-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
index d64f21d9c4..df7a4dbf15 100644
--- a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
+++ b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java
@@ -34,13 +34,8 @@ public abstract class BaseOchFragment<V extends IView, P extends Presenter<V>> e
 
     private final SlidePanelView.OnSlidePanelMoveToEndListener onSlideToEndListener = () -> {
         // 此处做一个代理，处理一下共有情况
-        // 判断一下当前是否可以自动驾驶
-        if (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() != IMogoAdasOCHCallback.STATUS_AUTOPILOT_DISABLE) {
-            hideSlidePanel();
-            hideNotice();
-            if (getSlidePanelOnEndListener() != null) {
-                getSlidePanelOnEndListener().moveToEnd();
-            }
+        if (getSlidePanelOnEndListener() != null) {
+            getSlidePanelOnEndListener().moveToEnd();
         }
     };
 
@@ -73,9 +68,6 @@ public abstract class BaseOchFragment<V extends IView, P extends Presenter<V>> e
 
         checkCallView(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isCallViewShow());
         MogoApisHandler.getInstance().getApis().getStatusManagerApi().registerStatusChangedListener("Och", StatusDescriptor.CALL_VIEW, callViewListener);
-        if (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMogoAdasOCHCallback.STATUS_AUTOPILOT_DISABLE) {
-            hideAutopilotBiz();
-        }
     }
 
     private void checkCallView(boolean isShown) {
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
index af2b2c9a58..19cfc20ef4 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -354,7 +354,9 @@ public class MogoADASController implements IMogoADASController {
 
                 @Override
                 public void notifyAutopilotState(AdasAIDLAutopilotStateModel autopilotStateModel) {
-
+                    if (mAdasOCHCallback != null) {
+                        mAdasOCHCallback.onStateChanged(autopilotStateModel.getState(), autopilotStateModel.getReason());
+                    }
                 }
             };
             AutopilotServiceManage.getInstance().registerAutopilotDataListener( mAutopolitDataCallBack );