From 435a4429100725710140f5c117bd78d219924bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Sun, 8 Jun 2025 11:23:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/migration/algo/type/Version.java | 2 +- .../service/RailProfileDrawerService.java | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/iflytop/profilometer/core/migration/algo/type/Version.java b/app/src/main/java/com/iflytop/profilometer/core/migration/algo/type/Version.java index b1eff0c..e01b332 100644 --- a/app/src/main/java/com/iflytop/profilometer/core/migration/algo/type/Version.java +++ b/app/src/main/java/com/iflytop/profilometer/core/migration/algo/type/Version.java @@ -1,7 +1,7 @@ package com.iflytop.profilometer.core.migration.algo.type; public class Version { - static public final Integer VERSION_MAIN = 26; + static public final Integer VERSION_MAIN = 27; static public String getVersion() { return String.format("V%d", VERSION_MAIN); diff --git a/app/src/main/java/com/iflytop/profilometer/service/RailProfileDrawerService.java b/app/src/main/java/com/iflytop/profilometer/service/RailProfileDrawerService.java index 964718c..4276338 100644 --- a/app/src/main/java/com/iflytop/profilometer/service/RailProfileDrawerService.java +++ b/app/src/main/java/com/iflytop/profilometer/service/RailProfileDrawerService.java @@ -16,7 +16,10 @@ import com.iflytop.profilometer.core.system.SystemService; import com.iflytop.profilometer.core.websocket.WebSocketManager; import com.iflytop.profilometer.model.bo.RailProfileMeasureTaskState; +import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import cn.hutool.json.JSONUtil; @@ -186,7 +189,6 @@ public class RailProfileDrawerService implements ProfilometerDrawerListener { profilometerRecorder.getFirstSide(), profilometerRecorder.getDataCache2(), profilometerRecorder.getFirstSide().getOpposite()); - if (report.outline1Side == MeasureSide.LEFT) { taskState.setLeftPointSetList(report.outline1); } else { @@ -197,9 +199,22 @@ public class RailProfileDrawerService implements ProfilometerDrawerListener { } else { taskState.setRightPointSetList(report.outline2); } + List allList = new ArrayList<>(); + if (report.outline1Side == MeasureSide.LEFT) { + allList.addAll(report.outline1); + List rightList = new ArrayList<>(report.outline2); + Collections.reverse(rightList); + allList.addAll(rightList); + } else { + allList.addAll(report.outline2); + List leftList = new ArrayList<>(report.outline1); + Collections.reverse(leftList); + allList.addAll(leftList); + } + Map finishMap = new HashMap<>(); finishMap.put("type", "measure-finished"); - finishMap.put("data", report); + finishMap.put("data", allList); WebSocketManager.send(JSONUtil.toJsonStr(finishMap)); }