From c82c3234baef2b79f7ce8c357aabd9fc3f6f2e20 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 28 Mar 2022 15:39:22 +0800 Subject: [PATCH] =?UTF-8?q?[Taxi=20passenger=20V1.1.0]=20=E4=B8=BB?= =?UTF-8?q?=E8=A6=81=E4=BF=AE=E6=94=B9=EF=BC=9A1=E3=80=81bus=E5=BC=80?= =?UTF-8?q?=E5=BE=80=E4=B8=8B=E4=B8=80=E7=AB=99=EF=BC=8Ckill=20app=20?= =?UTF-8?q?=EF=BC=8C=E9=97=AA=E7=8E=B0=E6=BB=91=E5=9D=97=20=202=E3=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B5=B7=E7=BB=88=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/fragment/BaseOchBusTabFragment.java | 5 ----- .../mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java index 176359e5a2..849925cefb 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java @@ -374,11 +374,6 @@ public abstract class BaseOchBusTabFragment { ctvAutopilotStatus.setVisibility(View.VISIBLE); - if (isOperationStatus) { - slidePanelView.setVisibility(View.VISIBLE); - } else { - slidePanelView.setVisibility(View.GONE); - } }); } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java index 256c328679..bfd09fec94 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java @@ -397,6 +397,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem mOrderCancel.setVisibility(View.GONE); showNotice(mActivity.getString(R.string.module_och_taxi_order_complete_1)); showOrHideNavi(false); + setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; case JourneyCompleted: @@ -537,7 +538,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem .icon3DRes(R.raw.start_and_end) .latitude(station.get(1)) .longitude(station.get(0)); - MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .addMarker(uuid, options); + MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).addMarker(uuid, options); }else { CallerLogger.INSTANCE.d(M_TAXI + "RemoveMapMaker=",uuid+"=latitude="+station.get(1)+",longitude="+station.get(0));