From e5ebe64e0b46202d9245be520a6ec4a9e6d9edc5 Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Mon, 11 Sep 2023 16:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E7=BB=91=E5=AE=9A=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../omqs/ui/activity/map/MainViewModel.kt     | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
index 69af8dad..aa57839a 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -317,34 +317,34 @@ class MainViewModel @Inject constructor(
         MapParamUtils.setTaskId(sharedPreferences.getInt(Constant.SELECT_TASK_ID, -1))
         socketServer = SocketServer(mapController, traceDataBase, sharedPreferences)
 
-        viewModelScope.launch(Dispatchers.Default) {
-            naviTestFlow().collect {
-                naviMutex.lock()
-                if (naviEngine.geometry != null) {
-                    //定义垂线
-                    val pointPairDistance = PointPairDistance()
-                    val coordinate = Coordinate(it.longitude, it.latitude)
-                    DistanceToPoint.computeDistance(
-                        naviEngine.geometry,
-                        coordinate,
-                        pointPairDistance
-                    )
-                    if (pointPairDistance.getCoordinate(0) !== null) {
-                        val line = GeometryTools.createLineString(
-                            mutableListOf(
-                                it,
-                                GeoPoint(
-                                    pointPairDistance.getCoordinate(0).y,
-                                    pointPairDistance.getCoordinate(0).x
-                                )
-                            )
-                        )
-                        mapController.lineHandler.showLine(line.toText())
-                    }
-                }
-                naviMutex.unlock()
-            }
-        }
+//        viewModelScope.launch(Dispatchers.Default) {
+//            naviTestFlow().collect {
+//                naviMutex.lock()
+//                if (naviEngine.geometry != null) {
+//                    //定义垂线
+//                    val pointPairDistance = PointPairDistance()
+//                    val coordinate = Coordinate(it.longitude, it.latitude)
+//                    DistanceToPoint.computeDistance(
+//                        naviEngine.geometry,
+//                        coordinate,
+//                        pointPairDistance
+//                    )
+//                    if (pointPairDistance.getCoordinate(0) !== null) {
+//                        val line = GeometryTools.createLineString(
+//                            mutableListOf(
+//                                it,
+//                                GeoPoint(
+//                                    pointPairDistance.getCoordinate(0).y,
+//                                    pointPairDistance.getCoordinate(0).x
+//                                )
+//                            )
+//                        )
+//                        mapController.lineHandler.showLine(line.toText())
+//                    }
+//                }
+//                naviMutex.unlock()
+//            }
+//        }
     }
 
 
@@ -499,8 +499,7 @@ class MainViewModel @Inject constructor(
                         }
                     }
                 }
-                naviEngine.routeList = pathList
-                mapController.lineHandler.showLine(naviEngine.geometry!!.toText())
+                naviEngine.routeList = newRouteList
                 naviMutex.unlock()
             }
         } else {