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

Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
donghongyu-pc
2024-10-12 13:31:47 +08:00
parent c1080232b7 6e485fe4ea
commit ec2e22f2e4
7 changed files with 82 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
View File

@@ -23,6 +23,7 @@ import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandl
import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_STOP_SEARCH_TRAFFIC_LIGHT
import com.mogo.eagle.function.biz.v2x.trafficlight.network.TrafficLightNetWorkModel
import com.zhidaoauto.map.data.road.RoadCross
import java.lang.Exception
class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener,
IMoGoMapRoadListener {
@@ -70,15 +71,17 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener,
}
// CallerLogger.i("$M_BIZ$TAG", "红绿灯路口请求 : $stopLineDis")
mLocation?.let { it ->
trafficLightNetWorkModel.requestRoadID(
it.latitude, it.longitude, it.heading,
{
mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_CROSS_ROAD)
roadIDResult = it
},
{
//CallerLogger.w(M_V2X + TAG, "request road id error : $it")
})
try {
trafficLightNetWorkModel.requestRoadID(
it.latitude, it.longitude, it.heading,
{
mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_CROSS_ROAD)
roadIDResult = it
},
{
//CallerLogger.w(M_V2X + TAG, "request road id error : $it")
})
}catch (_: Exception){}
}
}, {
//stop loop search road id

2
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/adapter/TakeOverListAdapter.kt
View File

@@ -47,7 +47,7 @@ class TakeOverListAdapter(private val context: Context): RecyclerView.Adapter<Ta
fun notifyRecordItemChanged(info: TakeOverRecordInfo){
val pos = data?.indexOf(info)
pos?.let {
data!![pos] = info
data?.set(pos, info)
notifyItemChanged(pos)
}
}

6
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
View File

@@ -1420,9 +1420,15 @@ class TravelRealityView @JvmOverloads constructor(
if (isSmallMap) {
if (globalPath.wayPointsList.size > 0) {
this.globalPathResp = globalPath
val pointCloneList = ArrayList<Point>()
globalPath.wayPointsList.forEach { loc ->
pointCloneList.add(Point(loc.longitude, loc.latitude))
}
reqData = pointCloneList
drawRotting()
}
} else {
this.globalPathResp = globalPath
val pointList = ArrayList<Point>()
val pointCloneList = ArrayList<Point>()
globalPath.wayPointsList.forEach { loc ->