From 6224f0f2bd29adbf85bf2b07c3ce021abfa040a3 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 16 Mar 2023 16:57:34 +0800 Subject: [PATCH] =?UTF-8?q?[m1]=20[=E5=BB=B6=E6=97=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=A4=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt | 2 +- .../m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt | 2 +- .../src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt | 2 +- .../java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt | 4 ++++ .../com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt | 4 ++-- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt index dc4229291e..2c1cbedb8a 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt @@ -213,7 +213,7 @@ class BusPassengerPresenter(view: MainFragment?) : ToastUtils.showShort("因车辆正在人工驾驶中无法靠边停车，请安全员主动停止车辆") } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { - // 靠边停车 + // 靠边停车 订单结束 靠边停车 CallerAutoPilotControlManager.sendPlanningCmd(1) } IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> { diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt index 1d66516f06..94b964ac25 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/M1SoftFragment.kt @@ -362,7 +362,7 @@ class M1SoftFragment : if (it.value == temperatureCmd) { rv_aircondition_temperature.tag = touchTag UiThreadHandler.postDelayed({ - rv_aircondition_temperature.smoothScrollToPosition(it.index) + rv_aircondition_temperature?.smoothScrollToPosition(it.index) },500) } } diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt index 587e37eca0..f1e27d7323 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt @@ -80,7 +80,7 @@ class MainFragment : ToastUtils.showShort(AbsMogoApplication.getApp().getString(R.string.m1_please_login_driver)) } } - ll_car_speed.onClick { + ll_car_speed.setOnClickListener { if (DebugConfig.isDebug()) { if (LoginStatusManager.isLogin()) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt index 75f2366d28..f12224dcda 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt @@ -349,6 +349,7 @@ class LineSiteView @JvmOverloads constructor( onlyChangeSite(false) // 可以切换路径 setEnableLineStatus(true) + setSiteAdapterEnable(false) queryLineList() } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {// @@ -356,6 +357,7 @@ class LineSiteView @JvmOverloads constructor( onlyChangeSite(false) // 可以切换路径 setEnableLineStatus(true) + setSiteAdapterEnable(false) queryLineList() } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { @@ -366,6 +368,7 @@ class LineSiteView @JvmOverloads constructor( onlyChangeSite(false) // 可以切换路径 setEnableLineStatus(true) + setSiteAdapterEnable(false) queryLineList() } OCHPlanningStopSideStatusManager.StopSite.STOPSITED -> { @@ -373,6 +376,7 @@ class LineSiteView @JvmOverloads constructor( onlyChangeSite(false) // 可以切换路径 setEnableLineStatus(true) + setSiteAdapterEnable(false) queryLineList() } OCHPlanningStopSideStatusManager.StopSite.LANKE_KEEP ->{ diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt index 4408861b4b..3bbef62e5d 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt @@ -433,8 +433,8 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { if (!isVertical && isLockLand && mOrientationUtils != null && mOrientationUtils.isLand != 1) { mOrientationUtils.resolveByClick() } - gsyVideoPlayer.visibility = VISIBLE - frameLayout.visibility = VISIBLE + gsyVideoPlayer?.visibility = VISIBLE + frameLayout?.visibility = VISIBLE }, 300) } else { if (!isVertical && isLockLand && mOrientationUtils != null) {