From e00fb594aed898caae0da5f5f30f8d7e9d6fc249 Mon Sep 17 00:00:00 2001 From: bxb Date: Wed, 1 Mar 2023 19:56:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E8=B4=B4=E8=BE=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B2=BE=E7=A1=AE=E5=88=B0=E5=8E=98=E7=B1=B3?= =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E5=AD=98=E4=BA=8C=E4=BD=8D=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/sweeper/event/WeltDataEvent.kt | 2 +- .../fragment/BaseSweeperTabFragment.java | 34 +++---------------- .../och/sweeper/fragment/SweeperFragment.kt | 2 +- .../fragment/WeltMapOverViewFragment.kt | 4 +-- .../sweeper/presenter/SweeperPresenter.java | 11 ++++-- .../mogo/och/sweeper/view/WeltMapOverView.kt | 4 +-- .../mogo/och/sweeper/view/WeltSmallMapView.kt | 2 +- 7 files changed, 20 insertions(+), 39 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.kt index 6a85e37631..659f617141 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/event/WeltDataEvent.kt @@ -7,5 +7,5 @@ data class WeltDataEvent( var type:Int, //1.添加起点和终点 2.实时添加贴边数据 3.清除数据 var weltDataBeanList: MutableList?, var markers:MutableList?, - var distance:Double//贴边数据 + var distance:String//贴边数据 ) \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java index 2e926bbdd4..8b88b54259 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java @@ -1,7 +1,6 @@ package com.mogo.och.sweeper.fragment; import android.os.Bundle; -import android.os.Looper; import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; @@ -32,8 +31,8 @@ import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.och.common.module.map.AmapNaviToDestinationModel; import com.mogo.och.sweeper.R; -import com.mogo.och.sweeper.database.bean.WeltDataBean; import com.mogo.och.sweeper.callback.IWeltMapSwitchToSmallCallback; +import com.mogo.och.sweeper.database.bean.WeltDataBean; import com.mogo.och.sweeper.event.WeltDataEvent; import com.mogo.och.sweeper.view.SweeperTrafficDataView; import com.mogo.och.sweeper.view.WeltSmallMapView; @@ -41,14 +40,10 @@ import com.mogo.och.sweeper.view.WeltSmallMapView; import org.greenrobot.eventbus.EventBus; import java.util.ArrayList; -import java.util.List; import androidx.annotation.NonNull; import androidx.constraintlayout.widget.Group; import androidx.fragment.app.FragmentTransaction; -import bag_manager.BagManagerOuterClass; -import mogo.telematics.pad.MessagePad; -import record_cache.RecordPanelOuterClass; /** * 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况 @@ -224,27 +219,6 @@ public abstract class BaseSweeperTabFragment weltDataBeans,Boolean isWeltData,double distance) { + public void setWeltDataToMap(ArrayList weltDataBeans,Boolean isWeltData,String distance) { if (mMapWeltView != null) { UiThreadHandler.post(()->{ mMapWeltView.setWeltData(weltDataBeans,isWeltData,distance); @@ -470,7 +444,7 @@ public abstract class BaseSweeperTabFragment?,isWeltData:Boolean,distance:Double) { + private fun setWeltData(weltDatas: MutableList?,isWeltData:Boolean,distance:String) { weltMapOverView.setWeltData(weltDatas,isWeltData,distance) } 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 ea302d69eb..eb7cca7309 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 @@ -33,6 +33,8 @@ import com.mogo.och.sweeper.util.SweeperTrajectoryManager; import org.jetbrains.annotations.NotNull; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; @@ -327,9 +329,14 @@ public class SweeperPresenter extends Presenter weltDataBean.setCleanIntensity(roboSweeperTaskIndex.getCleanIntensity()); weltDataBean.setSubTaskId(mSubTaskId); MyDataBase.getInstance().getWeltDataDao().insert(weltDataBean); - mView.setWeltDataToMap((ArrayList) MyDataBase.getInstance().getWeltDataDao().loadAllWeltDataInfo(), true,roboSweeperTaskIndex.getDistToRefEdgePoint()); + String distance=format(roboSweeperTaskIndex.getDistToRefEdgePoint()*100); + mView.setWeltDataToMap((ArrayList) MyDataBase.getInstance().getWeltDataDao().loadAllWeltDataInfo(), true,distance); } - + public static String format(double value) { + BigDecimal bd = new BigDecimal(value); + bd = bd.setScale(2, RoundingMode.HALF_UP); + return bd.toString(); + } /** * 获取当前正在执行的任务 */ 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 f83d4d4b5a..0fd06cf22a 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 @@ -173,7 +173,7 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { /** * 设置贴边数据 */ - fun setWeltData(weltData: MutableList?, isWeltData: Boolean, distance: Double) { + fun setWeltData(weltData: MutableList?, isWeltData: Boolean, distance: String) { if (weltData != null) { this.mWeltData.addAll(weltData) for (i in mWeltData.indices) { @@ -200,7 +200,7 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { sweeperLegend6.setData(R.drawable.sweeper_legend6, "未经过") } - private fun setDistance(distance: Double) { + private fun setDistance(distance: String) { taskWeltDistanceTv.text = "贴边:${distance}cm" } 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 f2e437fd52..e7327bd3f7 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 @@ -209,7 +209,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { /** * 设置贴边数据 */ - fun setWeltData(weltData: MutableList,isWeltData: Boolean,distance:Double) { + fun setWeltData(weltData: MutableList,isWeltData: Boolean,distance:String) { this.mWeltData = weltData for (i in mWeltData.indices) { mCoordinatesLatLng.add(CoordinateCalculateRouteUtil.coordinateConverterWgsToGcj(context, mWeltData[i].locLon, mWeltData[i].locLat))