[清扫车]贴边数据显示问题修改

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt

@@ -55,7 +55,7 @@ class WeltMapOverViewFragment() : BaseFragment(), ISweeperTaskDataToFragmentCall
                 setTaskListCoordinatesLatLng(it)
             }
             weltDataList?.let {
-                setWeltData(it,"0.0")
+                setWeltData(it,"0.0cm")
             }
             progress?.let {
                 weltMapOverView?.setProgress(progress)

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java

@@ -356,7 +356,12 @@ public class SweeperPresenter extends Presenter<SweeperFragment>
             weltDataBean.setCleanIntensity(roboSweeperTaskIndex.getCleanIntensity());
             weltDataBean.setSubTaskId(mSubTaskId);
             MyDataBase.getInstance().getWeltDataDao().insert(weltDataBean);
-            String distance = String.valueOf((Math.round(roboSweeperTaskIndex.getDistToRefEdgePoint() * 100)));//m->cm 四舍五入到整数
+            String distance;
+            if (roboSweeperTaskIndex.getDistToRefEdgePoint() >= 100.0) {//大于等于1m
+                distance = format(roboSweeperTaskIndex.getDistToRefEdgePoint()) + "m";
+            } else {//小于1m
+                distance = Math.round(roboSweeperTaskIndex.getDistToRefEdgePoint() * 100) + "cm";//m->cm 四舍五入到整数
+            }
             mView.setWeltDataToMap((ArrayList<WeltDataBean>) MyDataBase.getInstance().getWeltDataDao().loadAllWeltDataInfo(), true, distance);
         }
     }

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt

@@ -302,7 +302,7 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
     }
 
     private fun setDistance(distance: String) {
-        taskWeltDistanceTv.text = "贴边:${distance}cm"
+        taskWeltDistanceTv.text = "贴边:${distance}"
     }
 
     fun setProgress(progress: String?) {

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt

@@ -283,7 +283,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
      * 设置贴边距离
      */
     private fun setWeltDistance(distance: String) {
-        taskWeltDistanceTv.text = "贴边:${distance}cm"
+        taskWeltDistanceTv.text = "贴边:${distance}"
     }
 
     /**