From 780034718c1d1ebd88a68f66b078186eb7cbe9b9 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 20 Jul 2023 10:31:33 +0800
Subject: [PATCH] =?UTF-8?q?[3.3.2]=20[=E4=BB=8E=E6=B6=88=E6=81=AF=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E5=85=A8=E8=A7=88=E5=9C=B0=E5=9B=BE=20=E5=85=A8?=
 =?UTF-8?q?=E8=A7=88=E5=9C=B0=E5=9B=BE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../callback/IOCHTaxiPassengerOrderStatusCallback.kt          | 2 ++
 .../com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt   | 4 +++-
 .../taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt    | 4 ++++
 .../mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt   | 4 ++++
 .../java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt   | 2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt
index eff80bd5dc..ba2fc56e72 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/IOCHTaxiPassengerOrderStatusCallback.kt
@@ -16,4 +16,6 @@ interface IOCHTaxiPassengerOrderStatusCallback {
 
     // 司机已确认开启自动驾驶环境
     fun onDriverHasCheckedPilotCondition(isBoarded: Boolean){}
+
+    fun onMessageGo2OverMapview(){}
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt
index b53c408fff..e6686f2c0d 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt
@@ -232,7 +232,9 @@ object TaxiPassengerModel {
             if (currentOCHOrder == null) {
                 ToastUtils.showLong("行程已结束")
             } else {
-                // TODO: 页面进入全览
+                for (callback in mOrderStatusCallbackMap.values) {
+                    callback.onMessageGo2OverMapview()
+                }
             }
         }
     }
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
index 7a03818785..11d638c265 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
@@ -150,6 +150,10 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
         }
     }
 
+    override fun onMessageGo2OverMapview() {
+        mView?.showOverMapView()
+    }
+
     companion object {
         private val TAG = BaseTaxiPassengerPresenter::class.java.simpleName
     }
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index 36f22c4c96..2c286a8b14 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -305,6 +305,10 @@ class TaxiPassengerBaseFragment() :
         }
     }
 
+    fun showOverMapView() {
+        bottom.setCheckIndex(BottomBar.SelectView.OVERMAPVIEW)
+    }
+
     companion object {
         @JvmField
         val TAG = "TaxiPassengerBaseFragment"
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt
index 7147fcb7c1..49681bafa2 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/bottom/BottomBar.kt
@@ -46,7 +46,7 @@ class BottomBar @JvmOverloads constructor(
         this.overMapViewApply = overMapViewApply
     }
 
-    private fun setCheckIndex(index: SelectView){
+    fun setCheckIndex(index: SelectView){
         if(checkIndex==index){
             return
         }else{