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 25db6a77fb..742cfd23af 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 @@ -60,7 +59,7 @@ class MoGoAutopilotProvider : CupidLogUtils.setIsWriteLog(false) // TODO 临时方案,根据不同的身份标识,连接不同的工控机IP when (FunctionBuildConfig.appIdentityMode) { - 0 -> // 司机 + 0x00 -> // 司机 { // 注册地图采集功能 CallerMapDataCollectorManager.registerOnMapCollectTaskListener(this) @@ -95,7 +94,7 @@ class MoGoAutopilotProvider : } }) } - 1 -> // 乘客 + 0x01 -> // 乘客 { // 乘客端默认接收绘制全局路径+引导线 FunctionBuildConfig.isDemoMode = true @@ -167,7 +166,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" />