From 77d9d2b753275c5ef30d39673477f4bda60fd2df Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Thu, 8 Jun 2023 15:17:52 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0][Opt]=E5=85=A8=E8=A7=88=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B91s=E5=86=85=E5=8F=AA=E6=8E=A5=E5=8F=97=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/passenger/ui/OverviewFragment.kt |  2 --
 .../core/function/smp/MarkerDrawerManager.kt  |  2 +-
 .../eagle/core/function/view/OverMapView.kt   | 23 +++++++++++++++----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt
index 7229e39206..bacbed20e7 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.mogo.och.taxi.passenger.ui
 
-import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -13,7 +12,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum
 import com.mogo.och.taxi.passenger.model.TaxiPassengerModel
-import com.mogo.och.taxi.passenger.ui.leftmenu.OverlayLeftViewUtils
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
index 8fcaa79088..9cdb5411da 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
@@ -40,7 +40,7 @@ object MarkerDrawerManager {
 
     fun startLoopCalCarLocation() {
         routeWipeDisposable = CompositeDisposable()
-        getLoopCalCarObservable().delay(500L, TimeUnit.MILLISECONDS, true)
+        getLoopCalCarObservable().delay(800L, TimeUnit.MILLISECONDS, true)
             .subscribeOn(Schedulers.io())
             .repeat()
             .retry()
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
index d69f390d92..3066feb460 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
@@ -124,6 +124,9 @@ class OverMapView @JvmOverloads constructor(
     @Volatile
     private var isFirst = true
 
+    @Volatile
+    private var lastTime = 0L
+
     // 用来绘制轨迹线
     private val singlePool by lazy {
         Executors.newSingleThreadExecutor()
@@ -759,10 +762,16 @@ class OverMapView @JvmOverloads constructor(
         mStartMarker?.isVisible = false
         mEndMarker?.isVisible = false
         if (coordinates.size > 2) {
-            Log.d(TAG, "绘制起终点")
             // 设置开始结束Marker位置
-            val startLatLng = coordinates[0]
-            val endLatLng = coordinates[coordinates.size - 1]
+            val startLatLng = LatLng(coordinates[0].latitude, coordinates[0].longitude)
+            val endLatLng = LatLng(
+                coordinates[coordinates.size - 1].latitude,
+                coordinates[coordinates.size - 1].longitude
+            )
+            Log.d(
+                TAG,
+                "绘制起终点,起点为:(${startLatLng.longitude},${startLatLng.latitude}),终点为:(${endLatLng.longitude},${endLatLng.latitude})"
+            )
             mStartMarker?.position = startLatLng
             mEndMarker?.position = endLatLng
             mStartMarker?.isVisible = true
@@ -943,8 +952,14 @@ class OverMapView @JvmOverloads constructor(
      * 室内某个bag包自动驾驶启动8s后返回
      */
     override fun onAutopilotRotting(globalPathResp: MessagePad.GlobalPathResp?) {
+        // 上一步调用处已经加锁，这里就不加了
+        if (lastTime > 0 && System.currentTimeMillis() - lastTime <= 1000) {
+            return
+        } else {
+            lastTime = System.currentTimeMillis()
+        }
         globalPathResp?.let {
-            ThreadUtils.getSinglePool().execute {
+            ThreadUtils.getIoPool().execute {
                 handlePlanningData(it.wayPointsList)
             }
         }