From 35c02a76da82d7bd4c5f9c5256bd125329ec7ae3 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 16 May 2022 19:21:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=8C=E6=88=90=20?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=AF=84=E4=BB=B7=E9=BB=98=E8=AE=A4=E4=B8=8D?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=AF=84=E4=BB=B7=E9=A1=B5=E9=9D=A2=E3=80=81?= =?UTF-8?q?=E7=AD=89=E4=B8=8B=E4=B8=AA=E4=B9=98=E5=AE=A2=E5=88=B0=E8=BE=BE?= =?UTF-8?q?=E4=B8=8A=E8=BD=A6=E5=9C=B0=E7=82=B9=E5=90=8E=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E9=A1=B5=E9=9D=A2=20=E8=A7=A3=E5=86=B3=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F=20api=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network/TaxiPassengerServiceApi.java | 2 +- .../presenter/BaseTaxiPassengerPresenter.java | 11 ++- .../ui/TaxiPassengerBaseFragment.java | 74 ++++++++++--------- .../res/layout/taxi_p_arrived_end_panel.xml | 5 +- .../layout/taxi_p_passenger_check_panel.xml | 11 ++- .../core/utilcode/util/OverlayViewUtils.java | 3 + 6 files changed, 61 insertions(+), 45 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.java index 1f7cf749b2..1857f7b1de 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.java @@ -73,7 +73,7 @@ interface TaxiPassengerServiceApi { * @return */ @Headers( {"Content-type:application/json;charset=UTF-8"} ) - @POST( "/autopilot-car-hailing/passenger/v2/vehicle/taxi/verification/phone" ) + @POST( "/autopilot-car-hailing/order/v2/vehicle/taxi/passenger/verification/phone" ) Observable checkPhoneAndUpdateOrderStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Body TaxiPassengerCheckPhoneUpdateOrderReqBean data); /** diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java index 69b5e4122a..12871cd6b8 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java @@ -151,12 +151,12 @@ public class BaseTaxiPassengerPresenter extends Presenter mView.showOrHidePressengerCheckPager(true, order.startSiteAddr, - order.endSiteAddr, order.passengerNum, order.carNumber, order.passengerPhone)); + runOnUIThread(() -> { + mView.showOrHideArrivedEndLayout(false, ""); + mView.showOrHidePressengerCheckPager(true, order.startSiteAddr, + order.endSiteAddr, order.passengerNum, order.carNumber, order.passengerPhone); + }); return; - }else { - runOnUIThread(() -> mView.showOrHidePressengerCheckPager(false, "", - "", "", "", "")); } if (TaxiPassengerOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus || TaxiPassengerOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus){ @@ -175,7 +175,6 @@ public class BaseTaxiPassengerPresenter extends Presenter { mView.showOrHideServingOrderFragment(false); - mView.showOrHideArrivedEndLayout(false, ""); }); TaxiPassengerGeocodeSearchModel.getInstance(getContext()).destroyGeocodeSearch(); mCurrentPassengerOrder = null; diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java index 4f23611286..1f07fa6df6 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java @@ -27,9 +27,10 @@ import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.DataTypes; import com.mogo.och.taxi.passenger.R; -import com.mogo.och.taxi.passenger.callback.ITaxiPassengerCheckPhoneCallback; import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter; +import java.lang.ref.WeakReference; + /** * 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况 @@ -50,11 +51,10 @@ public class TaxiPassengerBaseFragment extends MvpFragment mArrivedEndView; + private WeakReference ochShadowLayout; + private WeakReference mArrivedCheckView; + private WeakReference mArrivedEndStation; protected TaxiPassengerServingOrderFragment ochServingOrderFragment = null; @@ -85,12 +85,9 @@ public class TaxiPassengerBaseFragment extends MvpFragment getPresenter().checkAndUpdateStatus(phoneTail)); - tvPleaseScore.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //getPresenter().arrivedAndScore(2); - showOrHideArrivedEndLayout(false,"北京"); - } - }); - findViewById(R.id.iv_temp).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showOrHideArrivedEndLayout(true,"北京"); - } - }); + } + private void initArrivedView(){ + View mArrivedEndViewInner = LayoutInflater.from(getContext()).inflate(R.layout.taxi_p_arrived_end_panel,null); + mArrivedEndView = new WeakReference<>(mArrivedEndViewInner); + mArrivedEndStation = new WeakReference<>(mArrivedEndViewInner.findViewById(R.id.arrived_end_station)) ; + ochShadowLayout = new WeakReference<>(mArrivedEndViewInner.findViewById(R.id.och_shadow_layout)) ; + mArrivedEndViewInner.findViewById(R.id.tv_please_score).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + getPresenter().arrivedAndScore(2); + } + }); + } + + private void initCheckView() { + TaxiPassengerCheckView mArrivedCheckViewInner = new TaxiPassengerCheckView(getContext()); + mArrivedCheckView = new WeakReference<>(mArrivedCheckViewInner); + mArrivedCheckView.get().setOnCheckPhoneAndUpdateStatusListener(phoneTail -> getPresenter().checkAndUpdateStatus(phoneTail)); } /** @@ -273,13 +273,15 @@ public class TaxiPassengerBaseFragment extends MvpFragment @@ -115,17 +118,21 @@