From 1ee8b2540f264ff99ce3470edbb6f81b36dba558 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Thu, 5 Dec 2024 09:31:28 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E5=8D=9A=E9=80=9A?=
 =?UTF-8?q?=E9=95=BF=E6=97=B6=E9=97=B4=E6=97=A0=E6=9C=89=E6=95=88=E8=A7=A3?=
 =?UTF-8?q?=E5=8F=91=E7=83=AD=E5=90=AF=E5=8A=A8=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../D3F0SelfCheckMessageExecutor.java         | 45 ++++++++++++-------
 .../D3F2StopIndicationMessageExecutor.java    |  2 +-
 2 files changed, 29 insertions(+), 18 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 6b44b3a2..4b0997f4 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
@@ -67,8 +67,14 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
 
         ThreadManager.getFixedThreadPool().submit(() -> {
             // 检查是否需要对设备的F9P进行冷启动操作
-            checkAndSendF9PColdStartCommand(device);
-            checkAndResetBTGnss(device);
+            if(device.getDeviceType() == Device.DEVICE_ROVER){
+                if(device.getModel() == GnssDevice.MODEL_G505){
+                    checkAndSendF9PColdStartCommand(device);
+                }
+                else{
+                    checkAndResetBTGnss(device);
+                }
+            }
             // 通知beidou服务设备上线，这里会触发参数同步
             GnssStatus lastGnssStatus = dataPersistService.getDeviceState(message.getId());
             try {
@@ -106,13 +112,9 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
     }*/
 
     private void checkAndSendF9PColdStartCommand(Device device){
-        if(device.getModel() == GnssDevice.MODEL_G505 &&
-                device.getDeviceType() == Device.DEVICE_ROVER){
-            // 连续6个周期无解，则发送 F9P 冷启动指令
-            if((device.getWarningcode()&WarningCfg.TYPE_NO_FIXED_RESULT) !=0){
-                startF9PColdStartTask(device);
-                device.clearNoResultStat();
-            }
+        if((device.getWarningcode()&WarningCfg.TYPE_NO_FIXED_RESULT) !=0){
+            startF9PColdStartTask(device);
+            device.clearNoResultStat();
         }
     }
 
@@ -166,13 +168,13 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
     }
 
     private void checkAndResetBTGnss(Device device){
-        if(device.getModel() == GnssDevice.MODEL_G510 &&
-                device.getDeviceType() == Device.DEVICE_ROVER){
-            // 连续6个周期无解，则发送 F9P 冷启动指令
-            if(device.getNoFixedAndFloatResult()>0 &&device.getAbnormalD341Num()>10){
-                startBTResetTask(device);
-                device.clearNoResultStat();
-            }
+        if(device.getNoFixedAndFloatResult()>0 &&device.getAbnormalD341Num()>10){
+            startBTResetTask(device);
+            device.clearNoResultStat();
+        }
+        else if((device.getWarningcode()&WarningCfg.TYPE_CONT_INVALID_RESULT) !=0){
+            startBTHotStartTask(device);
+            device.clearNoResultStat();
         }
     }
 
@@ -182,7 +184,16 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
             @Override
             public void run() {
                 sendGnssCommand(device, F9PColdStartCmd);
-                logger.info("{}: 连续{}次无固定解和浮点解，发送 F9P 冷启动指令",device.getDeviceId(), device.getNoFixedAndFloatResult());
+            }
+        },1000);
+    }
+
+    void startBTHotStartTask(Device device){
+        Timer timer = new Timer();
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                sendGnssCommand(device, BTSaveCmd);
             }
         },1000);
     }
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java
index d0cc10d9..e9136a45 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java
@@ -56,7 +56,7 @@ public class D3F2StopIndicationMessageExecutor implements Executor<D3F2StopIndic
         if(device == null) return null;
         message.setTenantId(device.getTenantId());
         if(device.getDeviceType() == Device.DEVICE_ROVER) {
-            message.setOtherInfo(message.getOtherInfo() + ",no calc:" + device.getNoFixedAndFloatResult());
+            message.setOtherInfo(message.getOtherInfo() + ",no calc:" + device.getNoFixedAndFloatResult()+",warning:"+device.getWarningcode());
             if (device.getLastValidCalcDataTime() != null) {
                 message.setOtherInfo(message.getOtherInfo() + ",valid calc:" + device.getLastValidCalcDataTime());
             }