From cc615011b1c9e1c38c276367dd80d5fa9db5fb17 Mon Sep 17 00:00:00 2001 From: pangfan Date: Tue, 14 Mar 2023 17:35:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[opt]1.=E9=94=80=E6=AF=81=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=97=B6clear=E8=B5=B7=E7=BB=88=E7=82=B9list?= =?UTF-8?q?=EF=BC=88=E6=9C=AA=E6=B8=85=E9=99=A4=E6=97=B6=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=BC=95=E8=B5=B7=E5=81=B6=E7=8E=B0=E8=B0=83=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/common/module/map/AmapNaviToDestinationModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java index 048a0baa0d..3bb41f5c9b 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java @@ -85,6 +85,8 @@ public class AmapNaviToDestinationModel implements AMapNaviListener { public void destroyAmaNavi(){ if (mAMapNavi != null){ isPlay = false; + sList.clear(); + eList.clear(); mAMapNavi.stopNavi(); mAMapNavi.destroy(); mAMapNavi = null; From 151c3d13d040604ab3c03635c2c442a98acb1fc6 Mon Sep 17 00:00:00 2001 From: pangfan Date: Tue, 14 Mar 2023 17:46:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[opt]1.=E7=BB=8F=E7=BA=AC=E5=BA=A6=E7=94=A8?= =?UTF-8?q?=E5=8F=8D=E5=AF=BC=E8=87=B4=E5=AF=BC=E8=88=AA=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt index cb30ef7d4b..e90d15aea1 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt @@ -457,7 +457,7 @@ class SweeperFragment : BaseSweeperTabFragment Date: Tue, 14 Mar 2023 18:19:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[sweeper]=20[=E8=BD=A8=E8=BF=B9=E7=82=B9?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=94=B9=E4=B8=BA=E5=88=A4=E6=96=ADpoints?= =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E7=82=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/sweeper/model/SweeperTaskModel.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java index 830675e8b4..0fdd1e9515 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java @@ -104,10 +104,6 @@ public class SweeperTaskModel { //自动驾驶状态 private int mAutopilotState = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE; - private String longitude;//经度 - - private String latitude;//纬度 - public static SweeperTaskModel getInstance() { if (sInstance == null) { synchronized (SweeperTaskModel.class) { @@ -337,10 +333,12 @@ public class SweeperTaskModel { private void addCoordinates(MogoLocation mogoLatLng) { String tempLongitude = NumberFormatUtil.cutOutNumber(mogoLatLng.getLongitude(), 5); String tempLatitude = NumberFormatUtil.cutOutNumber(mogoLatLng.getLatitude(), 5); + + String latitude = NumberFormatUtil.cutOutNumber(points.get(points.size()-1).latitude, 5); + String longitude = NumberFormatUtil.cutOutNumber(points.get(points.size()-1).longitude, 5); + //用于过滤车是否停在原地，经纬度相同的情况 if (!tempLongitude.equals(longitude) && !tempLatitude.equals(latitude)) { - latitude = NumberFormatUtil.cutOutNumber(mogoLatLng.getLatitude(), 5); - longitude = NumberFormatUtil.cutOutNumber(mogoLatLng.getLongitude(), 5); SweeperRoutePlanningUpdateReqBean.Result result = new SweeperRoutePlanningUpdateReqBean.Result(); result.latitude = mogoLatLng.getLatitude(); result.longitude = mogoLatLng.getLongitude();