From 0287a82d24c22f792594024cc4fea1a1822f9ee9 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 14 Jul 2022 10:43:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E9=83=A8=E5=88=86=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=E6=97=B6=E7=A6=81=E7=94=A8=E6=98=9F=E6=98=9F=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=20=E6=B7=BB=E5=8A=A0=E5=85=A8=E7=A8=8B=E6=A6=82?=
 =?UTF-8?q?=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/comment/TaxiPassengerArrivedView.kt     | 11 ++++++-----
 .../ui/leftmenu/OverlayLeftViewUtils.kt        | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt
index 94f061f359..b3335b40ee 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt
@@ -217,6 +217,9 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
 
     private fun commitAndStartAnimation(fraction: Int,title:String) {
         resetStar()
+        allStartOrdered.forEach {
+            it.isEnabled = false
+        }
         currentFraction = fraction
         tvFeel.text = title
         if(allStarWithWorld!=null&&allStarWithWorld!!.data!=null&&allStarWithWorld!!.data!!.size>0){
@@ -232,10 +235,6 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
             // 总量请求失败 单独去取
             requestStarWordByStar(fraction)
         }
-
-//        allStartOrdered.forEach {
-//            it.isEnabled = false
-//        }
     }
     private var currentAnimarion = 0
     private var maxIndex = 0
@@ -315,7 +314,9 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
             }
 
             override fun onAnimationEnd(animation: Animation?) {
-
+                allStartOrdered.forEach {
+                    it.isEnabled = true
+                }
             }
 
             override fun onAnimationRepeat(animation: Animation?) {
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
index d91f82fe01..899ac3bb38 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
@@ -4,9 +4,7 @@ import android.animation.Animator
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.content.Context
 import android.content.Context.WINDOW_SERVICE
-import android.content.Intent
 import android.graphics.PixelFormat
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -16,6 +14,7 @@ import android.view.animation.LinearInterpolator
 import android.widget.ListView
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.ui.leftmenu.model.LeftMenuModel
 import com.mogo.och.taxi.passenger.ui.video.VideoActivity
@@ -43,8 +42,9 @@ object OverlayLeftViewUtils {
     const val DEVIATION_WIDTH = -669
 
     const val LIVE = 0
-    const val CONSULT = 1
-    const val MOVIE = 2
+    const val OVERVIEW = 1
+    const val CONSULT = 2
+    const val MOVIE = 3
 
 
     private var overlayView: View?=null
@@ -101,6 +101,15 @@ object OverlayLeftViewUtils {
                 }
             }
 
+            val overViewSelected = object :ListAdapter.OnTabSelectListener{
+                override fun onSelect() {
+                    close(view, windowManager)
+                    ToastUtils.showShort("全程概览")
+                    VideoActivity.startActivity(context,VideoActivity.VIDEOTYPE_CLOSE)
+                    // TODO: 添加全程概览的代码
+                }
+            }
+
             val consultSelect = object :ListAdapter.OnTabSelectListener{
                 override fun onSelect() {
                     close(view, windowManager)
@@ -116,6 +125,7 @@ object OverlayLeftViewUtils {
             }
 
             integers.add(LeftMenuModel(R.drawable.taxi_p_mogo_live_select,R.drawable.taxi_p_mogo_live_selected,false,liveSelected))
+            integers.add(LeftMenuModel(R.drawable.taxi_p_mogo_overview_select,R.drawable.taxi_p_mogo_overview_selected,false,overViewSelected))
             integers.add(LeftMenuModel(R.drawable.taxi_p_mogo_consult_select,R.drawable.taxi_p_mogo_consult_selected,false,consultSelect))
             integers.add(LeftMenuModel(R.drawable.taxi_p_mogo_entertainment_select,R.drawable.taxi_p_mogo_entertainment_selected,false,entertainmentSelect))
             integers.forEachIndexed { index, leftMenuModel ->