From be020d6cb4d3d365c6c317a5e980f5b51857cef1 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Wed, 28 Sep 2022 19:27:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autopilot/adapter/MoGoAdasListenerImpl.kt |  2 +-
 .../adapter/MoGoHandAdasMsgManager.java       |  2 ++
 .../function/main/MainMoGoApplication.java    | 22 +++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
index 49dc5fa872..a9a3e8310b 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
@@ -313,7 +313,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
             header: MessagePad.Header,
             carConfigResp: MessagePad.CarConfigResp?
     ) {
-        if (HdMapBuildConfig.isMapLoaded && carConfigResp != null) {
+        if (/*HdMapBuildConfig.isMapLoaded &&*/ carConfigResp != null) {
             AppConfigInfo.plateNumber = carConfigResp.plateNumber//车牌号
             AppConfigInfo.iPCMacAddress = carConfigResp.macAddress//工控机MAC地址
             AppConfigInfo.protocolVersionNumber = carConfigResp.protocolVersionValue//工控机协议版本
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 847b5991fd..413c2f3bdf 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
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.autopilot.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.Nullable;
 
@@ -115,6 +116,7 @@ public class MoGoHandAdasMsgManager implements
     @Override
     public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) {
         if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) {
+            Log.d("Upgrade", "MoGoHandAdasMsgManager address = " + carConfigResp.getMacAddress());
             CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress(), MoGoAiCloudClientConfig.getInstance().getSn());
         }
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
index 220ecd4940..6f2b12c79d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -76,23 +76,23 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
     }
 
     private void queryAppUpgrade() {
-        UiThreadHandler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                CallerLogger.INSTANCE.d("Upgrade","queryAppUpgrade isConnectAutopilot = " + AppConfigInfo.INSTANCE.isConnectAutopilot());
-                Log.e("Upgrade", "queryAppUpgrade isConnectAutopilot = " + AppConfigInfo.INSTANCE.isConnectAutopilot());
-                if (AppConfigInfo.INSTANCE.isConnectAutopilot()) {
-                    MoGoHandAdasMsgManager.getInstance(getBaseContext()).getConfig();
-                }
-            }
-        },9000);
+//        UiThreadHandler.postDelayed(new Runnable() {
+//            @Override
+//            public void run() {
+//                CallerLogger.INSTANCE.d("Upgrade","queryAppUpgrade isConnectAutopilot = " + AppConfigInfo.INSTANCE.isConnectAutopilot());
+//                Log.e("Upgrade", "queryAppUpgrade isConnectAutopilot = " + AppConfigInfo.INSTANCE.isConnectAutopilot());
+//                if (AppConfigInfo.INSTANCE.isConnectAutopilot()) {
+//                    MoGoHandAdasMsgManager.getInstance(getBaseContext()).getConfig();
+//                }
+//            }
+//        },9000);
 
         UiThreadHandler.postDelayed(new Runnable() {
             @Override
             public void run() {
                 CallerBindingcarManager.getBindingcarProvider().queryAppUpgrade();
             }
-        },11000);
+        },9000);
     }
 
     private void checkMonitorDb() {