diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 9595fd5794..8dbb963056 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -75,6 +75,9 @@ public class MogoApplication extends MainMoGoApplication { // 配置BuglyAppID:MoGoEagleEye CrashReportConstants.buglyAppID = "ac71228f85"; + // 是否是演示(美化)模式,会存在SP中,方便做现场恢复 + FunctionBuildConfig.isDemoMode = SharedPrefsMgr.getInstance(this).getBoolean(MoGoConfig.IS_DEMO_MODE, false); + if (DebugConfig.getProductFlavor().equals("fPadLenovoOchTaxi") || DebugConfig.getProductFlavor().equals("fPadLenovoOchBus") || DebugConfig.getProductFlavor().equals("fPadLenovoOchTaxiPassenger") 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 1c5b82d607..254e980a36 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 @@ -43,7 +43,7 @@ import java.util.* */ @Route(path = MogoServicePaths.PATH_AUTO_PILOT) class MoGoAutopilotProvider : - IMoGoAutopilotProvider, IMoGoMapDataCollectProvider.OnMapCollectCmdListener { + IMoGoAutopilotProvider, IMoGoMapDataCollectProvider.OnMapCollectCmdListener { private val TAG = "MoGoAutoPilotProvider" private var mContext: Context? = null @@ -61,6 +61,7 @@ class MoGoAutopilotProvider : when (FunctionBuildConfig.appIdentityMode) { 0 -> // 司机 { + // 注册地图采集功能 CallerMapDataCollectorManager.registerOnMapCollectTaskListener(this) // "192.168.1.102" val options = AdasOptions.Builder().setClient(false).build() @@ -95,6 +96,9 @@ class MoGoAutopilotProvider : } 1 -> // 乘客 { + // 乘客端默认接收绘制全局路径+引导线 + FunctionBuildConfig.isDemoMode = true + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true // "192.168.1.102" val options = AdasOptions.Builder().build() AdasManager.getInstance().create(context, options) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index 38032c1436..ddc8434d76 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -58,12 +58,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40px" - android:layout_marginRight="40px" + android:layout_marginEnd="40px" android:elevation="@dimen/dp_10" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:visibility="visible" /> + tools:visibility="gone" /> @@ -129,7 +129,7 @@ android:layout_width="130px" android:layout_height="130px" android:layout_marginTop="38px" - android:layout_marginEnd="30px" + android:layout_marginEnd="40px" android:background="@drawable/icon_camera_nor" app:layout_constraintEnd_toStartOf="@id/viewTrafficLightVr" app:layout_constraintTop_toTopOf="parent" @@ -145,10 +145,11 @@ android:gravity="center" android:text="60" android:textColor="#FFFFFF" - android:textSize="74px" + android:textSize="70px" android:visibility="gone" - app:layout_constraintEnd_toEndOf="@+id/viewTrafficLightVr" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon" + android:layout_marginEnd="40px" app:layout_goneMarginEnd="40px" app:layout_goneMarginTop="40px" tools:visibility="visible" />