From e10a46afdbc29a2c6d693fe48ce8c2530d314211 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Thu, 17 Feb 2022 15:29:38 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20=E9=92=88=E5=AF=B9=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E7=AB=AF=E9=BB=98=E8=AE=A4=E6=8E=A5=E6=94=B6=E7=BB=98=E5=88=B6?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=B7=AF=E5=BE=84+=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E7=BA=BF=20=E5=BC=80=E5=90=AF=E7=BE=8E=E5=8C=96=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=90=8E=E7=8E=B0=E5=9C=BA=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 3 +++ .../eagle/core/function/autopilot/MoGoAutopilotProvider.kt | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) 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 20c96b11ef..246965e9cd 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 @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit */ @Route(path = MogoServicePaths.PATH_AUTO_PILOT) class MoGoAutopilotProvider : - IMoGoAutopilotProvider, IMoGoMapDataCollectProvider.OnMapCollectCmdListener { + IMoGoAutopilotProvider, IMoGoMapDataCollectProvider.OnMapCollectCmdListener { private val TAG = "MoGoAutoPilotProvider" private var mContext: Context? = null @@ -54,7 +54,12 @@ class MoGoAutopilotProvider : AdasManager.getInstance().create(context, "192.168.1.102") } 1 -> // 乘客 + { + // 乘客端默认接收绘制全局路径+引导线 + FunctionBuildConfig.isDemoMode = true + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true AdasManager.getInstance().create(context, "192.168.1.103") + } else -> // 默认采用UDP寻址方式 AdasManager.getInstance().create(context) }