From 5084e6c030308ec4a3cafb94382d1548a32a688e Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 29 May 2023 19:46:52 +0800
Subject: [PATCH] =?UTF-8?q?[bugfix]=20[resetId=E3=80=81add=20log]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bus/passenger/model/CharterPassengerModel.kt  |  1 +
 .../ui/view/bottom/BottomOrderInfoView.kt         | 15 +++++++++------
 .../ui/view/bottom/impl/GoViewWithArrive.kt       |  5 +++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
index 6fb25c263d..678e1d6a78 100644
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
@@ -734,6 +734,7 @@ object CharterPassengerModel {
                             it,
                             mogoLocation
                         )
+                    CallerLogger.d(M_BUS_P + TAG, "使用轨迹轨迹:${mRoutePoints?.size}--第一个点${mRoutePoints!![0]}--最后一个点:${mRoutePoints!!.last()}")
                     CallerLogger.d(M_BUS_P + "calculateDistance", "轨迹计算的距离$templastSumLength")
                     if(templastSumLength>100){
                         lastSumLength = templastSumLength
diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomOrderInfoView.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomOrderInfoView.kt
index 6fe3f87f1f..d444f3c354 100644
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomOrderInfoView.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/BottomOrderInfoView.kt
@@ -15,6 +15,8 @@ import com.mogo.och.bus.passenger.model.IOrderStatusChangeListener
 import com.mogo.och.bus.passenger.model.OrderStatusEnum
 import com.mogo.och.common.module.utils.DateTimeUtil
 import kotlinx.android.synthetic.main.m1_bottom_orderinfo.view.*
+import java.util.UUID
+import kotlin.random.Random
 
 open class BottomOrderInfoView @JvmOverloads constructor(
     context: Context,
@@ -33,6 +35,7 @@ open class BottomOrderInfoView @JvmOverloads constructor(
         } catch (e: Exception) {
             e.printStackTrace()
         }
+        tag = UUID.randomUUID().toString()
     }
 
     fun setCheck(isCheck:Boolean){
@@ -51,16 +54,16 @@ open class BottomOrderInfoView @JvmOverloads constructor(
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        CallerLogger.d(SceneConstant.M_BUS_P + TAG,"onAttachedToWindow$this")
-        CharterPassengerModel.setOrderLeftTimeListeners(this.toString(),this)
-        CharterPassengerModel.setStatusChangeListener(this.toString(),this)
+        CallerLogger.d(SceneConstant.M_BUS_P + TAG,"onAttachedToWindow$tag")
+        CharterPassengerModel.setOrderLeftTimeListeners(tag.toString(),this)
+        CharterPassengerModel.setStatusChangeListener(tag.toString(),this)
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        CallerLogger.d(SceneConstant.M_BUS_P + TAG,"onDetachedFromWindow$this")
-        CharterPassengerModel.setOrderLeftTimeListeners(this.toString(),null)
-        CharterPassengerModel.setStatusChangeListener(this.toString(),null)
+        CallerLogger.d(SceneConstant.M_BUS_P + TAG,"onDetachedFromWindow$tag")
+        CharterPassengerModel.setOrderLeftTimeListeners(tag.toString(),null)
+        CharterPassengerModel.setStatusChangeListener(tag.toString(),null)
     }
 
     private fun setViewByOrderStatus(currentOrderStatus: OrderStatusEnum) {
diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt
index 25ba67de74..a7ad0f56cd 100644
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/view/bottom/impl/GoViewWithArrive.kt
@@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
+import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.och.bus.passenger.utils.ToastCharterUtils
 import com.mogo.och.bus.passenger.R
 import com.mogo.och.bus.passenger.callback.ICharterPassengerAutoStatusChangeCallback
@@ -65,6 +66,10 @@ class GoViewWithArrive @JvmOverloads constructor(
             }
         })
         setOnClickListener {
+            if (ClickUtils.isClickTooFrequent(this,3000)) {
+                ToastCharterUtils.showShort("请稍后点击")
+                return@setOnClickListener
+            }
             startGo()
             applyClickListener?.onApplyClick()
         }