yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[sweeper] refactor: 优化报站日志打印；feat：完成任务后增加toast提示；

Browse Source
This commit is contained in:
aibingbing
2023-03-13 16:24:23 +08:00
parent 9e2d233ca9
commit ad7151c8a4
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.kt
View File

@@ -268,6 +268,7 @@ class SweeperFragment : BaseSweeperTabFragment<SweeperFragment?, SweeperPresente
mPresenter?.clearRouteList()
}
setTaskProgress("0")
ToastUtils.showLong("当前任务已完成，已刷新列表")
return
}
when (typeEnum.code) {

24
OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
View File

@@ -306,12 +306,12 @@ public class SweeperTaskModel {
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
+ ", 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
+ ", mLatitude=" + gnssInfo.getLatitude() + ", mSubTaskType=" + mSubTaskType +", mIsSubTaskWorking=" + mIsSubTaskWorking
+ ", isAutopilotSubTaskArriveEndSite=" + isAutopilotSubTaskArriveEndSite
);
mLongitude = gnssInfo.getLongitude();
mLatitude = gnssInfo.getLatitude();
@@ -446,10 +446,10 @@ 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());
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
String longitude = NumberFormatUtil.cutOutNumber(data.getEndLocation().getLongitude(), 5);
String arriveLat = NumberFormatUtil.cutOutNumber(mCurrentSubTaskDetail.getEndSiteWgs64Lat(), 5);
@@ -459,10 +459,10 @@ 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);
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) {//人工驾驶子任务需要手动跳过，不能自动结束
return;
}