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 f92da8f1ee..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,9 +11,11 @@ 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
+import com.mogo.eagle.core.utilcode.util.OverlayViewUtils
import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer
import com.mogo.och.common.module.wigets.OCHBorderShadowLayout
import com.mogo.och.taxi.passenger.R
@@ -53,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 = ""
@@ -85,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)
@@ -103,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)
@@ -281,7 +290,13 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
.observeOn(AndroidSchedulers.mainThread())
.subscribe {
// 正在展示感谢页面
- taxiPassengerCommonCallback?.onCommonCallback()
+ if (taxiPassengerCommonCallback == null) {
+ // 没有用户确定页面
+ OverlayViewUtils.dismissOverlayView(this@TaxiPassengerArrivedView)
+ } else {
+ // 有排队展示的用户确定页面
+ taxiPassengerCommonCallback?.onCommonCallback()
+ }
}
}
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 3d30bc477a..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,11 +323,9 @@ public class TaxiPassengerBaseFragment extends MvpFragment
+
+