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

Merge remote-tracking branch 'origin/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.0

Browse Source
This commit is contained in:
xuxinchao
2024-10-12 16:43:51 +08:00
parent 59cb483509 6223e3bb59
commit aefaf11f25
34 changed files with 1763 additions and 157 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)
}
}

3
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/toolkit/custom/ToolDriverRomaView.kt
View File

@@ -15,6 +15,7 @@ import com.mogo.eagle.core.utilcode.util.ClickUtils
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import kotlinx.android.synthetic.main.view_tool_driver_roma.view.ivRomaView
import kotlinx.android.synthetic.main.view_tool_driver_roma.view.toolDriverRomaContainer
class ToolDriverRomaView @JvmOverloads constructor(
context: Context,
@@ -41,7 +42,7 @@ class ToolDriverRomaView @JvmOverloads constructor(
0
)
setOnClickListener {
toolDriverRomaContainer.setOnClickListener {
if (ClickUtils.isClickTooFrequent(this, 2500)) {
ToastUtils.showShort("不要频繁点击哦~")
return@setOnClickListener

6
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt
View File

@@ -294,17 +294,17 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
TypedValue.COMPLEX_UNIT_PX,
AutoSizeUtils.dp2px(context, 28f).toFloat()
)
tvV2XHintContent.setTypeface(null, Typeface.NORMAL)
tvV2XHintContent.setTypeface(null, Typeface.BOLD)
tvV2XHintContent.setPadding(0, 0, 0, AutoSizeUtils.dp2px(context, 28f))
val containerImageAndLiveVideoLayoutParams =
containerImageAndLiveVideo.layoutParams as ConstraintLayout.LayoutParams
containerImageAndLiveVideoLayoutParams.width =
AutoSizeUtils.dp2px(context, 350f + 18f * (350f / 480f)) //乘客屏视频加载里面背景切图包含了白边
AutoSizeUtils.dp2px(context, 350f) //乘客屏视频加载里面背景切图包含了白边
containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 197f)
containerImageAndLiveVideoLayoutParams.setMargins(
AutoSizeUtils.dp2px(context, 20f),
AutoSizeUtils.dp2px(context, 23f - 14f * (54f / 69f)), //乘客屏icon ivV2XImage带了白边
AutoSizeUtils.dp2px(context, 23.3f - 14f * (54f / 69f)), //乘客屏icon ivV2XImage带了白边
AutoSizeUtils.dp2px(context, 20f),
0
)

4
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
View File

@@ -158,10 +158,10 @@
<!-- 前方路况探查 -->
<com.mogo.eagle.core.function.view.RoadCrossRoamView
android:id="@+id/viewRoadCrossRoam"
android:layout_width="@dimen/dp_654"
android:layout_width="@dimen/dp_694"
android:layout_height="@dimen/dp_790"
android:layout_marginTop="@dimen/dp_39"
android:layout_marginEnd="@dimen/dp_19"
android:layout_marginEnd="@dimen/dp_24"
android:visibility="gone"
android:focusable="false"
android:focusableInTouchMode="false"

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tool_driver_roma.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/cl_roma_bg"
android:id="@+id/toolDriverRomaContainer"
android:layout_width="match_parent"
android:layout_height="match_parent">

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 ->