diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 8bd3e8dd90..cf5ef26e06 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -135,7 +135,7 @@ class DebugSettingView @JvmOverloads constructor( } - override fun onAutopilotWarnMessage(autoPilotWarnMessage: AutoPilotWarnMessage?) { + override fun onAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?) { } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotWarnMessage.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotWarnMessage.java similarity index 94% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotWarnMessage.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotWarnMessage.java index 8c3e114422..3231199a58 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutoPilotWarnMessage.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotWarnMessage.java @@ -7,7 +7,7 @@ package com.mogo.eagle.core.data.autopilot; *
* 描述 */ -public class AutoPilotWarnMessage { +public class AutopilotWarnMessage { public String content; public String level; diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt index 72d6003666..3057c92488 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotStatusListener.kt @@ -59,9 +59,9 @@ interface IMoGoAutopilotStatusListener { /** * 报警信息 * - * @param autoPilotWarnMessage 预警信息 + * @param autopilotWarnMessage 预警信息 */ - fun onAutopilotWarnMessage(autoPilotWarnMessage: AutoPilotWarnMessage?) + fun onAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?) companion object { diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt index 794ab48920..c30492d5eb 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt @@ -187,13 +187,13 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { * 报警信息 回调 */ @Synchronized - fun invokeAutopilotWarnMessage(autoPilotWarnMessage: AutoPilotWarnMessage?) { - LogUtils.dTag(TAG, "$autoPilotWarnMessage") + fun invokeAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?) { + LogUtils.dTag(TAG, "$autopilotWarnMessage") M_AUTOPILOT_STATUS_LISTENERS.forEach { val tag = it.key val listener = it.value LogUtils.dTag(TAG, "tag:$tag listener:$listener") - listener.onAutopilotWarnMessage(autoPilotWarnMessage) + listener.onAutopilotWarnMessage(autopilotWarnMessage) } } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java index 329313c79d..e6fa375d17 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java @@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo; import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; -import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage; +import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; import com.mogo.eagle.core.data.traffic.TrafficData; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; @@ -246,7 +246,7 @@ public class AdasEventManager implements OnAdasMsgConnectStatusListener, IMoGoAu } @Override - public void onAutopilotWarnMessage(@Nullable AutoPilotWarnMessage autopilotWarnMessage) { + public void onAutopilotWarnMessage(@Nullable AutopilotWarnMessage autopilotWarnMessage) { Logger.d(TAG, "onWarnMessage " + autopilotWarnMessage); //报警model for (IAdasDataListener listener : iAdasEventListeners) { diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt index aff966e175..592222d186 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt @@ -1,7 +1,7 @@ package com.mogo.module.adas import android.util.Log -import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage +import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo @@ -45,12 +45,12 @@ object AdasObjectUtils { ) } - fun fromAdasObject(info: WarnMessageInfo?): AutoPilotWarnMessage? { + fun fromAdasObject(info: WarnMessageInfo?): AutopilotWarnMessage? { if (info == null) { return null } val warnMessage = - AutoPilotWarnMessage() + AutopilotWarnMessage() warnMessage.content = info.content warnMessage.level = info.level try { diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java index 90b42aebd2..f87b28fe43 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java @@ -3,7 +3,7 @@ package com.mogo.module.adas; import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; -import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage; +import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; import com.mogo.eagle.core.data.traffic.TrafficData; import java.util.List; @@ -19,7 +19,7 @@ public interface IAdasDataListener { } - default void onWarnMessage(AutoPilotWarnMessage autopilotWarnMessage) { + default void onWarnMessage(AutopilotWarnMessage autopilotWarnMessage) { } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java index db2f3a9e16..9931b3e9e6 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java @@ -5,7 +5,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo; import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; -import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage; +import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; import com.mogo.eagle.core.data.traffic.TrafficData; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.utils.logger.Logger; @@ -127,7 +127,7 @@ public class OnAdasListenerAdapter implements OnAdasListener { @Override public void onWarnMessage(WarnMessageInfo warnMessageInfo) { - final AutoPilotWarnMessage warnMessage = AdasObjectUtils.INSTANCE.fromAdasObject(warnMessageInfo); + final AutopilotWarnMessage warnMessage = AdasObjectUtils.INSTANCE.fromAdasObject(warnMessageInfo); CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutopilotWarnMessage(warnMessage); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java index 4cd57cb901..5033726c1d 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java @@ -15,7 +15,7 @@ import com.mogo.module.extensions.navi.VrModeNavInfoView; import com.mogo.realtime.socket.IMogoCloudOnMsgListener; import com.mogo.service.adas.IMogoAdasWarnMessageCallback; import com.mogo.eagle.core.data.autopilot.MogoADASWarnType; -import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage; +import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; import com.mogo.utils.logger.Logger; import org.json.JSONArray; @@ -92,7 +92,7 @@ public class AdasNoticeHelper implements IMogoAdasWarnMessageCallback, IMogoLoca } @Override - public void onReceiveData(AutoPilotWarnMessage msg) { + public void onReceiveData(AutopilotWarnMessage msg) { Logger.d(TAG, "收到adas warn message, isVrMode: " + isVrMode + " msg: " + msg); if (!isVrMode) { return; diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasWarnMessageCallback.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasWarnMessageCallback.java index 1f574d7624..b593381b48 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasWarnMessageCallback.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasWarnMessageCallback.java @@ -1,6 +1,6 @@ package com.mogo.service.adas; -import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage; +import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; /** * adas 数据回调接口 @@ -12,5 +12,5 @@ public interface IMogoAdasWarnMessageCallback { * adas 数据回调 * @param msg 具体数据 */ - void onReceiveData( AutoPilotWarnMessage msg ); + void onReceiveData( AutopilotWarnMessage msg ); } \ No newline at end of file diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 864ed5e160..d9252806d5 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -17,7 +17,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; -import com.mogo.eagle.core.data.autopilot.AutoPilotWarnMessage; +import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.traffic.TrafficData; @@ -261,7 +261,7 @@ public class MogoADASController implements IMogoADASController { } @Override - public void onWarnMessage(AutoPilotWarnMessage autopilotWarnMessage) { + public void onWarnMessage(AutopilotWarnMessage autopilotWarnMessage) { if (autopilotWarnMessage == null) { return; }