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 11197a4cfe..4e55121023 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.view.ImageViewClipBounds; @@ -127,7 +128,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-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/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