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

Merge branch 'dev_robotaxi-d_240705_6.5.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_240705_6.5.0

Browse Source 
# Conflicts:
#	core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt
This commit is contained in:
aibingbing
2024-07-10 09:57:21 +08:00
parent 1ca1a97aff 6254d96378
commit a826a86633
71 changed files with 1668 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt
View File

@@ -133,9 +133,10 @@ object CallerAutoPilotStatusListenerManager : CallerBase<IMoGoAutopilotStatusLis
/**
* 通过Gnss定位更新来同步更新自动驾驶状态
*/
fun updateAutoPilotLocAndTime(satelliteTime: Double, lon: Double, lat: Double) {
fun updateAutoPilotLocAndTime(satelliteTime: Double, lon: Double, lat: Double, heading: Double) {
mAutopilotStatusInfo.locationLat = lat
mAutopilotStatusInfo.locationLon = lon
mAutopilotStatusInfo.locationHeading = heading
mAutopilotStatusInfo.satelliteTime = satelliteTime
mAutopilotStatusInfo.locationStatus = true
invokeAutoPilotStatus()

3
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotStatisticsListenerManager.kt
View File

@@ -29,7 +29,8 @@ object CallerAutopilotStatisticsListenerManager : CallerBase<IMoGoAutopilotStati
)
)
} else {
CallerTrace.write("AutopilotStatistics", mapOf("autopilotStatistics" to it,
CallerTrace.write("AutopilotStatistics", mapOf("status" to it.status, "failedMessage" to it.failedMessage,
"req" to it.req, "usedTime" to it.usedTime,
"isDemoMode" to FunctionBuildConfig.isDemoMode,
"isTakeoverRemind" to FunctionBuildConfig.isTakeoverRemind))
}

14
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiViewControlListenerManager.kt
View File

@@ -31,6 +31,20 @@ object CallerHmiViewControlListenerManager : CallerBase<IViewControlListener>()
}
}
fun invokeGreenWaveVisible(min: Int, max: Int, cross: Int) {
M_LISTENERS.forEach {
val listener = it.value
listener.onGreenWaveViewVisible(min, max, cross)
}
}
fun invokeGreenWaveDismiss() {
M_LISTENERS.forEach {
val listener = it.value
listener.onGreenWaveViewDismiss()
}
}
fun updateStatusBarRightView(
tag: String,
insert: Boolean,

2
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapAiCloudDataManager.kt
View File

@@ -1,6 +1,5 @@
package com.mogo.eagle.core.function.call.map
import android.util.Log
import com.mogo.eagle.core.function.api.map.roma.IMoGoAiCloudIdentifyDataListener
import com.mogo.eagle.core.function.call.base.CallerBase
import mogo.yycp.api.proto.SocketDownData
@@ -9,7 +8,6 @@ object CallerMapAiCloudDataManager : CallerBase<IMoGoAiCloudIdentifyDataListener
fun invokeResponse(requestStatus: Boolean, errorMsg: String? = null) {
val tag = CallerMapIdentifyManager.roam.first
Log.i("emArrow","invokeResponse tag:$tag , status:$requestStatus , errorMsg:${errorMsg?:""}")
if(tag.isNotEmpty() && M_LISTENERS.containsKey(tag)){
M_LISTENERS[tag]?.response(requestStatus, errorMsg)
}

1
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt
View File

@@ -1,6 +1,5 @@
package com.mogo.eagle.core.function.call.map
import android.util.Log
import com.mogo.eagle.core.data.deva.chain.ChainConstant
import com.mogo.eagle.core.data.road.RoadCameraLive
import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener

3
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/telematic/CallerTelematicListenerManager.kt
View File

@@ -24,6 +24,7 @@ object CallerTelematicListenerManager: CallerBase<IReceivedMsgListener>() {
try {
listener.onReceivedMsg(type, byteArray)
} catch (e: Exception) {
e.printStackTrace()
Log.e(TAG, "转发消息出现异常：${e.message}")
}
}
@@ -36,6 +37,7 @@ object CallerTelematicListenerManager: CallerBase<IReceivedMsgListener>() {
try {
listener.onReceivedServerSn(sn)
} catch (e: Exception) {
e.printStackTrace()
Log.e(TAG, "转发司机屏SN出现异常：${e.message}")
}
}
@@ -49,6 +51,7 @@ object CallerTelematicListenerManager: CallerBase<IReceivedMsgListener>() {
try {
listener.onDemoMode(isDemoMode)
} catch (e: Exception) {
e.printStackTrace()
Log.e(TAG, "转发美化模式出现异常：${e.message}")
}
}