|
|
@ -189,40 +189,40 @@ public class RailProfileDrawerService implements ProfilometerDrawerListener { |
|
|
|
BleDeviceDriver bleDeviceDriver = SystemService.getInstance().getBleDeviceDriver(); |
|
|
|
bleDeviceDriver.stopSampling(); |
|
|
|
|
|
|
|
var report = ProfilometerPulleyPointPreProcesser.processRecord( |
|
|
|
profilometerRecorder.getConfig(), |
|
|
|
profilometerRecorder.getDeviceProfile(), |
|
|
|
profilometerRecorder.getDataCache1(), |
|
|
|
profilometerRecorder.getFirstSide(), |
|
|
|
profilometerRecorder.getDataCache2(), |
|
|
|
profilometerRecorder.getFirstSide().getOpposite()); |
|
|
|
if (report.outline1Side == MeasureSide.LEFT) { |
|
|
|
taskState.setLeftPointSetList(report.outline1); |
|
|
|
} else { |
|
|
|
taskState.setRightPointSetList(report.outline1); |
|
|
|
} |
|
|
|
if (report.outline2Side == MeasureSide.LEFT) { |
|
|
|
taskState.setLeftPointSetList(report.outline2); |
|
|
|
} else { |
|
|
|
taskState.setRightPointSetList(report.outline2); |
|
|
|
} |
|
|
|
List<XYPoint> allList = new ArrayList<>(); |
|
|
|
List<XYPoint> outline1List = new ArrayList<>(report.outline1); |
|
|
|
List<XYPoint> outline2List = new ArrayList<>(report.outline2); |
|
|
|
if (report.outline1Side == MeasureSide.LEFT) { |
|
|
|
Collections.reverse(outline1List); |
|
|
|
allList.addAll(outline1List); |
|
|
|
allList.addAll(outline2List); |
|
|
|
} else { |
|
|
|
Collections.reverse(outline2List); |
|
|
|
allList.addAll(outline2List); |
|
|
|
allList.addAll(outline1List); |
|
|
|
} |
|
|
|
Log.i(LogTag.PROFILOMENTER, "本次测量一共" + allList.size() + "个点"); |
|
|
|
Map<String, Object> finishMap = new HashMap<>(); |
|
|
|
finishMap.put("type", "measure-finished"); |
|
|
|
finishMap.put("data", allList); |
|
|
|
WebSocketManager.send(JSONUtil.toJsonStr(finishMap)); |
|
|
|
// var report = ProfilometerPulleyPointPreProcesser.processRecord( |
|
|
|
// profilometerRecorder.getConfig(), |
|
|
|
// profilometerRecorder.getDeviceProfile(), |
|
|
|
// profilometerRecorder.getDataCache1(), |
|
|
|
// profilometerRecorder.getFirstSide(), |
|
|
|
// profilometerRecorder.getDataCache2(), |
|
|
|
// profilometerRecorder.getFirstSide().getOpposite()); |
|
|
|
// if (report.outline1Side == MeasureSide.LEFT) { |
|
|
|
// taskState.setLeftPointSetList(report.outline1); |
|
|
|
// } else { |
|
|
|
// taskState.setRightPointSetList(report.outline1); |
|
|
|
// } |
|
|
|
// if (report.outline2Side == MeasureSide.LEFT) { |
|
|
|
// taskState.setLeftPointSetList(report.outline2); |
|
|
|
// } else { |
|
|
|
// taskState.setRightPointSetList(report.outline2); |
|
|
|
// } |
|
|
|
// List<XYPoint> allList = new ArrayList<>(); |
|
|
|
// List<XYPoint> outline1List = new ArrayList<>(report.outline1); |
|
|
|
// List<XYPoint> outline2List = new ArrayList<>(report.outline2); |
|
|
|
// if (report.outline1Side == MeasureSide.LEFT) { |
|
|
|
// Collections.reverse(outline1List); |
|
|
|
// allList.addAll(outline1List); |
|
|
|
// allList.addAll(outline2List); |
|
|
|
// } else { |
|
|
|
// Collections.reverse(outline2List); |
|
|
|
// allList.addAll(outline2List); |
|
|
|
// allList.addAll(outline1List); |
|
|
|
// } |
|
|
|
// Log.i(LogTag.PROFILOMENTER, "本次测量一共" + allList.size() + "个点"); |
|
|
|
// Map<String, Object> finishMap = new HashMap<>(); |
|
|
|
// finishMap.put("type", "measure-finished"); |
|
|
|
// finishMap.put("data", allList); |
|
|
|
// WebSocketManager.send(JSONUtil.toJsonStr(finishMap)); |
|
|
|
} |
|
|
|
|
|
|
|
public RailProfileDrawerService() { |
|
|
|