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

Merge branch 'dev_robotaxi-d_230912_6.1.0' into base_3.4.0-map-sdk

Browse Source
This commit is contained in:
zhongchao
2023-09-22 14:26:33 +08:00
parent 867f98faa8 98b899db89
commit c245a635dc
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt
View File

@@ -283,12 +283,12 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
findViewById<View>(R.id.test_bar_route)?.setOnClickListener {
testRouteInfoUpload()
}
findViewById<View>(R.id.test_brake)?.setOnClickListener {
TaxiTaskModel.handleBrakeStatusChange(false)
}
findViewById<View>(R.id.test_resume_brake)?.setOnClickListener {
TaxiTaskModel.handleBrakeStatusChange(true)
}
// findViewById<View>(R.id.test_brake)?.setOnClickListener {
// TaxiTaskModel.handleBrakeStatusChange(false)
// }
// findViewById<View>(R.id.test_resume_brake)?.setOnClickListener {
// TaxiTaskModel.handleBrakeStatusChange(true)
// }
findViewById<View>(R.id.test_parallel_driver)?.setOnClickListener {
stopAutoStartAutopilot()
}

4
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
View File

@@ -426,8 +426,8 @@ object TaxiTaskModel {
}
override fun brakeStatusChanged(isBrakeAvailable: Boolean) {
//刹车: true 松开, false 踩下
handleBrakeStatusChange(isBrakeAvailable)
//刹车: true 松开, false 踩下 2020.9.23刹车需求暂时下掉
// handleBrakeStatusChange(isBrakeAvailable)
}
}

2
OCH/taxi/unmanned-driver/src/main/res/layout/taxi_debug_order.xml
View File

@@ -57,6 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Mock刹车"
android:visibility="gone"
android:textSize="12sp" />
<Button
@@ -64,6 +65,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Mock松开刹车"
android:visibility="gone"
android:textSize="12sp" />
<Button