From 4ae738d5c7b2cc94f9a6192abd2d5a59b269cb79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 17 Sep 2021 20:50:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E7=A6=BB=E8=B0=83=E7=94=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3,=E4=B8=8D=E7=9B=B4=E6=8E=A5=E8=AF=95=E7=94=A8ARout?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .../mogo-core-function-check/build.gradle | 1 + .../function/check/view/CheckActivity.java | 3 +- core/mogo-core-data/build.gradle | 2 +- .../core/data/constants/MogoServicePaths.java | 398 ++++++++++++++++++ core/mogo-core-function-call/build.gradle | 5 +- .../call/check/CallerCheckManager.java | 60 +++ .../function/call/hmi/CallerHmiManager.java | 2 +- .../function/call/map/CallerSmpManager.java | 2 +- modules/mogo-module-extensions/build.gradle | 2 + .../extensions/entrance/EntranceFragment.java | 7 +- modules/mogo-module-main/build.gradle | 2 + .../main/monitoring/VehicleMonitoring.java | 3 +- 12 files changed, 478 insertions(+), 9 deletions(-) create mode 100644 core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java create mode 100644 core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/check/CallerCheckManager.java diff --git a/core/function-impl/mogo-core-function-check/build.gradle b/core/function-impl/mogo-core-function-check/build.gradle index c5cd8c4b8e..42995ca6df 100644 --- a/core/function-impl/mogo-core-function-check/build.gradle +++ b/core/function-impl/mogo-core-function-check/build.gradle @@ -58,6 +58,7 @@ dependencies { implementation project(':services:mogo-service-api') implementation project(':core:mogo-core-utils') + implementation project(':core:mogo-core-function-call') } implementation 'com.tencent.bugly:crashreport_upgrade:latest.release' //其中latest.release指代最新Bugly SDK版本号，也可以指定明确的版本号，例如2.1.9 diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java index 2a02caf94d..2b7176cc06 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java @@ -21,6 +21,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.voice.AIAssist; +import com.mogo.eagle.core.function.call.check.CallerCheckManager; import com.mogo.eagle.core.function.check.R; import com.mogo.eagle.core.function.check.model.CheckItemInfo; import com.mogo.module.common.MogoApisHandler; @@ -128,7 +129,7 @@ public class CheckActivity extends AppCompatActivity { hardware(); //根据以上4个结果插入第一个元素(自动驾驶车辆是否存在风险) topListTitle(); - MogoApisHandler.getInstance().getApis().getCheckProvider().updateMonitoringStatus(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING,false); + CallerCheckManager.updateMonitoringStatus(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING,false); return true; } diff --git a/core/mogo-core-data/build.gradle b/core/mogo-core-data/build.gradle index d01467da07..c894e49e0c 100644 --- a/core/mogo-core-data/build.gradle +++ b/core/mogo-core-data/build.gradle @@ -44,7 +44,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation rootProject.ext.dependencies.kotlinstdlibjdk7 - + implementation rootProject.ext.dependencies.androidxappcompat if (Boolean.valueOf(RELEASE)) { } else { 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 new file mode 100644 index 0000000000..04e8fb422b --- /dev/null +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -0,0 +1,398 @@ +package com.mogo.eagle.core.data.constants; + +import androidx.annotation.Keep; + +/** + * @author congtaowang + * @since 2019-12-23 + *

+ * 对外服务模块路径 + *

+ *

+ * 使用方式： + *

+ * Arouter.getInstance().path("").navigate() + */ +@Keep +public class MogoServicePaths { + + /** + * 地图服务接口ARouter实例化路径 + */ + @Keep + @Deprecated + public static final String PATH_SERVICES_MAP = "/mapservices/api"; + + /** + * 图片接口ARouter实例化路径 + */ + @Keep + @Deprecated + public static final String PATH_UTILS_IMAGE_LOADER = "/imageloader/api"; + + /** + * 埋点接口ARouter实例化路径 + */ + @Keep + @Deprecated + public static final String PATH_UTILS_ANALYTICS = "/utils/analytics"; + + + /** + * 网络服务接口路径 + */ + @Keep + @Deprecated + public static final String PATH_SERVICES_NETWORK = "/networkservices/api"; + + /** + * netty 长链 + */ + @Keep + @Deprecated + public static final String PATH_SOCKET_MANAGER = "/socket/manager"; + + /** + * WebSocket 长链 + */ + @Keep + @Deprecated + public static final String PATH_WEB_SOCKET_MANAGER = "/websocket/manager"; + + /** + * 状态管理接口 + */ + @Keep + @Deprecated + public static final String PATH_STATUS_MANAGER = "/statusmanager/api"; + + /** + * 消息中心 + */ + @Keep + @Deprecated + public static final String PATH_MSG_CENTER = "/msgcenter/api"; + + /** + * 消息中心 + */ + @Keep + @Deprecated + public static final String PATH_WINDOW_MANAGER = "/windowmanger/api"; + + /** + * 卡片控制 + */ + @Keep + @Deprecated + public static final String PATH_CARD_MANAGER = "/cardmanager/api"; + + /** + * 管理 fragment + */ + @Keep + @Deprecated + public static final String PATH_FRAGMENT_MANAGER = "/fragmentmanager/api"; + + /** + * 免唤醒语音控制 + * + * @deprecated use {@link #PATH_INTENT_MANAGER} instead. + */ + @Keep + @Deprecated + public static final String PATH_VOICE_MANAGER = "/voicemanager/api"; + + /** + * 意图控制接口 + */ + @Keep + @Deprecated + public static final String PATH_INTENT_MANAGER = "/intentmanager/api"; + + /** + * 基础功能监听回调注册 + */ + @Keep + @Deprecated + public static final String PATH_REGISTER_CENTER = "/registercenter/api"; + + /** + * 基础家和公司管理 + */ + @Keep + @Deprecated + public static final String PATH_ADDRESS_MANAGER = "/addressmanager/api"; + + /** + * 导航搜索模块管理 + */ + @Keep + @Deprecated + public static final String PATH_SEARCH_MANAGER = "/searchmanager/api"; + + /** + * 基础设置参数管理 + */ + @Keep + @Deprecated + public static final String PATH_SETTING_MANAGER = "/settingmanager/api"; + + + /** + * 搜索module管理中心 + */ + @Keep + @Deprecated + public static final String PATH_SERACH_CENTER = "/searchcenter/api"; + + /** + * 大而全数据管理中心 + */ + @Keep + @Deprecated + public static final String PATH_DATA_MANAGER = "/datamanager/api"; + + /** + * adas 控制 + */ + @Keep + @Deprecated + public static final String PATH_ADAS_CONTROLLER = "/adascontroller/api"; + + /** + * 接口集合 + */ + @Keep + @Deprecated + public static final String PATH_SERVICE_APIS = "/mogoservice/apis"; + + /** + * 动作指令 + */ + @Keep + @Deprecated + public static final String PATH_ACTION_APIS = "/mogoaction/api"; + + /** + * 刷新策略控制 + */ + @Keep + @Deprecated + public static final String PATH_REFRESH_STRATEGY_API = "/refreshstrategy/api"; + + /** + * 刷新策略控制 + */ + @Keep + @Deprecated + public static final String PATH_LAUNCHER_API = "/launcher/api"; + + /** + * 入口按钮 + */ + @Keep + @Deprecated + public static final String PATH_ENTRANCE_BUTTON_API = "/entrancebutton/api"; + + /** + * 顶部1/2屏管理 + */ + @Keep + @Deprecated + public static final String PATH_EXTENSIONS_TOP_VIEW_MANAGER = "/topview/api"; + + /** + * 浓雾等极端事件特殊效果 + */ + @Keep + @Deprecated + public static final String PATH_MAIN_DISPLAY_EFFECTS_MANAGER = "/displayeffects/api"; + + /** + * 其他模块调用公共的marker打点 + */ + @Keep + @Deprecated + public static final String PATH_MARKER_SERVICE = "/mogomarker/api"; + + /** + * 其他模块调用分享框 + */ + @Keep + @Deprecated + public static final String PATH_SHARE = "/extensions/share"; + + /** + * obu相关接口 + */ + @Keep + @Deprecated + public static final String PATH_OBU = "/obu/api"; + + /** + * 事件面板 + */ + @Keep + @Deprecated + public static final String PATH_EVENT_PANEL = "/event/panel"; + + /** + * 左侧面板 + */ + @Keep + @Deprecated + public static final String PATH_LEFT_PANEL = "/left/panel"; + + /** + * 比亚迪模块 + */ + @Keep + @Deprecated + public static final String PATH_SPLASH = "/splash/api"; + + /** + * 位置上报 + */ + @Keep + @Deprecated + public static final String PATH_LOCATION_INFO = "/locationinfo/api"; + + /** + * passport + */ + @Keep + @Deprecated + public static final String PATH_PASSPORT = "/passport/api"; + + /** + * 授权服务 + */ + @Keep + @Deprecated + public static final String PATH_AGREEMENT = "/agreement/showFragment"; + + /** + * 日志上传 + */ + @Keep + @Deprecated + public static final String PATH_MOGO_MONITOR = "/monitor/api"; + + /** + * 探路api + */ + @Keep + @Deprecated + public static final String PATH_TANLU_API = "/tanlulib/api"; + + /** + * 策略上报 + */ + @Keep + @Deprecated + public static final String PATH_STRATEGY_SHARE = "/share/strategy"; + + /** + * 分享模块中，交通状况服务上报 + */ + @Keep + @Deprecated + public static final String PATH_TRAFFIC_UPLOAD = "/share/traffic"; + + /** + * 高德地图巡航上报 + */ + @Keep + @Deprecated + public static final String PATH_GAODE_AIMLESS_SHARE = "/share/gaodeAimless"; + + /** + * 探路ui + */ + @Keep + @Deprecated + public static final String PATH_TANLU_UI_API = "/tanlu/ui"; + + /** + * 碰撞报警模块 已碰撞 + */ + @Keep + @Deprecated + public static final String PATH_CRASH_WARNING = "/crash/warning"; + + /** + * 悬浮小控件 + */ + @Keep + @Deprecated + public static final String PATH_WIDGETS = "/widgets/provider"; + + /** + * 在线好友面板 + */ + @Keep + @Deprecated + public static final String PATH_ONLINE_CAR_PANEL = "/onlinecar/panel"; + + /** + * 全局免唤醒 + */ + @Keep + @Deprecated + public static final String PATH_GLOBAL_UNWAKE = "/global/unwake"; + + /** + * 返回悬浮按钮 + */ + @Keep + @Deprecated + public static final String PATH_BACK = "/back2launcher/ui"; + + /** + * 自研地图和高德地图切换 + */ + @Keep + @Deprecated + public static final String PATH_MAP_FRAME_CONTROLLER = "/mapframe/controller"; + + /** + * 小地图控件 + */ + @Keep + @Deprecated + public static final String PATH_SMALL_MAP = "/small_map/api"; + + /** + * ADAS 模块 + */ + @Keep + @Deprecated + public static final String PATH_ADAS = "/adas/api"; + + /** + * 车辆检测 模块 + */ + public static final String PATH_CHECK = "/check/api"; + + /** + * 前方碰撞预警 未碰撞 + */ + @Keep + @Deprecated + public static final String PATH_V2X_FRONT_CRASH_WARNING = "/front/crashwarning"; + + /** + * warning 模块 + */ + @Keep + @Deprecated + public static final String PATH_V2X_WARNING = "/warning/api"; + + /** + * obu-mogo 模块 + */ + @Keep + @Deprecated + public static final String PATH_V2X_OBU_MOGO = "/obu_mogo/api"; +} diff --git a/core/mogo-core-function-call/build.gradle b/core/mogo-core-function-call/build.gradle index 7ba076435f..09965e37ed 100644 --- a/core/mogo-core-function-call/build.gradle +++ b/core/mogo-core-function-call/build.gradle @@ -43,13 +43,16 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation rootProject.ext.dependencies.kotlinstdlibjdk7 + + implementation rootProject.ext.dependencies.arouter + kapt rootProject.ext.dependencies.aroutercompiler + if (Boolean.valueOf(RELEASE)) { } else { implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-api') - implementation project(':core:function-impl:mogo-core-function-hmi') } } diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/check/CallerCheckManager.java b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/check/CallerCheckManager.java new file mode 100644 index 0000000000..dfdf7e3ce4 --- /dev/null +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/check/CallerCheckManager.java @@ -0,0 +1,60 @@ +package com.mogo.eagle.core.function.call.check; + +import android.content.Context; + +import com.mogo.eagle.core.data.constants.MogoServicePaths; +import com.mogo.eagle.core.function.api.check.ICheckProvider; +import com.mogo.eagle.core.function.api.check.IMogoCheckListener; +import com.mogo.eagle.core.function.call.base.CallerBase; + +/** + * @author xiaoyuzhou + * @date 2021/9/17 8:26 下午 + */ +public class CallerCheckManager extends CallerBase { + + private static ICheckProvider getCheckProvider() { + return getApiInstance(ICheckProvider.class, MogoServicePaths.PATH_CHECK); + } + + + /** + * 注册车辆监控变化监听 + * + * @param module 监听模块 + * @param listener 回调监听对象 + */ + public static void registerVehicleMonitoringListener(String module, IMogoCheckListener listener) { + getCheckProvider().registerVehicleMonitoringListener(module, listener); + } + + /** + * 注销车辆监控变化监听 + * + * @param module + */ + public static void unregisterListener(String module, IMogoCheckListener listener) { + getCheckProvider().unregisterListener(module, listener); + } + + /** + * 启动检测模块 + */ + public static void startCheckActivity(Context context) { + getCheckProvider().startCheckActivity(context); + } + + /** + * 根据监测指标修改主页检测按钮 + */ + public static void updateMonitoringStatus(String module, boolean hasError) { + getCheckProvider().updateMonitoringStatus(module, hasError); + } + + /** + * 指标监测 + */ + public static boolean checkMonitor(Context context) { + return getCheckProvider().checkMonitor(context); + } +} diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.java b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.java index 9816b16684..53a8445a9b 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.java +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.java @@ -1,8 +1,8 @@ package com.mogo.eagle.core.function.call.hmi; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider; import com.mogo.eagle.core.function.call.base.CallerBase; -import com.mogo.service.MogoServicePaths; /** * @author xiaoyuzhou diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.java b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.java index ea3c7aaa04..fc9d3a2178 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.java +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.java @@ -1,9 +1,9 @@ package com.mogo.eagle.core.function.call.map; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider; import com.mogo.eagle.core.function.call.base.CallerBase; -import com.mogo.service.MogoServicePaths; import java.util.List; diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index 0aedc8e945..e8567b4506 100644 --- a/modules/mogo-module-extensions/build.gradle +++ b/modules/mogo-module-extensions/build.gradle @@ -67,7 +67,9 @@ dependencies { implementation project(':modules:mogo-module-common') implementation project(':modules:mogo-module-share') implementation project(':modules:mogo-module-service') + implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-function-call') } } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 661f23d6d5..64190b4bf3 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -36,6 +36,7 @@ import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.api.check.IMogoCheckListener; +import com.mogo.eagle.core.function.call.check.CallerCheckManager; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.marker.IMogoMarkerManager; @@ -407,7 +408,7 @@ public class EntranceFragment extends MvpFragment