Merge branch 'dev_robotaxi-d_231201_6.2.4_dev' into dev_robotaxi-d_231206_6.2.4

This commit is contained in:
xuxinchao
2023-12-06 16:43:12 +08:00
44 changed files with 874 additions and 312 deletions

View File

@@ -26,6 +26,9 @@ object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusLis
if (newValue == null) {
return@observable
}
if(newValue == 0L){
mAutopilotStatusInfo.isArriveAtStation = false
}
M_LISTENERS.forEach {
val listener = it.value
listener.onAutopilotRouteLineId(newValue)
@@ -34,7 +37,7 @@ object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusLis
private var autopilotState: Int by Delegates.observable(0) { _, oldValue, newValue ->
if (oldValue != newValue) {
fixAtStationState(newValue)
//todo emArrow chainLog
M_LISTENERS.forEach {
val listener = it.value
listener.onAutopilotStatusResponse(newValue)
@@ -42,19 +45,6 @@ object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusLis
}
}
private fun fixAtStationState(autoPilotMode: Int) {
if (autoPilotMode == 2) {
//自驾状态下将到站状态置为false
mAutopilotStatusInfo.isArriveAtStation = false
} else {
//其它状态下, 将到站状态置为false
val arriveAtStation = mAutopilotStatusInfo.isArriveAtStation
if (arriveAtStation) {
mAutopilotStatusInfo.isArriveAtStation = false
}
}
}
private var dockerV: String by Delegates.observable("") { _, oldValue, newValue ->
if (!oldValue.contentEquals(newValue)) {
M_LISTENERS.forEach {

View File

@@ -149,6 +149,13 @@ object CallerDevaToolsManager {
devaToolsProviderApi?.onReceiveBadCaseRecord(msgBoxBean, activity,countdown)
}
/**
* 魔方开启主动录包
*/
fun startRecordByMoFang(){
devaToolsProviderApi?.startRecordByMoFang()
}
/**
* 展示录包配置页面
*/

View File

@@ -0,0 +1,22 @@
package com.mogo.eagle.core.function.call.map
import android.graphics.Bitmap
import com.mogo.eagle.core.function.api.map.deva.IMoGoMapScreenListener
import com.mogo.eagle.core.function.call.base.CallerBase
/**
* 高精地图屏幕截图回调监听管理
*/
object CallerMapScreenListenerManager: CallerBase<IMoGoMapScreenListener>() {
/**
* 高精地图屏幕截图回调
*/
fun invokeMapScreen(bitmap: Bitmap){
M_LISTENERS.forEach{
val listener = it.value
listener.onMapScreen(bitmap)
}
}
}