From 922ab45708fd740ce0fa650a60cf576ecd0d0ad8 Mon Sep 17 00:00:00 2001 From: bxb Date: Thu, 23 Mar 2023 16:33:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E6=B8=85?= =?UTF-8?q?=E6=89=AB=E8=BD=A6=E7=83=9F=E5=8F=B0=E7=8E=AF=E5=A2=83=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/sweeper/constant/SweeperConst.kt | 4 +++- .../mogo/och/sweeper/fragment/SweeperFragment.kt | 4 ++-- .../function/startup/stageone/HttpDnsStartUp.kt | 13 ++++++++++++- .../java/com/mogo/commons/constants/HostConst.java | 9 +++++++-- 4 files changed, 24 insertions(+), 6 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 83e0552166..38c788551f 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 @@ -10,7 +10,9 @@ class SweeperConst { private const val BASE_URL_OCH_DEV = "https://och-driver-dev.zhidaozhixing.com" private const val BASE_URL_OCH_QA = "https://och-driver-qa.zhidaozhixing.com" - private const val BASE_URL_OCH_RELEASE = "https://och-driver.zhidaozhixing.com" + + //private const val BASE_URL_OCH_RELEASE = "https://och-driver.zhidaozhixing.com" + private const val BASE_URL_OCH_RELEASE = "https://och-driver-yt.zhidaozhixing.com" @JvmStatic fun getBaseUrl(): String { 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 facfdaf0f7..79b6a19381 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 @@ -515,8 +515,8 @@ class SweeperFragment : BaseSweeperTabFragment() { // clientConfig.passportUrl //todo 亚坤 // clientConfig.socketBaseUrl // clientConfig.socketTechUrl + //设置基础服务平台域名 + setBasicServicesDns(clientConfig) // 设置是否是直播推流的主播 clientConfig.isAnchor = true when (DebugConfig.getCarMachineType()) { @@ -125,7 +127,6 @@ class HttpDnsStartUp : AndroidStartup() { //设置长链接的secretKey 通过SHA1和包名找中台服务生成，后续包名分渠道,需要做对应操作 clientConfig.secretKey = "YMj2VFDFxJ3Q4gNoZceJ" // clientConfig.secretKey = "n48AlVufihvMDWgzwHX42yzSgiWaad6v" - clientConfig.iHttpCurrentLocation = object : ICurrentLocation { override fun getCurrentLocation(): SimpleLocation { val envConfig = CallerDevaToolsManager.getEnvConfig() @@ -353,4 +354,14 @@ class HttpDnsStartUp : AndroidStartup() { } } + /** + * 设置基础服务平台域名 + */ + private fun setBasicServicesDns(clientConfig:MoGoAiCloudClientConfig){ + if (DebugConfig.getNetMode()==DebugConfig.NET_MODE_RELEASE||DebugConfig.getNetMode()==DebugConfig.NET_MODE_DEMO){ + clientConfig.passportUrl="https://och-driver-yt.zhidaozhixing.com/arch/passport/" + clientConfig.socketBaseUrl="https://och-driver-yt.zhidaozhixing.com/arch/push/" + clientConfig.socketTechUrl="https://och-driver-yt.zhidaozhixing.com/arch/" + } + } } \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java index 62e5713ece..7d887ab5f2 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java @@ -22,9 +22,14 @@ public class HostConst { public static final String CMDB_HOST = "http://eagle-mis.zhidaozhixing.com/eagleEye-mis/cmdbapi/"; public static final String HOST_DEV = "http://eagle-mis-a.zhidaozhixing.com"; - public static final String HOST_RELEASE = "http://eagle-mis.zhidaozhixing.com"; - public static final String HOST_EAGLE_QA = "http://eagle-dns-a.zhidaozhixing.com/"; + //public static final String HOST_RELEASE = "http://eagle-mis.zhidaozhixing.com"; + + public static final String HOST_RELEASE = "https://och-hailing-yt.zhidaozhixing.com"; + + //public static final String HOST_EAGLE_QA = "http://eagle-dns-a.zhidaozhixing.com/"; + + public static final String HOST_EAGLE_QA = "https://och-hailing-yt.zhidaozhixing.com/"; public static String getHost() { String host = HOST_RELEASE; From 9c29f1cf0e06a59fd6b305fbc55b2d6602d9492c Mon Sep 17 00:00:00 2001 From: bxb Date: Mon, 27 Mar 2023 11:00:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Djava.lang.NullPointerException:=20Attempt=20to=20invok?= =?UTF-8?q?e=20virtual=20method=20'void=20com.mogo.och.sweeper.view.WeltMa?= =?UTF-8?q?pOverView.setWeltData(java.util.List,=20boolean,=20java.lang.St?= =?UTF-8?q?ring)'=20on=20a=20null=20object=20reference=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/WeltMapOverViewFragment.kt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt index 1b160314b7..f9803b13e9 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt @@ -34,7 +34,7 @@ class WeltMapOverViewFragment() : BaseFragment(), ISweeperTaskDataToFragmentCall } override fun initViews(savedInstanceState: Bundle?) { super.initViews(savedInstanceState) - weltMapOverView.onCreateView(savedInstanceState) + weltMapOverView?.onCreateView(savedInstanceState) sweeperSwitchToSmall.setOnClickListener { mIWeltMapSwitchToSmallCallBack?.onWeltMapSwitchToSmall() } @@ -46,7 +46,7 @@ class WeltMapOverViewFragment() : BaseFragment(), ISweeperTaskDataToFragmentCall val routeList = bundle.getSerializable("routeList") as? ArrayList val progress = bundle.getString("progress") routeList?.let { - weltMapOverView.setRouteList(it) + weltMapOverView?.setRouteList(it) } latLng?.let { setCurrentTaskCoordinatesLatLng(it) @@ -58,7 +58,7 @@ class WeltMapOverViewFragment() : BaseFragment(), ISweeperTaskDataToFragmentCall setWeltData(it,"0.0") } progress?.let { - weltMapOverView.setProgress(progress) + weltMapOverView?.setProgress(progress) } } @@ -91,39 +91,39 @@ class WeltMapOverViewFragment() : BaseFragment(), ISweeperTaskDataToFragmentCall override fun onPause() { super.onPause() - weltMapOverView.onPause() + weltMapOverView?.onPause() } override fun onResume() { super.onResume() - weltMapOverView.onResume() + weltMapOverView?.onResume() } override fun onDestroy() { super.onDestroy() - weltMapOverView.onDestroy() + weltMapOverView?.onDestroy() } override fun setTaskListCoordinatesLatLng(coordinatesLatLng: java.util.ArrayList) { - weltMapOverView.setTaskListCoordinatesLatLng(coordinatesLatLng) + weltMapOverView?.setTaskListCoordinatesLatLng(coordinatesLatLng) } override fun setCurrentTaskCoordinatesLatLng(coordinatesLatLng: LatLng) { - weltMapOverView.setCurrentTaskCoordinatesLatLng(coordinatesLatLng) + weltMapOverView?.setCurrentTaskCoordinatesLatLng(coordinatesLatLng) } override fun clearAllMarkerAndPolyline() { - weltMapOverView.clearAllMarkerAndPolyline() + weltMapOverView?.clearAllMarkerAndPolyline() } override fun setProgress(progress: String) { - weltMapOverView.setProgress(progress) + weltMapOverView?.setProgress(progress) } override fun setRouteList(routeList: java.util.ArrayList) { - weltMapOverView.setRouteList(routeList) + weltMapOverView?.setRouteList(routeList) } override fun setWeltData(weltDatas: java.util.ArrayList?, distance: String) { - weltMapOverView.setWeltData(weltDatas,true,distance) + weltMapOverView?.setWeltData(weltDatas,true,distance) } } \ No newline at end of file From ec6f7441d5efb759034a44167166e2337b350ee9 Mon Sep 17 00:00:00 2001 From: bxb Date: Mon, 27 Mar 2023 20:32:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=81=B6=E7=8E=B0java.lang.RuntimeException:=20Parcel?= =?UTF-8?q?:=20unable=20to=20marshal=20value=20com.mogo.och.sweeper.bean.S?= =?UTF-8?q?weeperRoutePlanningUpdateReqBean$Result@b444642=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/SweeperRoutePlanningUpdateReqBean.java | 7 ++++--- .../com/mogo/och/sweeper/model/SweeperTaskModel.java | 12 ------------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java index e3704e1db8..32fcf73e48 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/bean/SweeperRoutePlanningUpdateReqBean.java @@ -1,6 +1,7 @@ package com.mogo.och.sweeper.bean; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -13,15 +14,15 @@ public class SweeperRoutePlanningUpdateReqBean implements Serializable { public int lineId; public int startSiteId; public int endSiteId; - public List points; + public ArrayList points; - public static class Result { + public static class Result implements Serializable{ public Double latitude; public Double longitude; } public SweeperRoutePlanningUpdateReqBean(String sn, int lineId, int startSiteId - , int endSiteId, List points) { + , int endSiteId, ArrayList points) { this.sn = sn; this.lineId = lineId; this.startSiteId = startSiteId; 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 12b9f07723..802bed9427 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 @@ -302,10 +302,6 @@ public class SweeperTaskModel { @Override public void onChassisLocationGCJ02(@Nullable MogoLocation gnssInfo) { if (null == gnssInfo) return; - Log.d(M_SWEEPER + TAG, "高德定位到站：mLongitude = " + gnssInfo.getLongitude() - + ", mLatitude=" + gnssInfo.getLatitude() + ", mSubTaskType=" + mSubTaskType + ", mIsSubTaskWorking=" + mIsSubTaskWorking - + ", isAutopilotSubTaskArriveEndSite=" + isAutopilotSubTaskArriveEndSite - ); CallerLogger.INSTANCE.e(M_SWEEPER + TAG, "高德定位到站：mLongitude = " + gnssInfo.getLongitude() + ", mLatitude=" + gnssInfo.getLatitude() + ", mSubTaskType=" + mSubTaskType +", mIsSubTaskWorking=" + mIsSubTaskWorking + ", isAutopilotSubTaskArriveEndSite=" + isAutopilotSubTaskArriveEndSite @@ -349,7 +345,6 @@ public class SweeperTaskModel { //根据围栏判断，是否到达子任务终点 private void judgeArrivedStation(MogoLocation location) { if (mCurrentSubTaskDetail == null) { - Log.d(TAG, "行程日志-judgeArrivedStation() mCurrentSubTaskDetail is null"); CallerLogger.INSTANCE.d(TAG, "行程日志-judgeArrivedStation() mCurrentSubTaskDetail is null"); return; } @@ -361,8 +356,6 @@ public class SweeperTaskModel { if (distance <= SweeperConst.ARRIVE_AT_END_STATION_DISTANCE) { CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "行程日志-judgeArrivedStation() distance = " + distance + " to " + mCurrentSubTaskDetail.getEndSiteName()); - Log.d(TAG, "行程日志-judgeArrivedStation() distance = " + distance - + " to " + mCurrentSubTaskDetail.getEndSiteName()); isAutopilotSubTaskArriveEndSite = true; //到达子任务终点 结束子任务 subTaskEnd(mIsFirstSubtask, mIsLastSubtask, mSubTaskId); //无自动驾驶到终点信息传null @@ -446,8 +439,6 @@ public class SweeperTaskModel { //MAP 280 每隔100ms左右返回一次到站， 导致在到达中间站后再次滑动出发后会有时间差，收到一次到站，出现问题 //此处比对 自驾告诉的子任务终点坐标和本地应到子任务终点坐标， 一致时才表示子任务完成 if (data != null && data.getEndLocation() != null && mCurrentSubTaskDetail != null) { - Log.d(M_SWEEPER + TAG, "MAP到站通知：" + mCurrentSubTaskDetail.getEndSiteName() + " 经度：" - + data.getEndLocation().getLongitude() + " 纬度：" + data.getEndLocation().getLatitude()); CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "MAP到站通知：" + mCurrentSubTaskDetail.getEndSiteName() + " 经度：" + data.getEndLocation().getLongitude() + " 纬度：" + data.getEndLocation().getLatitude()); String latitude = NumberFormatUtil.cutOutNumber(data.getEndLocation().getLatitude(), 5); //wgs @@ -459,8 +450,6 @@ public class SweeperTaskModel { return; } } - Log.d(M_SWEEPER + TAG, "MAP到站通知：mSubTaskType=" + mSubTaskType + " isAutopilotSubTaskArriveEndSite=" - + isAutopilotSubTaskArriveEndSite + " mSubTaskId=" + mSubTaskId); CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "MAP到站通知：mSubTaskType=" + mSubTaskType + " isAutopilotSubTaskArriveEndSite=" + isAutopilotSubTaskArriveEndSite + " mSubTaskId=" + mSubTaskId); if (SubTaskTypeEnum.MANUAL_DRIVING_SUBTYPE.getCode() == mSubTaskType) {//人工驾驶子任务需要手动跳过，不能自动结束 @@ -664,7 +653,6 @@ public class SweeperTaskModel { @Override public void onSuccess(BaseResponse data) { CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "getSubTaskDetail：" + GsonUtil.jsonFromObject(data)); - Log.d(M_SWEEPER + TAG, "getSubTaskDetail：" + GsonUtil.jsonFromObject(data)); if (data != null) { mCurrentSubTaskDetail = data.getData(); if (mCurrentSubTaskDetail != null) { From c7d5fbee40cbe45492864803c03d6095984e2290 Mon Sep 17 00:00:00 2001 From: pangfan Date: Tue, 28 Mar 2023 20:44:17 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[=E7=83=9F=E5=8F=B0=E4=BA=A4=E4=BB=98]1.Rob?= =?UTF-8?q?oSweeper-Driver=EF=BC=9Av3.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index c1d418f3b6..e482fd6b80 100644 --- a/gradle.properties +++ b/gradle.properties @@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0 -versionCode=1010000 -versionName=1.1.0 +versionCode=3000000 +versionName=3.0.0 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10 From b3c308cf41366f27042670fe066a90d0704b9ce6 Mon Sep 17 00:00:00 2001 From: bxb Date: Wed, 29 Mar 2023 17:30:22 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E8=B4=B4?= =?UTF-8?q?=E8=BE=B9=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt | 2 +- .../com/mogo/och/sweeper/presenter/SweeperPresenter.java | 7 ++++++- .../main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt | 2 +- .../java/com/mogo/och/sweeper/view/WeltSmallMapView.kt | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt index f9803b13e9..a34f658856 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/WeltMapOverViewFragment.kt +++ b/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) 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 62f18ec6e3..c943aa7df9 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 @@ -356,7 +356,12 @@ public class SweeperPresenter extends Presenter 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) MyDataBase.getInstance().getWeltDataDao().loadAllWeltDataInfo(), true, distance); } } 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 0bcd0f5d1b..6092a9029c 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 @@ -302,7 +302,7 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { } private fun setDistance(distance: String) { - taskWeltDistanceTv.text = "贴边:${distance}cm" + taskWeltDistanceTv.text = "贴边:${distance}" } fun setProgress(progress: String?) { 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 fccf64bcc5..20ce2a54c3 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 @@ -283,7 +283,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { * 设置贴边距离 */ private fun setWeltDistance(distance: String) { - taskWeltDistanceTv.text = "贴边:${distance}cm" + taskWeltDistanceTv.text = "贴边:${distance}" } /** From 1a6d6bccb58a00cccd06d7c968121d13693e101b Mon Sep 17 00:00:00 2001 From: bxb Date: Wed, 29 Mar 2023 17:32:08 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E8=B4=B4?= =?UTF-8?q?=E8=BE=B9=E5=A4=A7=E4=BA=8E1.0m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/sweeper/presenter/SweeperPresenter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c943aa7df9..acf46f64f6 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 @@ -357,7 +357,7 @@ public class SweeperPresenter extends Presenter weltDataBean.setSubTaskId(mSubTaskId); MyDataBase.getInstance().getWeltDataDao().insert(weltDataBean); String distance; - if (roboSweeperTaskIndex.getDistToRefEdgePoint() >= 100.0) {//大于等于1m + if (roboSweeperTaskIndex.getDistToRefEdgePoint() >= 1.0) {//大于等于1m distance = format(roboSweeperTaskIndex.getDistToRefEdgePoint()) + "m"; } else {//小于1m distance = Math.round(roboSweeperTaskIndex.getDistToRefEdgePoint() * 100) + "cm";//m->cm 四舍五入到整数