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:
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
#	OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt
This commit is contained in:
donghongyu-pc
2024-10-25 10:15:33 +08:00
parent a28c509074 a72a97ea8c
commit 8794695c9d
20 changed files with 127 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt
View File

@@ -55,7 +55,7 @@ class V2XAiRoadEventMarker {
.set3DMode(true)
.isUseGps(true)
.icon3DRes(R.raw.taxi_sanjiaozui)
.scale(1.0f)
.scale(0.5f)
.build().let {
CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(it)
}?.also {

10
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt
View File

@@ -1263,9 +1263,9 @@ class OperatePanelLayout : LinearLayout {
prevCheckedKeyForFusionMode?.takeIf { it != KEY_ALL_MERGE_MODE }?.let {
preferenceScreen.findPreferenceReal<TwoStatePreference>(it)
}?.also {
prevCheckedKeyForFusionMode = KEY_ALL_MERGE_MODE
changeValue(it, false)
}
prevCheckedKeyForFusionMode = KEY_ALL_MERGE_MODE
hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
clickEventAnalytics("融合模式", true)
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1283,9 +1283,9 @@ class OperatePanelLayout : LinearLayout {
prevCheckedKeyForFusionMode?.takeIf { it != KEY_BLIND_AREA_MODE }?.let {
preferenceScreen.findPreferenceReal<TwoStatePreference>(it)
}?.also {
prevCheckedKeyForFusionMode = KEY_BLIND_AREA_MODE
changeValue(it, false)
}
prevCheckedKeyForFusionMode = KEY_BLIND_AREA_MODE
hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
clickEventAnalytics("融合模式", true)
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1303,9 +1303,9 @@ class OperatePanelLayout : LinearLayout {
prevCheckedKeyForFusionMode?.takeIf { it != KEY_BEYOND_VISUAL_RANGE_MODE }?.let {
preferenceScreen.findPreferenceReal<TwoStatePreference>(it)
}?.also {
prevCheckedKeyForFusionMode = KEY_BEYOND_VISUAL_RANGE_MODE
changeValue(it, false)
}
prevCheckedKeyForFusionMode = KEY_BEYOND_VISUAL_RANGE_MODE
hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
clickEventAnalytics("融合模式", true)
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1323,9 +1323,9 @@ class OperatePanelLayout : LinearLayout {
prevCheckedKeyForFusionMode?.takeIf { it != KEY_TRANSPARENT_TRANSFER_MODE }?.let {
preferenceScreen.findPreferenceReal<TwoStatePreference>(it)
}?.also {
prevCheckedKeyForFusionMode = KEY_TRANSPARENT_TRANSFER_MODE
changeValue(it, false)
}
prevCheckedKeyForFusionMode = KEY_TRANSPARENT_TRANSFER_MODE
hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
clickEventAnalytics("融合模式", true)
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)
@@ -1343,9 +1343,9 @@ class OperatePanelLayout : LinearLayout {
prevCheckedKeyForFusionMode?.takeIf { it != KEY_PURE_OBU_MODE }?.let {
preferenceScreen.findPreferenceReal<TwoStatePreference>(it)
}?.also {
prevCheckedKeyForFusionMode = KEY_PURE_OBU_MODE
changeValue(it, false)
}
prevCheckedKeyForFusionMode = KEY_PURE_OBU_MODE
hmiAction("SOP 融合模式, ", FunctionBuildConfig.fusionMode)
clickEventAnalytics("融合模式", true)
CallerAutoPilotControlManager.sendFusionMode(FunctionBuildConfig.fusionMode)

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt
View File

@@ -56,8 +56,8 @@ class ColdStartView @JvmOverloads constructor(
companion object {
const val TAG = "ColdStartView"
const val LOAD_SSM_WAITING_TIME = 60000L //SSM加载超时等待时间
const val COLD_START_WAITING_TIME = 300000L //冷启动超时等待时间
const val LOAD_SSM_WAITING_TIME = 180000L //SSM加载超时等待时间
const val COLD_START_WAITING_TIME = 600000L //冷启动超时等待时间
}
private var ipcConnectStatus = false //连接域控状态，默认是未连接

3
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
View File

@@ -19,10 +19,11 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clBoneBiz"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_385"
android:layout_marginStart="@dimen/dp_19"
android:elevation="1dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

2
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt
View File

@@ -18,7 +18,7 @@ class CrossRoad(private val delayTime: Long = 0, unit: TimeUnit = TimeUnit.SECON
override fun getVisualAngleMode(): VisualAngleMode {
if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
return VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS
return VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS_B2_PASSENGER
}
return MAP_STYLE_VR_ANGLE_CROSS_NEW
}