From 41da540e9220c47db6db767e95a9a91495bf6783 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 13 Mar 2023 19:13:49 +0800 Subject: [PATCH] =?UTF-8?q?[sweeper]=20[=E6=B7=BB=E5=8A=A0=E6=9C=AA?= =?UTF-8?q?=E8=B4=B4=E8=BE=B9=E7=BA=BF=E8=B7=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/sweeper/constant/SweeperConst.kt | 3 +++ .../com/mogo/och/sweeper/presenter/SweeperPresenter.java | 8 +++++++- .../java/com/mogo/och/sweeper/view/WeltMapOverView.kt | 7 +++---- .../java/com/mogo/och/sweeper/view/WeltSmallMapView.kt | 7 +++---- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt index 03d67d5044..83e0552166 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/constant/SweeperConst.kt @@ -77,5 +77,8 @@ class SweeperConst { //围栏到站 暂定10米 const val ARRIVE_AT_END_STATION_DISTANCE = 10 + + //非贴边 + const val NONWELT = -10000.0 } } \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java index b94e98bd2c..62f18ec6e3 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java @@ -32,6 +32,7 @@ import com.mogo.och.sweeper.callback.ISweeperControllerStatusCallback; import com.mogo.och.sweeper.callback.ISweeperTaskCallback; import com.mogo.och.sweeper.callback.ISweeperTaskRouteCallback; import com.mogo.och.sweeper.constant.SubTaskTypeEnum; +import com.mogo.och.sweeper.constant.SweeperConst; import com.mogo.och.sweeper.constant.TaskStatusEnum; import com.mogo.och.sweeper.database.MyDataBase; import com.mogo.och.sweeper.database.bean.WeltDataBean; @@ -344,7 +345,12 @@ public class SweeperPresenter extends Presenter roboSweeperTaskIndex.getLocLat()); weltDataBean.setLocLon(latLng.longitude); weltDataBean.setLocLat(latLng.latitude); - weltDataBean.setWeltDistance(roboSweeperTaskIndex.getDistToRefEdgePoint()); + int edgeCleanState = roboSweeperTaskIndex.getEdgeCleanState(); + if(edgeCleanState==0){ + weltDataBean.setWeltDistance(SweeperConst.NONWELT); + }else { + weltDataBean.setWeltDistance(roboSweeperTaskIndex.getDistToRefEdgePoint()); + } weltDataBean.setCleanMode(roboSweeperTaskIndex.getCleanMode()); weltDataBean.setCleanDirection(roboSweeperTaskIndex.getCleanDirection()); weltDataBean.setCleanIntensity(roboSweeperTaskIndex.getCleanIntensity()); diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt index 6552a1ff1a..6e90424f11 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt @@ -21,6 +21,7 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.sweeper.R import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean +import com.mogo.och.sweeper.constant.SweeperConst import com.mogo.och.sweeper.database.bean.WeltDataBean import com.mogo.och.sweeper.util.SweeperMapAssetStyleUtil import kotlinx.android.synthetic.main.sweeper_welt_map_overview.view.* @@ -125,9 +126,7 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { continue } } - if (weltDataBean.weltDistance == -9999.0) {//未经过 - colorList.add(ContextCompat.getColor(context,R.color.sweeper_3ba1cc)) - } else if (weltDataBean.weltDistance == -10000.0) {//非贴边 + if (weltDataBean.weltDistance == SweeperConst.NONWELT) {//非贴边 colorList.add(ContextCompat.getColor(context,R.color.sweeper_236299)) } else if (weltDataBean.weltDistance < 0) { colorList.add(ContextCompat.getColor(context,R.color.sweeper_c22101)) @@ -276,7 +275,7 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { polylineOptions.width(14f) //线段宽度 polylineOptions.isUseTexture = false polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapSquare) - polylineOptions.color(Color.parseColor("#3BA1CC")) + polylineOptions.color(ContextCompat.getColor(context,R.color.sweeper_3ba1cc)) polylineOptions.addAll(routeList) polylineOptions.visible(true) mRoutePolylines=mAMap?.addPolyline(polylineOptions) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt index b69e669558..0e0d2b7cc2 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt @@ -21,6 +21,7 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.sweeper.R import com.mogo.och.sweeper.bean.SweeperRoutePlanningUpdateReqBean +import com.mogo.och.sweeper.constant.SweeperConst import com.mogo.och.sweeper.database.bean.WeltDataBean import com.mogo.och.sweeper.util.SweeperMapAssetStyleUtil import kotlinx.android.synthetic.main.sweeper_welt_small_map_view.view.* @@ -179,9 +180,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { } } - if (weltDataBean.weltDistance == -9999.0) {//未经过 - colorList.add(ContextCompat.getColor(context,R.color.sweeper_3ba1cc)) - } else if (weltDataBean.weltDistance == -10000.0) {//非贴边 + if (weltDataBean.weltDistance == SweeperConst.NONWELT) {//非贴边 colorList.add(ContextCompat.getColor(context,R.color.sweeper_236299)) } else if (weltDataBean.weltDistance < 0) { colorList.add(ContextCompat.getColor(context,R.color.sweeper_c22101)) @@ -303,7 +302,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { polylineOptions.width(14f) //线段宽度 polylineOptions.isUseTexture = false polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapSquare) - polylineOptions.color(Color.parseColor("#3BA1CC")) + polylineOptions.color(ContextCompat.getColor(context,R.color.sweeper_3ba1cc)) polylineOptions.visible(true) mRoutePolylines=mAMap?.addPolyline(polylineOptions) }