Ver Fonte

修复endbug
修复南北对调问题

allen há 5 dias atrás
pai
commit
33470765d8

+ 2 - 2
uavps-framework/src/main/java/com/uavps/framework/utils/UdpUtils.java

@@ -96,11 +96,11 @@ public class UdpUtils {
 
     private static void getNewXYAircraftCoordinate(PlatformAircraft platformAircraft) {
         platformAircraft.setCoordinateX(((platformAircraft.getLongitude()- TaskInfo.INSTANCE.getX())/ TaskInfo.INSTANCE.getConversionRate()));
-        platformAircraft.setCoordinateY(((platformAircraft.getLatitude()- TaskInfo.INSTANCE.getY())/ TaskInfo.INSTANCE.getConversionRate()));
+        platformAircraft.setCoordinateY(-((platformAircraft.getLatitude()- TaskInfo.INSTANCE.getY())/ TaskInfo.INSTANCE.getConversionRate()));
     }
 
     private static void getNewXYAircraftCoordinate(Aircraft aircraft) {
         aircraft.setCoordinateX((aircraft.getCoordinateX()- TaskInfo.INSTANCE.getX())/ TaskInfo.INSTANCE.getConversionRate());
-        aircraft.setCoordinateY((aircraft.getCoordinateY()- TaskInfo.INSTANCE.getY())/ TaskInfo.INSTANCE.getConversionRate());
+        aircraft.setCoordinateY(-(aircraft.getCoordinateY()- TaskInfo.INSTANCE.getY())/ TaskInfo.INSTANCE.getConversionRate());
     }
 }

+ 1 - 1
uavps-framework/src/main/java/com/uavps/framework/websocket/WebSocketServer.java

@@ -204,7 +204,7 @@ public class WebSocketServer {
                     assert json != null;
                     udpClientService.send(json);
                 } else if (message.startsWith("END:")) {
-                    Long bizId = Long.parseLong(message.substring(5));
+                    Long bizId = Long.parseLong(message.substring(4));
                     UavpsTask uavpsTask = new UavpsTask();
                     uavpsTask.setBizId(bizId);
                     uavpsTask.setBizType(UavpsTask.END);