From 115de76ec3ebc6a74a7678a12df4867c21945835 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 22 Feb 2023 14:12:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[M2]=E5=8E=BB=E6=8E=89=E9=A2=91=E7=B9=81?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt | 2 +- .../main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt index 2bd2f9d761..ceffd532b9 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt @@ -181,7 +181,7 @@ class AdvanceVideoView @JvmOverloads constructor( } override fun onProgress(url: String?, length: Int) { - Logger.d(ImageAndVideoRotation.TAG, "download-onProgress") +// Logger.d(ImageAndVideoRotation.TAG, "download-onProgress") } override fun onFinished(url: String?, threadBean: ThreadBean?) { diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index 7acfdfc948..fc996468af 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -428,8 +428,6 @@ public abstract class BaseBusTabFragment } private void changeAutopilotBtnView(int autopilotStatus, boolean isAnimateRunning) { - CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChangeChangeAutopilotBtnView: " - + autopilotStatus + "isAnimateRunning = " + isAnimateRunning); if (isAnimateRunning && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != autopilotStatus) { // 主动开启自动驾驶中，不为2（为0、1）则继续loading From a6143c04bc987afcbd78384df06b318ebdb7afeb Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 22 Feb 2023 14:19:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[M2]=E8=AE=BE=E7=BD=AE=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt index 86cf95948f..111a83ad40 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt @@ -141,6 +141,7 @@ class PM2DrivingInfoFragment : } private fun updateNoStationView(){ + station_name_tv.setTextColor(resources.getColor(R.color.m2_no_line_tv_color)) station_name_title_tv.text = resources.getString(R.string.m2_p_station_title_tv) station_name_tv.text = resources.getString(R.string.m2_p_empty_tv) remain_mt.text = resources.getString(R.string.m2_p_empty_remain_km_minute) @@ -174,6 +175,7 @@ class PM2DrivingInfoFragment : fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean){ if (stations.size == 0) return if (0<= i && i