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

Merge branch 'refs/heads/dev_robotaxi-d_240729_6.6.0' into dev_robotaxi-d_240807_6.6.0

Browse Source
This commit is contained in:
yangyakun
2024-08-07 16:06:57 +08:00
parent b2648c0cdc e519886a58
commit ed5694218c
688 changed files with 28713 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
View File

@@ -627,6 +627,34 @@ class MoGoAutopilotControlProvider :
}
}
/**
* 会车开关
* isEnable = true 开启
* isEnable = false 关闭
* @return boolean
*/
override fun sendParkVehCross(isEnable: Boolean): Boolean {
return if (isEnable) {
AdasManager.getInstance().sendParkVehCross(1) > -1
} else {
AdasManager.getInstance().sendParkVehCross(0) > -1
}
}
/**
* 超车开关
* isEnable = true 开启
* isEnable = false 关闭
* @return boolean
*/
override fun sendParkVehOvertake(isEnable: Boolean): Boolean {
return if (isEnable) {
AdasManager.getInstance().sendParkVehOvertake(1) > -1
} else {
AdasManager.getInstance().sendParkVehOvertake(0) > -1
}
}
/**
* 变道绕障的目标障碍物速度阈值
* @param speed 速度阈值 m/s

18
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
View File

@@ -72,6 +72,8 @@ import kotlinx.android.synthetic.main.view_sop_setting.view.scObstacleAvoidance
import kotlinx.android.synthetic.main.view_sop_setting.view.scObu
import kotlinx.android.synthetic.main.view_sop_setting.view.scObuV2vView
import kotlinx.android.synthetic.main.view_sop_setting.view.scObuWeaknessTrafficSop
import kotlinx.android.synthetic.main.view_sop_setting.view.scParkVehCross
import kotlinx.android.synthetic.main.view_sop_setting.view.scParkVehOvertake
import kotlinx.android.synthetic.main.view_sop_setting.view.scRainMode
import kotlinx.android.synthetic.main.view_sop_setting.view.scRouteDynamicEffect
import kotlinx.android.synthetic.main.view_sop_setting.view.scRunRedLightSop
@@ -531,6 +533,22 @@ internal class SOPSettingView @JvmOverloads constructor(
* 与车相关类设置
*/
private fun vehicleSetting() {
//PNC-park-会车
scParkVehCross.isChecked = FunctionBuildConfig.isOpenParkVehCross
scParkVehCross.setOnCheckedChangeListener { _, isChecked ->
hmiAction("SOP PNC-park-会车, ", isChecked)
CallerAutoPilotControlManager.sendParkVehCross(isChecked)
FunctionBuildConfig.isOpenParkVehCross = isChecked
}
//PNC-park-超车
scParkVehOvertake.isChecked = FunctionBuildConfig.isOpenOvertake
scParkVehOvertake.setOnCheckedChangeListener { _, isChecked ->
hmiAction("SOP PNC-park-超车, ", isChecked)
CallerAutoPilotControlManager.sendParkVehOvertake(isChecked)
FunctionBuildConfig.isOpenOvertake = isChecked
}
//绕障类功能
scObstacleAvoidance.isChecked = FunctionBuildConfig.isDetouring
scObstacleAvoidance.setOnCheckedChangeListener { _, isChecked ->

34
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
View File

@@ -410,6 +410,36 @@
app:layout_constraintGuide_percent="0.5"
app:layout_constraintLeft_toLeftOf="@id/tvVehicleTitle"
app:layout_constraintRight_toRightOf="parent" />
<!--PNC-park-会车-->
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/scParkVehCross"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:scaleX="1.2"
android:scaleY="1.2"
android:text="PNC-park-会车"
android:textSize="@dimen/sp_28"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="@id/vehicleGuideLine"
app:layout_constraintTop_toBottomOf="@id/tvVehicleTitle"
/>
<!--PNC-park-超车-->
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/scParkVehOvertake"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25"
android:scaleX="1.2"
android:scaleY="1.2"
android:text="PNC-park-超车"
android:textSize="@dimen/sp_28"
app:layout_constraintLeft_toLeftOf="@id/vehicleGuideLine"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvVehicleTitle" />
<!--绕障类功能-->
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/scObstacleAvoidance"
@@ -422,7 +452,7 @@
android:textSize="@dimen/sp_28"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="@id/vehicleGuideLine"
app:layout_constraintTop_toBottomOf="@id/tvVehicleTitle" />
app:layout_constraintTop_toBottomOf="@id/scParkVehCross" />
<!--雨天模式-->
<androidx.appcompat.widget.SwitchCompat
@@ -436,7 +466,7 @@
android:textSize="@dimen/sp_28"
app:layout_constraintLeft_toLeftOf="@id/vehicleGuideLine"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvVehicleTitle" />
app:layout_constraintTop_toBottomOf="@id/scParkVehOvertake" />
<!--弱网减速停车-->
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/scWeakNetSlowDown"