diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java index 0af518ef..fcccdfa0 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java @@ -7,6 +7,7 @@ import com.imdroid.secapi.dto.GnssDevice; import com.imdroid.common.util.ByteUtil; import com.imdroid.sideslope.bd.Gga; import com.imdroid.sideslope.bd.Rtcm1005; +import com.imdroid.sideslope.bd.Tilt; import com.imdroid.sideslope.calc.GNSSDataCalcService; import com.imdroid.sideslope.message.D331RtcmMessage; import com.imdroid.sideslope.ntrip.UdpNtripServer; @@ -117,6 +118,11 @@ public class D331RtcmMessageExecutor implements Executor deviceBs.setLongitude(gga.getLongitude()); deviceBs.setAltitude(gga.getAltitude()); } + // update angles + Tilt tilt = message.getTilt(); + if(tilt!=null){ + deviceBs.updateMinMaxAngle(tilt.getRoll(),tilt.getPitch()); + } // 添加NTRIP处理 diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java index 659681dc..30e21e97 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D341LocationMessageExecutor.java @@ -5,6 +5,7 @@ import com.imdroid.common.util.ThreadManager; import com.imdroid.secapi.client.BeidouClient; import com.imdroid.secapi.dto.GnssDevice; import com.imdroid.sideslope.bd.Gga; +import com.imdroid.sideslope.bd.Tilt; import com.imdroid.sideslope.calc.GNSSDataCalcService; import com.imdroid.sideslope.message.D341LocationMessage; import com.imdroid.sideslope.service.Device; @@ -78,6 +79,10 @@ public class D341LocationMessageExecutor implements ExecutormaxAngleX) maxAngleX = x; + } + + if(minAngleY == null || maxAngleY == null){ + minAngleY = y; + maxAngleY = y; + } + else{ + if(ymaxAngleY) maxAngleY = y; + } + } + } diff --git a/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java b/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java index 4dcd1f0c..e7a364dc 100644 --- a/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java +++ b/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java @@ -122,9 +122,11 @@ public class D350SurfaceInclineMessageExecutor implements Executor