From ae9a096663616548b8b39bd5b69762986cc9f373 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Mon, 8 Nov 2021 20:36:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86ARouter=E5=8A=A0?= =?UTF-8?q?=E8=BD=BDHmi=E7=9A=84=E8=B7=AF=E5=BE=84?= 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 | 4 ++-- .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 2 +- .../com/mogo/eagle/core/data/constants/MogoServicePaths.java | 4 ++-- .../com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt | 3 +-- .../java/com/mogo/module/main/cards/MogoModulesManager.java | 2 +- .../src/main/java/com/mogo/service/impl/MogoServiceApis.java | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 1ffc6c1ed7..25190dba1d 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -312,8 +312,8 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_AI_MONITORING, "IMoGoMonitoringProvider")); // 小地图模块 MogoModulePaths.addModuleFunction(new MogoModule(MogoServicePaths.PATH_SMALL_MAP, "IMogoSmallMapProvider")); - // widgets 模块 - MogoModulePaths.addModuleFunction(new MogoModule(MogoServicePaths.PATH_V2X_WARNING, "IMoGoWaringProvider")); + // HMI模块 + MogoModulePaths.addModuleFunction(new MogoModule(MogoServicePaths.PATH_HMI, "IMoGoWaringProvider")); // V2X 模块 MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_V2X_MODULE, "V2XProvider")); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 37c2e958c1..ce03dd0203 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -39,7 +39,7 @@ import kotlinx.android.synthetic.main.fragment_hmi.* * @date 2021/8/3 2:40 下午 * 预警图层 */ -@Route(path = MogoServicePaths.PATH_V2X_WARNING) +@Route(path = MogoServicePaths.PATH_HMI) class MoGoHmiFragment : MvpFragment(), IMoGoWaringProvider, MoGoWarningContract.View { diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java index 1c1bf4b0c1..340657f6de 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -353,11 +353,11 @@ public class MogoServicePaths { public static final String PATH_V2X_FRONT_CRASH_WARNING = "/front/crashwarning"; /** - * warning 模块 + * HMI 模块 */ @Keep @Deprecated - public static final String PATH_V2X_WARNING = "/warning/api"; + public static final String PATH_HMI = "/hmi/api"; /** * obu-mogo 模块 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index 0138c4fb7b..5a5d9d3ed1 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -1,6 +1,5 @@ package com.mogo.eagle.core.function.call.hmi -import com.mogo.eagle.core.data.camera.Camera import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.data.notice.NoticeNormalData @@ -17,7 +16,7 @@ import com.mogo.eagle.core.function.call.base.CallerBase */ object CallerHmiManager : CallerBase() { private val waringProviderApi: IMoGoWaringProvider - get() = getApiInstance(IMoGoWaringProvider::class.java, MogoServicePaths.PATH_V2X_WARNING) + get() = getApiInstance(IMoGoWaringProvider::class.java, MogoServicePaths.PATH_HMI) /** * 隐藏 脉速表 diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index f04c7db768..1b20508bff 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -175,7 +175,7 @@ public class MogoModulesManager implements MogoModulesHandler { @Override public void loadWaringModule(int containerId) { IMoGoFunctionProvider provider = ( IMoGoFunctionProvider ) ARouter.getInstance() - .build( MogoServicePaths.PATH_V2X_WARNING ) + .build( MogoServicePaths.PATH_HMI) .navigation( getContext() ); addFragment( provider, containerId ); } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java index 5469047ebc..0af6580b7f 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java @@ -238,7 +238,7 @@ public class MogoServiceApis implements IMogoServiceApis { @Override public IMoGoWaringProvider getWaringProviderApi() { - return getApiInstance(IMoGoWaringProvider.class, MogoServicePaths.PATH_V2X_WARNING); + return getApiInstance(IMoGoWaringProvider.class, MogoServicePaths.PATH_HMI); } @Override