From ec6f7441d5efb759034a44167166e2337b350ee9 Mon Sep 17 00:00:00 2001 From: bxb Date: Mon, 27 Mar 2023 20:32:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=81=B6=E7=8E=B0java.lang.RuntimeException:=20Parcel:=20unabl?= =?UTF-8?q?e=20to=20marshal=20value=20com.mogo.och.sweeper.bean.SweeperRou?= =?UTF-8?q?tePlanningUpdateReqBean$Result@b444642=E9=97=AE=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) {