Merge branch 'dev_robotaxi-d-app-module_270_220510_2.7.0' into 'dev_robotaxi-d-app-module_280_220608_2.8.0'

Dev robotaxi d app module 270 220510 2.7.0

See merge request zhjt/AndroidApp/MoGoEagleEye!23

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()
+                }
             }
     }
 

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<TaxiPassengerBaseFrag
                                           String passengerNum,
                                           String carNumber,
                                           String phone){
-        // 正在展示打分页面或者正在展示感谢页面
-        showOrHideArrivedEndLayout(false, "","");
+        showOrHideArrivedEndLayout(false, "", "");
         showOrHidePressengerCheckPager(true, startSiteAddr,
                 endSiteAddr, passengerNum, carNumber, phone);
-
     }
 
     /**

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" />
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/aciv_close"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:src="@drawable/taxi_p_passenger_arrived_close"
+        android:layout_marginEnd="@dimen/dp_70"
+        android:layout_marginTop="@dimen/dp_140"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <com.mogo.och.common.module.wigets.OCHBorderShadowLayout
         android:id="@+id/och_shadow_layout"
         android:layout_width="wrap_content"