yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0

Browse Source 
# Conflicts:
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
This commit is contained in:
donghongyu
2023-02-01 19:31:36 +08:00
parent 6c2d19f9c2 dfc3560001
commit 8be6c14004
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
View File

@@ -1087,7 +1087,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
}
@Override
public void onoObuRsmWarning(MessagePad.Header header, ObuScene.MapMatchData mapMatchData) {
public void onoObuObuMapMath(MessagePad.Header header, ObuScene.MapMatchData mapMatchData) {
}

2
app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
View File

@@ -568,7 +568,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
}
@Override
public void onoObuRsmWarning(MessagePad.Header header, ObuScene.MapMatchData mapMatchData) {
public void onoObuObuMapMath(MessagePad.Header header, ObuScene.MapMatchData mapMatchData) {
}

2
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
View File

@@ -575,7 +575,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
* @param header 头
* @param mapMatchData 数据
*/
override fun onoObuRsmWarning(header: MessagePad.Header?, mapMatchData: ObuScene.MapMatchData?) {
override fun onoObuObuMapMath(header: MessagePad.Header?, mapMatchData: ObuScene.MapMatchData?) {
CallerObuMapMathListenerManager.invokeObuMapMath(mapMatchData!!)
}

2
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java
View File

@@ -234,7 +234,7 @@ public interface OnAdasListener {
* @param header 头
* @param mapMatchData 数据
*/
void onoObuRsmWarning(MessagePad.Header header, ObuScene.MapMatchData mapMatchData);
void onoObuObuMapMath(MessagePad.Header header, ObuScene.MapMatchData mapMatchData);
/**
* 重构后的功能状态