优化4G开关逻辑，优化pgnss数据获取注入

diff --git a/code/sdk/zhihui/4g/cat1Service/Service/cat1_utils.c b/code/sdk/zhihui/4g/cat1Service/Service/cat1_utils.c
index 41c09b6..2b6ad00 100644 (file)
--- a/code/sdk/zhihui/4g/cat1Service/Service/cat1_utils.c
+++ b/code/sdk/zhihui/4g/cat1Service/Service/cat1_utils.c
@@ -389,6 +389,9 @@ void cat1_api_enable_cat1(bool isopen)
     
     if(isopen)
     {
+        if(cat1_api_runtime_get_cat1_powerstat())
+            return;
+            
 #ifdef SUPPORT_LWIP
         tcpip_thread_resume();
         slipif_loop_thread_resume();
@@ -403,6 +406,8 @@ void cat1_api_enable_cat1(bool isopen)
     }
     else
     {
+        // if(!cat1_api_runtime_get_cat1_powerstat())
+        //     return;
 #ifdef SUPPORT_LWIP
         tcpip_thread_suspend();
         slipif_loop_thread_suspend();

diff --git a/code/sdk/zhihui/drivers/gyro/service/gyro_service.c b/code/sdk/zhihui/drivers/gyro/service/gyro_service.c
index 51e46ee..30acc8d 100644 (file)
--- a/code/sdk/zhihui/drivers/gyro/service/gyro_service.c
+++ b/code/sdk/zhihui/drivers/gyro/service/gyro_service.c
@@ -11,9 +11,6 @@
 #include "custom_utils.h"
 #include "gyro_hal.h"
 #include "gyro_service.h"
-#ifdef ROTARYENCODER_MIXO
-#include "mixo_service.h"
-#endif
 // #include "custom_runtime.h"
 /***
  * 其他cmd在Header里定义，对外开放
@@ -122,15 +119,9 @@ void gyro_int_callback(pin_t pin, uintptr_t param)
 void gyro_start(void)
 {
     do_gyro_service_check_msg(GYRO_SERVICE_CMD_START_CHECK);
-#ifdef ROTARYENCODER_MIXO
-    mixo_stop();
-#endif
 }
 
 void gyro_stop(void)
 {
     do_gyro_service_check_msg(GYRO_SERVICE_CMD_STOP_CHECK);
-#ifdef ROTARYENCODER_MIXO
-    mixo_start();
-#endif
 }

diff --git a/code/sdk/zhihui/services/gnss/sample/pgnss_sample/pgnss_sample.c b/code/sdk/zhihui/services/gnss/sample/pgnss_sample/pgnss_sample.c
index 160d3b2..76400d9 100644 (file)
--- a/code/sdk/zhihui/services/gnss/sample/pgnss_sample/pgnss_sample.c
+++ b/code/sdk/zhihui/services/gnss/sample/pgnss_sample/pgnss_sample.c
@@ -233,6 +233,7 @@ int32_t InjectPgnssWithFallbackToColdStart(tiot_handle handle)
         // {           
             // 设置停止标志
             g_cold_start_pgnss_stopflag = 1;
+            uapi_delete_files(PGNSS_DATA_PATH);
         // }
 
         return 0; // 返回0表示需要重新启动

diff --git a/code/sdk/zhihui/services/gnss/src/gnss_http_server.c b/code/sdk/zhihui/services/gnss/src/gnss_http_server.c
index 7cb4f63..9398095 100644 (file)
--- a/code/sdk/zhihui/services/gnss/src/gnss_http_server.c
+++ b/code/sdk/zhihui/services/gnss/src/gnss_http_server.c
@@ -1264,7 +1264,7 @@ int download_agnss_files(void)
     
     while (retry_count < max_retries) {
         if (retry_count > 0) {
-            LOS_Msleep(300); // 减少重试等待时间
+            LOS_Msleep(500); // 减少重试等待时间
         }
         
         // 初始化HTTP客户端