diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkrcv/RtkrcvManager.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkrcv/RtkrcvManager.java index 0007429b..a14ed35e 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkrcv/RtkrcvManager.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/rtkrcv/RtkrcvManager.java @@ -54,9 +54,7 @@ public class RtkrcvManager { Double geo = dev.getGeoidSeparation()==null?0.0:dev.getGeoidSeparation(); try{ beidouClient.onRtkGngga(deviceId, lat, lon, alt, geo); }catch(Exception ignore){} if(!(lat==0.0 && lon==0.0 && alt==0.0)){ - if(profile.getOut_height()==null || profile.getOut_height().isEmpty()){ - profile.setOut_height(geo==0.0?"ellipsoidal":"geodetic"); - } + profile.setOut_height(geo==0.0?"ellipsoidal":"geodetic"); } else { retHint = "all_zero"; } @@ -151,7 +149,9 @@ public class RtkrcvManager { } template = replaceLine(template, "pos1-posmode", profile.getPos1_posmode()); - template = replaceLine(template, "out-height", profile.getOut_height()); + if(profile.getOut_height()!=null && !profile.getOut_height().isEmpty()){ + template = replaceLine(template, "out-height", profile.getOut_height()); + } template = replaceLine(template, "inpstr1-type", profile.getInpstr1_type()); if(profile.getInpstr1_path()!=null) template = replaceLine(template, "inpstr1-path", profile.getInpstr1_path()); if(group.getInpstr2_path()!=null) template = replaceLine(template, "inpstr2-path", group.getInpstr2_path());