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

[m1]

Browse Source 
[延时添加判断]
This commit is contained in:
yangyakun
2023-03-16 16:57:34 +08:00
parent a3f5a49648
commit 6224f0f2bd
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
View File

@@ -213,7 +213,7 @@ class BusPassengerPresenter(view: MainFragment?) :
ToastUtils.showShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆") ToastUtils.showShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆")
} }
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
// 靠边停车 // 靠边停车 订单结束 靠边停车
CallerAutoPilotControlManager.sendPlanningCmd(1) CallerAutoPilotControlManager.sendPlanningCmd(1)
} }
IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> {

2
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt
View File

@@ -362,7 +362,7 @@ class M1SoftFragment :
if (it.value == temperatureCmd) { if (it.value == temperatureCmd) {
rv_aircondition_temperature.tag = touchTag rv_aircondition_temperature.tag = touchTag
UiThreadHandler.postDelayed({ UiThreadHandler.postDelayed({
rv_aircondition_temperature.smoothScrollToPosition(it.index) rv_aircondition_temperature?.smoothScrollToPosition(it.index)
},500) },500)
} }
} }

2
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
View File

@@ -80,7 +80,7 @@ class MainFragment :
ToastUtils.showShort(AbsMogoApplication.getApp().getString(R.string.m1_please_login_driver)) ToastUtils.showShort(AbsMogoApplication.getApp().getString(R.string.m1_please_login_driver))
} }
} }
ll_car_speed.onClick { ll_car_speed.setOnClickListener {
if (DebugConfig.isDebug()) { if (DebugConfig.isDebug()) {
if (LoginStatusManager.isLogin()) { if (LoginStatusManager.isLogin()) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

4
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
View File

@@ -349,6 +349,7 @@ class LineSiteView @JvmOverloads constructor(
onlyChangeSite(false) onlyChangeSite(false)
// 可以切换路径 // 可以切换路径
setEnableLineStatus(true) setEnableLineStatus(true)
setSiteAdapterEnable(false)
queryLineList() queryLineList()
} }
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {//
@@ -356,6 +357,7 @@ class LineSiteView @JvmOverloads constructor(
onlyChangeSite(false) onlyChangeSite(false)
// 可以切换路径 // 可以切换路径
setEnableLineStatus(true) setEnableLineStatus(true)
setSiteAdapterEnable(false)
queryLineList() queryLineList()
} }
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
@@ -366,6 +368,7 @@ class LineSiteView @JvmOverloads constructor(
onlyChangeSite(false) onlyChangeSite(false)
// 可以切换路径 // 可以切换路径
setEnableLineStatus(true) setEnableLineStatus(true)
setSiteAdapterEnable(false)
queryLineList() queryLineList()
} }
OCHPlanningStopSideStatusManager.StopSite.STOPSITED -> { OCHPlanningStopSideStatusManager.StopSite.STOPSITED -> {
@@ -373,6 +376,7 @@ class LineSiteView @JvmOverloads constructor(
onlyChangeSite(false) onlyChangeSite(false)
// 可以切换路径 // 可以切换路径
setEnableLineStatus(true) setEnableLineStatus(true)
setSiteAdapterEnable(false)
queryLineList() queryLineList()
} }
OCHPlanningStopSideStatusManager.StopSite.LANKE_KEEP ->{ OCHPlanningStopSideStatusManager.StopSite.LANKE_KEEP ->{

4
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt
View File

@@ -433,8 +433,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
if (!isVertical && isLockLand && mOrientationUtils != null && mOrientationUtils.isLand != 1) { if (!isVertical && isLockLand && mOrientationUtils != null && mOrientationUtils.isLand != 1) {
mOrientationUtils.resolveByClick() mOrientationUtils.resolveByClick()
} }
gsyVideoPlayer.visibility = VISIBLE gsyVideoPlayer?.visibility = VISIBLE
frameLayout.visibility = VISIBLE frameLayout?.visibility = VISIBLE
}, 300) }, 300)
} else { } else {
if (!isVertical && isLockLand && mOrientationUtils != null) { if (!isVertical && isLockLand && mOrientationUtils != null) {