From 259945e43d6920435af0cccdaf269821eec186ac Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Tue, 26 Nov 2024 07:51:55 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9F=BA=E7=AB=99=E4=B8=8D=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=97=A0=E5=9B=BA=E5=AE=9A=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sideslope/executor/D3F0SelfCheckMessageExecutor.java       | 3 ++-
 .../src/main/java/com/imdroid/sideslope/sal/Device.java        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java
index bce56bb3..f6525a07 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java
@@ -96,7 +96,8 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
     }*/
 
     private void checkAndSendF9PColdStartCommand(Device device){
-        if(device.getModel() == GnssDevice.MODEL_G505){
+        if(device.getModel() == GnssDevice.MODEL_G505 &&
+                device.getDeviceType() == GnssDevice.TYPE_ROVER){
             // 连续6个周期无解，则发送 F9P 冷启动指令
             if(device.getNoFixedAndFloatResult() >= 6){
                 sendF9PColdStartCommand(device);
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/Device.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/Device.java
index 299ad9bd..d1032d6f 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/Device.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/sal/Device.java
@@ -121,7 +121,7 @@ public class Device {
     }
 
     public void clearStat(){
-        if(fixedNum+floatNum == 0) noFixedAndFloatResult++;
+        if(fixedNum+floatNum == 0 && d3xxCount>0) noFixedAndFloatResult++;
         else noFixedAndFloatResult = 0;
 
         d3xxCount = 0;