From 9e1b214d41272ae8b630f07e79e87c2110062c1f Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Mon, 5 Jul 2021 16:27:17 +0800
Subject: [PATCH] update adas version and add getSn func

---
 modules/mogo-module-adas/build.gradle         |  2 +-
 .../mogo/module/adas/AdasEventManager.java    | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/mogo-module-adas/build.gradle b/modules/mogo-module-adas/build.gradle
index 75fa6cc4e6..9cff527003 100644
--- a/modules/mogo-module-adas/build.gradle
+++ b/modules/mogo-module-adas/build.gradle
@@ -45,7 +45,7 @@ dependencies {
     // 现有的ADAS的通讯SDK，需要将里面的东西融合到我们项目中
     compileOnly rootProject.ext.dependencies.adasapi
 
-    api "com.zhidao.support.adas:high:1.2.0.1"
+    api "com.zhidao.support.adas:high:1.2.0.2"
 
     annotationProcessor rootProject.ext.dependencies.aroutercompiler
     if (Boolean.valueOf(RELEASE)) {
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
index c248d7a868..de70a915cd 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
@@ -1,5 +1,6 @@
 package com.mogo.module.adas;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.google.gson.Gson;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.data.BaseData;
@@ -55,7 +56,8 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL
     private final Gson gson;
     private final ArrayList<IAdasDataListener> iAdasEventListeners = new ArrayList<>();
     private final ArrayList<AdasStatusListener> iAdasStatusListeners = new ArrayList<>();
-    private IAdasApiService mAdasApiService;
+    private final IAdasApiService mAdasApiService;
+    private final AdasProvider adasProvider;
     private Disposable uploadAutopilotStatus;
     //自动驾驶状态
     private int mCurrentAutopilotStatus = -1;
@@ -68,6 +70,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL
     private AdasEventManager() {
         gson = GsonUtil.getGson();
         mAdasApiService = MogoApisHandler.getInstance().getApis().getNetworkApi().create(IAdasApiService.class, getBaseUrl());
+        adasProvider = ARouter.getInstance().navigation(AdasProvider.class);
     }
 
     public static AdasEventManager getInstance() {
@@ -247,6 +250,15 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL
         }
     }
 
+    @Override
+    public void onAutopilotSNRequest() {
+        if (adasProvider != null) {
+            adasProvider.setBasicInfo();
+        } else {
+            Logger.e(TAG, "onAutopilotSNRequest adasProvider is null");
+        }
+    }
+
     @Override
     public void onWebSocketConnectSuccess() {
         Logger.d(TAG, "webSocket 连接成功");
@@ -270,12 +282,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL
                 .subscribeOn(Schedulers.io())
                 .unsubscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<Long>() {
-                    @Override
-                    public void accept(@NonNull Long aLong) throws Exception {
-                        updateDriveStatus();
-                    }
-                });
+                .subscribe(aLong -> updateDriveStatus());
     }
 
     private void updateDriveStatus() {