From f0b0b874e93733da568f49b397d55300053f9fbf Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Thu, 17 Feb 2022 16:22:06 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20=E4=BC=98=E5=8C=96=E5=B0=8F=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=B8=83=E5=B1=80=20=E4=BF=AE=E5=A4=8D=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../eagle/core/function/autopilot/MoGoAutopilotProvider.kt | 7 +++----
 .../mogo/eagle/core/function/main/MainMoGoApplication.java | 4 ++--
 .../src/main/res/layout/module_small_map_fragment.xml      | 2 ++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
index 8ccd07aaf3..1ed3e4b322 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
@@ -15,7 +15,6 @@ import com.mogo.eagle.core.function.autopilot.adapter.MoGoAdasListenerImpl
 import com.mogo.eagle.core.function.autopilot.adapter.MoGoAdasMsgConnectStatusListenerImpl
 import com.mogo.eagle.core.function.autopilot.adapter.MoGoHandAdasMsgManager
 import com.mogo.eagle.core.function.autopilot.server.AsyncDataToAutopilotServer
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
@@ -49,12 +48,12 @@ class MoGoAutopilotProvider :
         CupidLogUtils.setIsWriteLog(false)
         // TODO 临时方案，根据不同的身份标识，连接不同的工控机IP
         when (FunctionBuildConfig.appIdentityMode) {
-            0 -> // 司机
+            0x00 -> // 司机
             {
                 CallerMapDataCollectorManager.registerOnMapCollectTaskListener(this)
                 AdasManager.getInstance().create(context, "192.168.1.102")
             }
-            1 -> // 乘客
+            0x01 -> // 乘客
             {
                 // 乘客端默认接收绘制全局路径+引导线
                 FunctionBuildConfig.isDemoMode = true
@@ -72,7 +71,7 @@ class MoGoAutopilotProvider :
         // 同步数据给工控机的服务
         AsyncDataToAutopilotServer.INSTANCE.initServer()
         // 同步是否开启美化模式
-        CallerAutoPilotManager.setDemoMode(FunctionBuildConfig.isDemoMode)
+        setDemoMode(FunctionBuildConfig.isDemoMode)
     }
 
     /**
diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
index b31fee555f..8e6256a9d6 100644
--- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -336,11 +336,11 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
          */
         switch (FunctionBuildConfig.appIdentityMode) {
             // 司机身份专属模块
-            case 0:
+            case 0x00:
                 // 地图数据收集模块
                 MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_MAP_DATA_COLLECT_PROVIDER, "MoGoMapDataCollector"));
                 break;
-            case 1:
+            case 0x01:
 
                 break;
             default:
diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_fragment.xml b/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_fragment.xml
index c6eeac2db7..47b8763b7d 100644
--- a/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_fragment.xml
+++ b/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_fragment.xml
@@ -8,6 +8,8 @@
         android:id="@+id/smallMapDirectionView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginRight="30px"
+        android:layout_marginBottom="30px"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />