From 5fa0b99d6ea2a849feadd8adbb4c224894291262 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 13 Jun 2022 13:05:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E7=95=99=E5=9C=A8=E8=AF=84=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=AF=E4=BB=A5=E4=B8=80=E7=9B=B4=E5=81=9C?= =?UTF-8?q?=E7=95=99=E7=9B=B4=E5=88=B0=E4=B8=8B=E4=B8=80=E5=8D=95=E5=88=B0?= =?UTF-8?q?=E8=BE=BE=E4=B8=8A=E8=BD=A6=E7=82=B9=E7=9B=B4=E6=8E=A5=E5=88=B0?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=90=8E=E5=9B=9B=E4=BD=8D=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E9=A1=B5=E9=9D=A2=20=E5=81=9C=E7=95=99=E5=9C=A8?= =?UTF-8?q?=E6=84=9F=E8=B0=A2=E9=A1=B5=E9=9D=A2=E5=88=99=E7=AD=89=E5=BE=85?= =?UTF-8?q?10s=E5=90=8E=E6=B6=88=E5=A4=B1=E3=80=81=E6=9C=89=E6=96=B0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=B9=B6=E5=88=B0=E8=BE=BE=E4=B8=8A=E8=BD=A6?= =?UTF-8?q?=E7=82=B9=E7=AB=8B=E9=A9=AC=E6=98=BE=E7=A4=BA=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=90=8E=E5=9B=9B=E4=BD=8D=E9=AA=8C=E8=AF=81=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/TaxiPassengerArrivedView.kt | 9 +++++++- .../ui/TaxiPassengerBaseFragment.java | 20 +++--------------- .../taxi_p_passenger_arrived_close.png | Bin 0 -> 3417 bytes .../taxi_p_passenger_arrived_close.png | Bin 0 -> 3417 bytes .../res/layout/taxi_p_arrived_end_panel.xml | 10 +++++++++ 5 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_arrived_close.png create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt index e997ec745c..fea4e70c1d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt @@ -11,6 +11,7 @@ import android.view.animation.AnimationUtils import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView +import androidx.appcompat.widget.AppCompatImageView import com.amap.api.navi.view.PoiInputSearchWidget import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant @@ -54,6 +55,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { private lateinit var ivStarFourth: ImageView private lateinit var ivStarFifth: ImageView private lateinit var ivAnimalList: ImageView + private lateinit var acivClose: AppCompatImageView private lateinit var svpFrame: SimpleVideoPlayer private var subscribe: Disposable?=null private var orderNo = "" @@ -63,7 +65,6 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { var iTaxiPassengerScoreCallback: ITaxiPassengerScoreCallback?=null - @Volatile var taxiPassengerCommonCallback: ITaxiPassengerCommonCallback?=null var left2Right: Animation = AnimationUtils.loadAnimation( context, R.anim.left_to_right @@ -87,6 +88,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { ochShadowLayout = findViewById(R.id.och_shadow_layout) ochThankShadowLayout = findViewById(R.id.och_thank_shadow_layout) ivAnimalList = findViewById(R.id.iv_animal_list) + acivClose = findViewById(R.id.aciv_close) svpFrame = findViewById(R.id.svp_frame) svpFrame.setBackgroundResource(R.drawable.tail_ani_0000) svpFrame.setIsTouchWiget(false) @@ -105,6 +107,11 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { false } + acivClose.setOnClickListener { + ochShadowLayout.visibility = View.GONE + OverlayViewUtils.dismissOverlayView(this@TaxiPassengerArrivedView) + } + val url = "android.resource://" + context.packageName + "/" + R.raw.end_video gsyVideoOptionBuilder.setUrl(url) .setCacheWithPlay(false) 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 8ee32550af..4d8e006026 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 @@ -323,23 +323,9 @@ public class TaxiPassengerBaseFragment extends MvpFragment { - showOrHideArrivedEndLayout(false, "", ""); - showOrHidePressengerCheckPager(true, startSiteAddr, - endSiteAddr, passengerNum, carNumber, phone); - mArrivedEndView.get().setTaxiPassengerCommonCallback(null); - }); - } - } else { - // 正在展示打分页面 - showOrHideArrivedEndLayout(false, "", ""); - showOrHidePressengerCheckPager(true, startSiteAddr, - endSiteAddr, passengerNum, carNumber, phone); - } + showOrHideArrivedEndLayout(false, "", ""); + showOrHidePressengerCheckPager(true, startSiteAddr, + endSiteAddr, passengerNum, carNumber, phone); } /** diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_arrived_close.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_arrived_close.png new file mode 100644 index 0000000000000000000000000000000000000000..2d9221c90ee58792e4c5ecba0d9d1436994cb9b9 GIT binary patch literal 3417 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 + +