From 45e296164648d8a0bb8628741a4764acdb700055 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Mon, 14 Aug 2023 19:51:01 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0][Opt]=E6=9B=B4=E6=96=B0=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9=E6=93=A6=E9=99=A4=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/smp/MarkerDrawerManager.kt  | 130 ++++++++++++------
 .../eagle/core/function/view/OverMapView.kt   |  66 ++++++++-
 .../main/res/drawable-xhdpi/loc_azure_bg.png  | Bin 0 -> 2651 bytes
 .../utilcode/util/DrivingDirectionUtils.java  |  39 ++++++
 .../core/utilcode/util/LocationUtils.java     |   2 +
 5 files changed, 192 insertions(+), 45 deletions(-)
 create mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/loc_azure_bg.png

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 f69b8bfeb1..c126b702a8 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
@@ -5,7 +5,9 @@ import android.util.Log
 import com.amap.api.maps.CoordinateConverter
 import com.amap.api.maps.model.LatLng
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils
-import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils
+import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils.getAngleDiff
+import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils.getLineAngle
+import com.mogo.eagle.core.utilcode.util.LocationUtils
 import io.reactivex.Observable
 import io.reactivex.ObservableOnSubscribe
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -132,54 +134,94 @@ object MarkerDrawerManager {
         var currentIndex = 0 //记录疑似点
         // 是否超过200KM
         var isLongDistance = false
-        if (routePoints.isNotEmpty()) {
-            //基础点
-            val baseLatLng = routePoints[0]
-            newPoints.add(LatLng(baseLatLng.latitude, baseLatLng.longitude))
-            var baseDiffDis = CoordinateUtils.calculateLineDistance(
-                realLon, realLat, baseLatLng.longitude, baseLatLng.latitude
-            ) // lon,lat, prelon, prelat
-            if (baseDiffDis > 200000) {
-                isLongDistance = true
-            }
-            val size = routePoints.size
-            for (i in 1 until size) {
-                val latLng = routePoints[i]
-                // 深拷贝数据用于高德地图上轨迹线的绘制
-                newPoints.add(LatLng(latLng.latitude, latLng.longitude))
-                if (isLongDistance) continue
-                val diff = CoordinateUtils.calculateLineDistance(
-                    realLon, realLat, latLng.longitude, latLng.latitude
-                )
-                if (baseDiffDis > diff) {
-                    baseDiffDis = diff
-                    // 距离最近的时候判断是否走过
-                    if (DrivingDirectionUtils.getDegreeOfCar2Poi2(
-                            realLon,
-                            realLat,
+        var distance = 0.0
+        var tmpDistance: Double
+        var angle = 0.0
+        routePoints.forEachIndexed { index, latLng ->
+            newPoints.add(LatLng(latLng.latitude, latLng.longitude))
+            when (index) {
+                0 -> {
+                    distance = LocationUtils.pointToLine(
+                        latLng.longitude,
+                        latLng.latitude,
+                        routePoints[index + 1].longitude,
+                        routePoints[index + 1].latitude,
+                        realLon,
+                        realLat
+                    )
+                    if (distance > 200000) {
+                        isLongDistance = true
+                    }
+                }
+
+                routePoints.size - 1 -> {}
+                else -> {
+                    // 车到两轨迹点距离最短(距离这条路最近)
+                    tmpDistance = LocationUtils.pointToLine(
+                        latLng.longitude,
+                        latLng.latitude,
+                        routePoints[index + 1].longitude,
+                        routePoints[index + 1].latitude,
+                        realLon,
+                        realLat
+                    )
+                    if (tmpDistance <= distance) {
+                        // 车此刻运动方向与两轨迹点朝向的夹角小于90(结合距离线段最近则车在两点之间，意味着已走过第index个轨迹点)
+                        angle = getLineAngle(
                             latLng.longitude,
                             latLng.latitude,
-                            heading
-                        ) >= 90
-                    ) {
-                        currentIndex = i
+                            routePoints[index + 1].longitude,
+                            routePoints[index + 1].latitude
+                        )
+                        if (getAngleDiff(angle, heading) < 90) {
+                            if (index < currentIndex) {
+                                return@forEachIndexed
+                            } else {
+                                distance = tmpDistance
+                                currentIndex = index
+                            }
+                        }
                     }
                 }
             }
-            Log.d("MarkerDrawerManager", "当次计算已走过的点的索引为：$currentIndex，存储的上次索引为：$lastArrivedIndex, ,起点为:(${newPoints[0].longitude},${newPoints[0].latitude}),终点为:(${newPoints.last().longitude},${newPoints.last().latitude})")
-            if (!isLongDistance) {
-                // 过滤缓存的非当次轨迹的索引，并且出现车已走过索引跳跃过大时视为无效复用上一次计算结果
-                if (currentIndex < lastArrivedIndex || (lastArrivedIndex >= 0 && currentIndex - lastArrivedIndex >= 10)) {
-                    if (lastArrivedIndex < size) {
-                        currentIndex = lastArrivedIndex
-                    }
-                } else {
-                    lastArrivedIndex = currentIndex
-                }
-                if (size >= 2) {
-                    newPoints.add(currentIndex + 1, LatLng(realLat, realLon))
-                    return currentIndex + 1
-                }
+        }
+        Log.d(
+            "MarkerDrawerManager", "起点为:(${newPoints[0].longitude},${newPoints[0].latitude}),终点为:(${newPoints.last().longitude},${newPoints.last().latitude})"
+        )
+        if (!isLongDistance && currentIndex > 0) {
+            val size = routePoints.size
+//            // 对于非法结果，需要纠正
+//            if (currentIndex < lastArrivedIndex || (lastArrivedIndex > 0 && currentIndex - lastArrivedIndex > 5)) {
+//                val lastNextIndex = lastArrivedIndex + 1
+//                var isLastNextArrived = false
+//                if (lastNextIndex in 0 until size) {
+//                    if (DrivingDirectionUtils.getDegreeOfCar2Poi2(
+//                            realLon,
+//                            realLat,
+//                            routePoints[lastNextIndex].longitude,
+//                            routePoints[lastNextIndex].latitude,
+//                            heading
+//                        ) >= 90
+//                    ) {
+//                        isLastNextArrived = true
+//                    }
+//                }
+//
+//                if (isLastNextArrived) {
+//                    currentIndex = lastNextIndex
+//                    lastArrivedIndex = currentIndex
+//                } else {
+//                    if (lastArrivedIndex in 0 until size) {
+//                        currentIndex = lastArrivedIndex
+//                    }
+//                }
+//            } else {
+//                lastArrivedIndex = currentIndex
+//            }
+            if (size >= 2) {
+                Log.d("MarkerDrawerManager", "最终绘制的已走过index为:$currentIndex,车所在位置为:${currentIndex + 1}")
+                newPoints.add(currentIndex + 1, LatLng(realLat, realLon))
+                return currentIndex + 1
             }
         }
         return 0
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 fbd634cfa3..ed4793e385 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
@@ -88,6 +88,7 @@ class OverMapView @JvmOverloads constructor(
     private var mContext: Context? = null
     private var mTilt = 0f
     private var overLayerView: TextView? = null
+
     @Volatile
     private var isMapLoaded = false
 
@@ -112,10 +113,18 @@ class OverMapView @JvmOverloads constructor(
     var arrivedBitmap: BitmapDescriptor? = null
     var unArrivedBitmap: BitmapDescriptor? = null
     var transparentBitmap: BitmapDescriptor? = null
+    private val pointBitmap by lazy {
+        BitmapDescriptorFactory.fromResource(R.drawable.loc_azure_bg)
+    }
+    private val markerOptionsList by lazy {
+        ArrayList<MarkerOptions>()
+    }
+    private var isDebug = true
 
     // 绘制轨迹线的集合
     private val textureList: MutableList<BitmapDescriptor?> = ArrayList()
     private val texIndexList: MutableList<Int> = ArrayList()
+
     @Volatile
     private var mLocation: MogoLocation? = null
     private var isFirstLocation = true
@@ -123,6 +132,7 @@ class OverMapView @JvmOverloads constructor(
     var currMarkerList: ArrayList<Marker>? = null
     var siteMarkerList: ArrayList<Marker>? = null
     var siteNameList: ArrayList<Marker>? = null
+    private var pointMarkers: ArrayList<Marker>? = null
 
     @Volatile
     private var isFirst = true
@@ -148,6 +158,7 @@ class OverMapView @JvmOverloads constructor(
         private const val DRAW_POLY_LINE = 1
         private const val DRAW_CAR_LOCATION = 2
         private const val CLEAR_POLY_LINE = 3
+        private const val CLEAR_POINT_MARKERS = 4
 
         private const val DRAW_V2X_MARKERS = 1
         private const val DISPLAY_OVER_VIEW = 2
@@ -235,6 +246,16 @@ class OverMapView @JvmOverloads constructor(
         overLayerView?.visibility = View.GONE
     }
 
+    fun setDebugMode(isDebug: Boolean) {
+        this.isDebug = isDebug
+        if (!isDebug) {
+            Message.obtain().apply {
+                what = CLEAR_POINT_MARKERS
+                frequentHandler?.sendMessage(this)
+            }
+        }
+    }
+
     /**
      * siteLatLngs: 高德坐标集合
      * bitmap: Marker对应的图片
@@ -362,6 +383,10 @@ class OverMapView @JvmOverloads constructor(
             what = CLEAR_POLY_LINE
             frequentHandler?.sendMessage(this)
         }
+        Message.obtain().apply {
+            what = CLEAR_POINT_MARKERS
+            frequentHandler?.sendMessage(this)
+        }
         mStartMarker?.isVisible = false
         mEndMarker?.isVisible = false
 
@@ -778,6 +803,7 @@ class OverMapView @JvmOverloads constructor(
      * @param locIndex
      */
     private fun realDrawPolyline(coordinates: List<LatLng>, locIndex: Int) {
+        val drawPointMarkers = isDebug && pointMarkers.isNullOrEmpty()
         val time = System.currentTimeMillis()
         if (textureList.size > 0) {
             textureList.clear()
@@ -785,6 +811,7 @@ class OverMapView @JvmOverloads constructor(
         if (texIndexList.size > 0) {
             texIndexList.clear()
         }
+        if (drawPointMarkers) markerOptionsList.clear()
         if (isClearArrived) {
             textureList.add(transparentBitmap)// index:0
         } else {
@@ -793,7 +820,15 @@ class OverMapView @JvmOverloads constructor(
         }
         // 未走过的纹理
         textureList.add(unArrivedBitmap)// index:1
+
         for (i in coordinates.indices) {
+            if (drawPointMarkers) {
+                markerOptionsList.add(MarkerOptions().also {
+                    it.icon(pointBitmap)
+                    it.anchor(0.5f, 0.5f)
+                    it.position(coordinates[i])
+                })
+            }
             // 线段数比点数少一个
             if (i == 0) continue
             if (i <= locIndex) {
@@ -802,6 +837,9 @@ class OverMapView @JvmOverloads constructor(
                 texIndexList.add(1)
             }
         }
+        if (drawPointMarkers) {
+            pointMarkers = mAMap?.addMarkers(markerOptionsList, false)
+        }
         if (mCoveredPolyline != null) {
             mCoveredPolyline!!.options.customTextureList = textureList
             mCoveredPolyline!!.options.customTextureIndex = texIndexList
@@ -863,7 +901,8 @@ class OverMapView @JvmOverloads constructor(
                 //设置希望展示的地图缩放级别
                 Log.d(TAG, "切换视角展示车，定位为：${mLocation!!.longitude},${mLocation!!.latitude}")
                 val cameraPosition = CameraPosition.Builder()
-                    .target(LatLng(mLocation!!.latitude, mLocation!!.longitude)).tilt(mTilt).zoom(zoomLevel.toFloat()).build()
+                    .target(LatLng(mLocation!!.latitude, mLocation!!.longitude)).tilt(mTilt)
+                    .zoom(zoomLevel.toFloat()).build()
                 mAMap!!.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition))
             }
         }
@@ -1006,6 +1045,13 @@ class OverMapView @JvmOverloads constructor(
         mCoveredPolyline?.points = emptyList()
     }
 
+    private fun realClearPointMarkers() {
+        pointMarkers?.forEach {
+            it.destroy()
+        }
+        pointMarkers = null
+    }
+
     private fun realClearSitePolyline() {
         mSitePolyline?.points = emptyList()
     }
@@ -1165,16 +1211,23 @@ class OverMapView @JvmOverloads constructor(
                         realDrawPolyline(first, second)
                     }
                 }
+
                 DRAW_CAR_LOCATION -> {
                     removeMessages(DRAW_CAR_LOCATION)
                     (msg.obj as MogoLocation).apply {
                         realDrawCarMarker(this)
                     }
                 }
+
                 CLEAR_POLY_LINE -> {
                     removeMessages(CLEAR_POLY_LINE)
                     realClearPolyline()
                 }
+
+                CLEAR_POINT_MARKERS -> {
+                    removeMessages(CLEAR_POINT_MARKERS)
+                    realClearPointMarkers()
+                }
             }
         }
     }
@@ -1192,57 +1245,68 @@ class OverMapView @JvmOverloads constructor(
                         realDrawSitePolyline(first, second)
                     }
                 }
+
                 DRAW_V2X_MARKERS -> {
                     removeMessages(DRAW_V2X_MARKERS)
                     (msg.obj as ArrayList<MarkerOptions>).apply {
                         realDrawV2XMarkers(this)
                     }
                 }
+
                 DISPLAY_OVER_VIEW -> {
                     removeMessages(DISPLAY_OVER_VIEW)
                     realDisplayOverView()
                 }
+
                 INCLUDE_SITES_OVER_VIEW -> {
                     removeMessages(INCLUDE_SITES_OVER_VIEW)
                     (msg.obj as List<LatLng>).also {
                         realIncludeSitePointsAndRefresh(it)
                     }
                 }
+
                 DRAW_START_AND_END -> {
                     removeMessages(DRAW_START_AND_END)
                     (msg.obj as List<LatLng>).also {
                         realDrawStartAndEndMarker(it)
                     }
                 }
+
                 CLEAR_SITE_POLYLINE -> {
                     removeMessages(CLEAR_SITE_POLYLINE)
                     MarkerDrawerManager.isStopCalculate = false
                     realClearSitePolyline()
                 }
+
                 CLEAR_V2X_MARKERS -> {
                     removeMessages(CLEAR_V2X_MARKERS)
                     realClearV2XMarkers()
                 }
+
                 DRAW_SITE_NAME -> {
                     removeMessages(DRAW_SITE_NAME)
                     (msg.obj as ArrayList<MarkerOptions>).also {
                         realDrawSiteNames(it)
                     }
                 }
+
                 CLEAR_SITE_NAME -> {
                     removeMessages(CLEAR_SITE_NAME)
                     realClearSiteNameViews()
                 }
+
                 DRAW_SITE_MARKER -> {
                     (msg.obj as ArrayList<MarkerOptions>).also {
                         realDrawSiteMarkers(it)
                     }
                     removeMessages(DRAW_SITE_MARKER)
                 }
+
                 CLEAR_SITE_MARKER -> {
                     removeMessages(CLEAR_SITE_MARKER)
                     realClearSiteMarkers()
                 }
+
                 DRAW_INF_STRUCTURE -> {
                     removeMessages(DRAW_INF_STRUCTURE)
                     (msg.obj as ArrayList<MarkerOptions>).also {
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/loc_azure_bg.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/loc_azure_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc778d7d287ee1a6271dfc51e815b07e7e56685d
GIT binary patch
literal 2651
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
JPDHLkV1i3$7@+_F

literal 0
HcmV?d00001

diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DrivingDirectionUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DrivingDirectionUtils.java
index eb79646a84..6d0c419431 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DrivingDirectionUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DrivingDirectionUtils.java
@@ -153,4 +153,43 @@ public class DrivingDirectionUtils {
         return 180 - Math.abs(Math.abs(angle1 - angle2) - 180);
     }
 
+    /**
+     *
+     * @param dx1
+     * @param dy1
+     * @param dx2
+     * @param dy2
+     * @return 两点组成的线段与正北的夹角
+     */
+    public static double getLineAngle(double dx1, double dy1, double dx2, double dy2) {
+        return getAngleToNorth((dx2 - dx1), (dy2 - dy1));
+    }
+
+    public static double getAngleToNorth(double x, double y) {
+        double resAngle = 0;
+
+        if (0 == x && 0 == y) {
+            resAngle = -400;
+        } else if (0 == y) {
+            if (0 < x) {
+                resAngle = 90;
+            } else {
+                resAngle = 270;
+            }
+        } else if (0 == x) {
+            if (0 < y) {
+                resAngle = 0;
+            } else {
+                resAngle = 180;
+            }
+        } else if (0 < y) {
+            resAngle = (Math.atan((x / y)) * 180 / PI);
+            if (0 > resAngle) {
+                resAngle += 360;
+            }
+        } else {
+            resAngle = (180 + Math.atan((x / y)) * 180 / PI);
+        }
+        return resAngle;
+    }
 }
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LocationUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LocationUtils.java
index 72d2d21990..5d709ac3cf 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LocationUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/LocationUtils.java
@@ -68,6 +68,8 @@ public class LocationUtils {
         }
         double p = (a + b + c) / 2;// 半周长
         double s = Math.sqrt(p * (p - a) * (p - b) * (p - c));// 海伦公式求面积
+        // 如果三个点在一条直线上则求出来的面积为NaN
+        if (Double.isNaN(s)) return 0.0;
         space = 2 * s / a;// 返回点到线的距离（利用三角形面积公式求高）
         return space;
     }