diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/exam/ExamControlWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/exam/ExamControlWindow.kt index 95e0d7be78..8d88cdd528 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/exam/ExamControlWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/exam/ExamControlWindow.kt @@ -12,6 +12,10 @@ import android.view.WindowManager import android.widget.ImageView import android.widget.TextView import android.widget.ToggleButton +import com.mogo.eagle.core.data.config.HmiBuildConfig +import com.mogo.eagle.core.data.config.HmiBuildConfig.coDriverStatus +import com.mogo.eagle.core.data.config.HmiBuildConfig.mainDriverStatus +import com.mogo.eagle.core.data.config.HmiBuildConfig.rearRowStatus import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.msgbox.AutopilotMsg import com.mogo.eagle.core.data.msgbox.MsgBoxBean @@ -223,6 +227,35 @@ class ExamControlWindow constructor(activity: Activity): View.OnTouchListener{ ivEmergencyStop.setOnClickListener { CallerAutoPilotControlManager.sendPlanningPullOverCmd(3) } + + //主驾 + tbSeatMainDriver.isChecked = mainDriverStatus + tbSeatMainDriver.setOnCheckedChangeListener{compoundButton, isChecked -> + if(!compoundButton.isPressed){ + return@setOnCheckedChangeListener + } + mainDriverStatus = isChecked + CallerAutoPilotControlManager.sendSeatPressure(mainDriverStatus,coDriverStatus,rearRowStatus) + } + //副驾 + tbSeatPassenger.isChecked = coDriverStatus + tbSeatPassenger.setOnCheckedChangeListener{compoundButton, isChecked -> + if(!compoundButton.isPressed){ + return@setOnCheckedChangeListener + } + coDriverStatus = isChecked + CallerAutoPilotControlManager.sendSeatPressure(mainDriverStatus,coDriverStatus,rearRowStatus) + } + //后排 + tbSeatRear.isChecked = rearRowStatus + tbSeatRear.setOnCheckedChangeListener{compoundButton, isChecked -> + if(!compoundButton.isPressed){ + return@setOnCheckedChangeListener + } + rearRowStatus = isChecked + CallerAutoPilotControlManager.sendSeatPressure(mainDriverStatus,coDriverStatus,rearRowStatus) + } + } @SuppressLint("ClickableViewAccessibility") diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt index 6cdb945dfd..4c7820f535 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt @@ -51,6 +51,13 @@ object HmiBuildConfig { @Volatile var isShowRouteStrategy = !AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) + /** + * 是否展示路沿、车道线 + */ + @JvmField + @Volatile + var isShowLaneMark: Boolean = false + /** * 是否展示obu的弱势交通 */ @@ -107,4 +114,25 @@ object HmiBuildConfig { @Volatile var isShowBusStationStrategyBorderPoint = false + /** + * 主驾是否有人,默认没人 + */ + @JvmField + @Volatile + var mainDriverStatus = false + + /** + * 副驾是否有人,默认没人 + */ + @JvmField + @Volatile + var coDriverStatus = false + + /** + * 后排是否有人,默认没人 + */ + @JvmField + @Volatile + var rearRowStatus = false + } \ No newline at end of file