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 0000000000..2d9221c90e Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_passenger_arrived_close.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png new file mode 100644 index 0000000000..2d9221c90e Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_arrived_close.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml index f97c97de3d..af88f2d3bc 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml @@ -14,6 +14,16 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + +