From c5bc5170b40f23c85c07d121806de2ec61aa8129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 2 Jul 2021 20:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86ADAS=20=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E8=BF=9E=E6=8E=A5=E5=B7=A5=E6=8E=A7=E6=9C=BA=20?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=91=E9=80=81sn=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

---
 .../com/mogo/module/adas/AdasProvider.java    | 24 ++++++++++++-------
 .../mogo/module/adas/AdasStatusListener.java  |  9 +++----
 .../service/impl/adas/MogoADASController.java | 22 +++--------------
 3 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
index 39db10a759..29f6e441a5 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
@@ -11,8 +11,6 @@ import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel;
 import com.zhidao.support.adas.high.AdasManager;
 import com.zhidao.support.adas.high.bean.BasicInfo;
 
-import adas.Adas;
-
 
 /**
  * ADAS 模块
@@ -32,6 +30,19 @@ public class AdasProvider implements IProvider {
         adasEventManager = AdasEventManager.getInstance();
         initAdas(context, adasEventManager);
         initAutoPilotBusiness(context);
+
+        addAdasStatusListener(new AdasStatusListener() {
+            @Override
+            public void onServiceConnected() {
+                Logger.d(TAG, "adas statusListener connected & send sn");
+                setBasicInfo();
+            }
+
+            @Override
+            public void onServiceDisconnected() {
+                Logger.d(TAG, "adas statuslistener disconnected");
+            }
+        });
     }
 
     private void initAdas(Context context, AdasEventManager adasEventManager) {
@@ -42,12 +53,9 @@ public class AdasProvider implements IProvider {
 
     private void initAutoPilotBusiness(Context context) {
         AdasAutoPilotManager.getInstance().initSocket(context);
-        AdasAutoPilotManager.getInstance().addIDispatchResult(new AdasAutoPilotManager.IDispatchResultListener() {
-            @Override
-            public void dispatchAffirm(String json) {
-                Logger.d(TAG,"aiCloudToAdasData json : " + json);
-                AdasManager.getInstance().aiCloudToAdasData(json);
-            }
+        AdasAutoPilotManager.getInstance().addIDispatchResult(json -> {
+            Logger.d(TAG,"aiCloudToAdasData json : " + json);
+            AdasManager.getInstance().aiCloudToAdasData(json);
         });
     }
 
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasStatusListener.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasStatusListener.java
index 3eb1ff12d4..801f9be509 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasStatusListener.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasStatusListener.java
@@ -3,12 +3,9 @@ package com.mogo.module.adas;
 /**
  * Created by XuYong on 4/28/21 16:19
  */
-public abstract class AdasStatusListener {
+public interface AdasStatusListener {
 
-    public void onServiceConnected() {
+    void onServiceConnected();
 
-    };
-    public void onServiceDisconnected() {
-
-    };
+    void onServiceDisconnected();
 }
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 5176da18fa..5ad51fe8f6 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
@@ -313,22 +313,12 @@ public class MogoADASController implements IMogoADASController {
         try {
             adasProvider.killAdas();
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
     }
 
     private volatile boolean needEmphasizeMyLocation = false;
 
-    private void testOCH() {
-        RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters();
-        currentAutopilot.isSpeakVoice = true;
-        currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(0, 1);
-        currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(2, 3);
-        currentAutopilot.vehicleType = 10;
-        Logger.d(TAG, "开启自动驾驶====" + currentAutopilot);
-        aiCloudToAdasData(currentAutopilot);
-    }
-
     @Override
     public void showADAS() {
 
@@ -346,19 +336,13 @@ public class MogoADASController implements IMogoADASController {
         adasProvider.addAdasStatusListener(new AdasStatusListener() {
             @Override
             public void onServiceConnected() {
-                super.onServiceConnected();
-                Logger.d(TAG, "adas statusListener connected & send sn");
-                adasProvider.setBasicInfo();
+                Logger.d(TAG, "adas statusListener connected");
                 invokeShowADASOperation();
-
-                //测试网约车
-                //testOCH();
             }
 
             @Override
             public void onServiceDisconnected() {
                 Logger.d(TAG, "adas statuslistener disconnected");
-                super.onServiceDisconnected();
             }
         });
         invokeShowADASOperation();
@@ -583,7 +567,7 @@ public class MogoADASController implements IMogoADASController {
                     intent.putExtra(PARAM_DATA, object.toString());
                     sendBroadcast(intent);
                 } catch (Exception e1) {
-                    Logger.e(TAG, e1, "error.");
+                    e1.printStackTrace();
                 }
             }
         }, delay);