From 84c73e81fd746392c3877bbdecf88ed8b7354288 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 21 Feb 2023 21:24:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[M2]M2-p=20UI=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/callback/DrivingInfoCallback.kt | 1 + .../bus/passenger/model/PM2DrivingModel.kt | 5 +- .../presenter/PM2DrivingPresenter.kt | 6 ++ .../passenger/ui/PM2DrivingInfoFragment.kt | 41 ++++++- .../drawable-nodpi/m2_line_location_bg.png | Bin 4215 -> 5286 bytes .../src/m2/res/drawable/bg_dashed_line.xml | 7 ++ .../res/layout/p_m2_driving_info_fragment.xml | 101 ++++++++++++------ .../src/m2/res/values/colors.xml | 1 + .../src/m2/res/values/strings.xml | 5 + 9 files changed, 127 insertions(+), 40 deletions(-) create mode 100644 OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_dashed_line.xml diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt index aaff2963b6..452ffb685a 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/callback/DrivingInfoCallback.kt @@ -14,4 +14,5 @@ interface DrivingInfoCallback { fun changeOperationStatus(loginStatus : Boolean) fun showNoTaskView(isTrue : Boolean) fun updateLineStations(stations: MutableList) + fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean) } \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt index a5bf32a3f2..0daac0e268 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt @@ -179,7 +179,6 @@ class PM2DrivingModel private constructor() { override fun onAutopilotArriveAtStation(arrivalNotification: MessagePad.ArrivalNotification?) { super.onAutopilotArriveAtStation(arrivalNotification) - //todo 自动驾驶到站接口 } override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { @@ -292,7 +291,7 @@ class PM2DrivingModel private constructor() { val station: PM2Station = stations[i] if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && station.isLeaving && i + 1 < stations.size) { -// mRouteLineInfoCallback.updateStationsInfo(stations, i + 1, false) + mDrivingInfoCallback?.updateStationsInfo(stations as MutableList, i + 1, false) if (mNextStationIndex != i + 1) { mTwoStationsRouts.clear() startRemainRouteInfo() @@ -307,7 +306,7 @@ class PM2DrivingModel private constructor() { mPreRouteIndex = 0 isGoingToNextStation = false startOrStopCalculateRouteInfo(false) -// mRouteLineInfoCallback.updateStationsInfo(stations, i, true) + mDrivingInfoCallback?.updateStationsInfo(stations as MutableList, i, true) return } } diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt index 9f05f422cc..12fac454bd 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt @@ -82,6 +82,12 @@ class PM2DrivingPresenter(view: PM2DrivingInfoFragment?) : PM2ADASModel.INSTANCE.updateHDMapStations(stations) } + override fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean) { + UiThreadHandler.post { + mView?.updateStationsInfo(stations,i,isArrived) + } + } + override fun updateAutoStatus(isOpen: Boolean) { UiThreadHandler.post { mView?.updateAutoStatus(isOpen) 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 8f7dd0fdcf..86cf95948f 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 @@ -19,7 +19,10 @@ import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.bean.PM2Station import com.mogo.och.bus.passenger.presenter.PM2DrivingPresenter import com.mogo.och.common.module.utils.DateTimeUtil.* +import com.mogo.och.common.module.utils.NumberFormatUtil import kotlinx.android.synthetic.m2.p_m2_driving_info_fragment.* +import kotlin.math.ceil +import kotlin.math.roundToInt /** * @author: wangmingjun @@ -111,9 +114,7 @@ class PM2DrivingInfoFragment : val date = formatCalendarToString( DateTimeUtils.getCurrentDateTime(), yy_MM_dd) val weekDay = DateTimeUtils.getWeekDayFromCalendar1(DateTimeUtils.getCurrentDateTime()) - current_weekday_tv.text = "$date $weekDay" - - + "$date $weekDay".also { current_weekday_tv.text = it } } fun changeOperationStatus(status:Boolean){ @@ -133,11 +134,18 @@ class PM2DrivingInfoFragment : line_name_tv.visibility = View.GONE line_during_tv.visibility = View.GONE no_line_tv.visibility = View.VISIBLE + updateNoStationView() overMapView.clearSiteMarkers() overMapView.clearCustomPolyline() } } + private fun updateNoStationView(){ + 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) + } + override fun createPresenter(): PM2DrivingPresenter { return PM2DrivingPresenter(this) } @@ -163,12 +171,39 @@ class PM2DrivingInfoFragment : BitmapFactory.decodeResource(resources,R.drawable.m2_map_staton_icon),0.5f,0.9f) } + fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean){ + if (stations.size == 0) return + if (0<= i && i 0) { + if (meters / 1000 < 1) { + disUnit = "米" + remainDis = meters.toFloat().roundToInt().toString() + } else { + disUnit = "公里" + remainDis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) + } + } + val time = ceil(timeInSecond as Double / 60f).toInt() + + "$remainDis$disUnit | $time 分钟".also { remain_mt.text = it } } companion object { diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png b/OCH/mogo-och-bus-passenger/src/m2/res/drawable-nodpi/m2_line_location_bg.png index bac60302165aec4bc6283b57ce7f1cccfa4ab08f..db841623af739ce92861b8abe1bb14594b8395e7 100644 GIT binary patch delta 5263 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 iE%eDeFJqc<@c#kOQ`*G=TihN10000 + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml index aac1080abe..c155bdc074 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml @@ -79,7 +79,8 @@ app:day_light_mode="true"/> - + android:textColor="@color/m2_line_during_tv_color"/> + android:text="@string/m2_p_empty_remain_km_minute" + android:textSize="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_8" + app:layout_constraintBottom_toBottomOf="@+id/img_line_location_bg" + app:layout_constraintLeft_toLeftOf="@+id/speed_tv" + android:textColor="@color/m2_no_line_tv_color"/> - + app:layout_constraintLeft_toLeftOf="@+id/speed_tv"/> + + + + + + @@ -175,9 +207,10 @@ android:id="@+id/current_weekday_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:layout_constraintLeft_toLeftOf="@+id/current_time_tv" - app:layout_constraintTop_toBottomOf="@+id/current_time_tv" - android:textSize="@dimen/dp_18" + android:layout_marginLeft="@dimen/dp_10" + app:layout_constraintLeft_toRightOf="@+id/current_time_tv" + app:layout_constraintBottom_toBottomOf="@+id/current_time_tv" + android:textSize="@dimen/dp_16" android:text="--" android:textColor="@color/m2_line_during_tv_color"/> diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml b/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml index 13bd4aff12..c93cb6c3aa 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml +++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml @@ -19,4 +19,5 @@ #FFFFE198 #FFFF9B00 #59FFFFFF + #979797 \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml index a90bd2ee4e..4fe4a8a12b 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml +++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml @@ -14,5 +14,10 @@ m2_map_style.data m2_map_style_extra.data Auto + 下一站： + 已到站： + 暂无站点 + -公里 | -分钟 + \ No newline at end of file From c8e7fcec5a49bd84385cc8f894cdf4e8cd6d51fe Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 22 Feb 2023 12:08:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[M2]M2-p=20UI=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/m2/res/layout/p_m2_driving_info_fragment.xml | 5 +++-- OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml index c155bdc074..c57531608a 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml @@ -156,7 +156,8 @@ android:background="@drawable/bg_dashed_line" android:layout_marginTop="@dimen/dp_76" app:layout_constraintTop_toTopOf="@+id/img_time_bg" - app:layout_constraintLeft_toLeftOf="@+id/speed_tv"/> + app:layout_constraintStart_toStartOf="@+id/speed_tv" + app:layout_constraintEnd_toEndOf="@+id/img_line_location_bg"/> @@ -210,6 +210,7 @@ android:layout_marginLeft="@dimen/dp_10" app:layout_constraintLeft_toRightOf="@+id/current_time_tv" app:layout_constraintBottom_toBottomOf="@+id/current_time_tv" + android:layout_marginBottom="@dimen/dp_6" android:textSize="@dimen/dp_16" android:text="--" android:textColor="@color/m2_line_during_tv_color"/> diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml index 4fe4a8a12b..e113235a28 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml +++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/strings.xml @@ -17,7 +17,7 @@ 下一站： 已到站： 暂无站点 - -公里 | -分钟 + —公里 | —分钟 \ No newline at end of file From 4c98a7f8224735d097422324757f877795e52e6a Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 22 Feb 2023 13:11:06 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[M2]M2-p=20UI=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/m2/res/layout/p_m2_driving_info_fragment.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml index c57531608a..849ecb1e0f 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml @@ -151,7 +151,7 @@ Date: Wed, 22 Feb 2023 14:12:05 +0800 Subject: [PATCH 4/5] =?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 5/5] =?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