From 0e77300bec59d4c5b1dc7a52e52a9bd15f4e49e7 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 12 Apr 2022 21:36:32 +0800 Subject: [PATCH] =?UTF-8?q?[driver=20passenger=20]=20bus=20=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E5=B0=BA=E5=AF=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/model/BusPassengerModel.java | 2 +- .../ui/BusPassengerBaseFragment.java | 7 +++--- .../ui/BusPassengerMapDirectionView.java | 4 +++- .../drawable/bg_bus_p_end_station_circle.xml | 5 +--- .../bg_bus_p_start_station_circle.xml | 5 +--- .../main/res/layout/bus_p_base_fragment.xml | 3 ++- .../main/res/layout/bus_p_route_fragment.xml | 3 ++- .../src/main/res/values-sw320dp/dimens.xml | 24 +++++++++---------- .../src/main/res/values/dimens.xml | 24 +++++++++---------- 9 files changed, 38 insertions(+), 39 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 28f5229a24..27c7bfba6b 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -147,10 +147,10 @@ public class BusPassengerModel { for (int i = 0; i< stations.size(); i++){ BusPassengerStation station = stations.get(i); if (station.getDrivingStatus() == STATION_STATUS_STOPPED && station.isLeaving() && i+1 < stations.size()){ - startOrStopCalculateRouteInfo(false); mRouteLineInfoCallback.updateStationsInfo(stations,i+1,false); return; }else if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){ + startOrStopCalculateRouteInfo(false); mRouteLineInfoCallback.updateStationsInfo(stations,i,true); return; } diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java index 18ff81a400..870974f144 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java @@ -1,6 +1,7 @@ package com.mogo.och.bus.passenger.ui; import android.os.Bundle; +import android.text.Html; import android.view.LayoutInflater; import android.widget.FrameLayout; import android.widget.ImageView; @@ -113,9 +114,9 @@ public abstract class BusPassengerBaseFragment距离 " + "" + dis + "" + " "+disUnit+"" - + ""+" "+"剩余 " + "" + (int)Math.ceil((double)timeInSecond/ 60f) + "" + " 分钟"; - mCurrentArriveTip.setText(strHtml2); + String strHtml2 = "距离 " + "" + dis + "" + " "+disUnit+"" + + ""+" "+"剩余 " + "" + (int)Math.ceil((double)timeInSecond/ 60f) + "" + " 分钟"; + mCurrentArriveTip.setText(Html.fromHtml(strHtml2)); } public void onAutopilotStatusChanged(int status) { diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java index 3b8c16bbba..7ca457caee 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerMapDirectionView.java @@ -191,9 +191,10 @@ public class BusPassengerMapDirectionView if (mCoordinatesLatLng.size() > 1) { //圈定地图显示范围 LatLng endLatLng = mCoordinatesLatLng.get(mCoordinatesLatLng.size() - 1); + LatLng startLatLng = mCoordinatesLatLng.get(0); //存放经纬度 LatLngBounds.Builder boundsBuilder = new LatLngBounds.Builder(); - boundsBuilder.include(currentLatLng); + boundsBuilder.include(startLatLng); boundsBuilder.include(endLatLng); for (int i=0;i < mWayPointsLatLng.size();i++){ boundsBuilder.include(mWayPointsLatLng.get(i)); @@ -233,6 +234,7 @@ public class BusPassengerMapDirectionView polylineOptions.colorValues(colorList); polylineOptions.useGradient(true); polylineOptions.width(10); //线段宽度 + polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapRound); // 绘制线 mPolyline = mAMap.addPolyline(polylineOptions); diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_end_station_circle.xml b/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_end_station_circle.xml index e968da4c0b..528233f84c 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_end_station_circle.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_end_station_circle.xml @@ -1,9 +1,6 @@ - + - diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_start_station_circle.xml b/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_start_station_circle.xml index 8fce423e8d..97458b6d07 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_start_station_circle.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/drawable/bg_bus_p_start_station_circle.xml @@ -1,9 +1,6 @@ - + - diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml index f524e06002..d60bc0ae92 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_27" - android:layout_marginTop="@dimen/dp_40" + android:layout_marginTop="@dimen/dp_50" android:elevation="@dimen/dp_10" android:text="@string/bus_p_cur_station_title" android:textStyle="bold" @@ -71,6 +71,7 @@ android:layout_marginTop="@dimen/dp_20" android:text="@string/bus_p_cur_station_arrived_tip" android:elevation="@dimen/dp_10" + android:textStyle="bold" android:textColor="@color/bus_p_panel_cur_station_tips_color" android:textSize="@dimen/bus_p_curent_station_tip_size1" app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_name" diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml index bb36d777a9..3f4fd3015c 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml @@ -7,7 +7,7 @@ - 560px + 700px 40px 40px 40px @@ -24,31 +24,31 @@ 50px 44px 130px - 32px + 38px 36px 110px - 34px + 42px 4px 10px 20px - 50px - 25px + 60px + 30px 20px 50px 6px - 36px - 28px + 50px + 36px 75px 50px 6px - 580px - 288px + 638px + 316px 50px - 40px - 50px - 36px + 44px + 55px + 40px \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml index be748ba23f..b43711e918 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/values/dimens.xml @@ -1,6 +1,6 @@ - 560px + 700px 40px 40px 40px @@ -25,31 +25,31 @@ 50px 44px 130px - 32px + 38px 36px 110px - 34px + 42px 4px 10px 20px - 50px - 25px + 60px + 30px 20px 50px 6px - 36px - 28px + 50px + 36px 75px 50px 6px - 580px - 288px + 638px + 316px 50px - 40px - 50px - 36px + 44px + 55px + 40px \ No newline at end of file