Merge #2328 into sdk650pathc0423 from refs/changes/2328/head

Code review from snickersun@163.com

* refs/changes/2328/head: (4 commits squashed)

  - 修复雷鸟EG810版本编译问题

  - Merge branch 'sdk650pathc0423' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423

  - 雷鸟启动EG810自动开启4G

  - Merge branch 'sdk650pathc0423' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2328

diff --git a/code/sdk/zhihui/leiniao/factory_test/PPPTestView.cpp b/code/sdk/zhihui/leiniao/factory_test/PPPTestView.cpp
index c452f99..6d567b1 100644 (file)
--- a/code/sdk/zhihui/leiniao/factory_test/PPPTestView.cpp
+++ b/code/sdk/zhihui/leiniao/factory_test/PPPTestView.cpp
@@ -141,7 +141,11 @@ static void update_ppp_runtime_status_display() {
     printf("=== 更新PPP运行状态显示 ===\n");
     
     // 更新所有运行时状态
+    #if SUPPORT_PPP_SERVICE 
     errcode_t ret = ppp_api_update_all_runtime_status();
+    #else
+    errcode_t ret = ERRCODE_SUCC;
+    #endif
     if (ret != ERRCODE_SUCC) {
         printf("更新PPP运行状态失败: %d\n", ret);
         return;
@@ -242,8 +246,11 @@ static void update_signal_quality_display() {
     
     // 使用直接的API获取信号信息
     ppp_network_signal_info_t signal_info;
+    #if SUPPORT_PPP_SERVICE
     ppp_error_t ret = ppp_at_get_network_signal_info(&signal_info);
-    
+    #else
+    ppp_error_t ret = PPP_ERR_OK;
+    #endif
     if (ret != PPP_ERR_OK) {
         printf("获取信号质量信息失败: %d\n", ret);
         // 显示错误信息
@@ -437,7 +444,11 @@ static void ppp_refresh_ui_callback(void* userData) {
     update_ppp_runtime_status_display();
     
     // 尝试获取信号质量，但增加容错机制
+    #if SUPPORT_PPP_SERVICE
     errcode_t ret = ppp_get_network_signal_info();
+    #else
+    errcode_t ret = ERRCODE_SUCC;
+    #endif
     if (ret == ERRCODE_SUCC) {
         g_consecutive_failures = 0; // 重置失败计数
         update_signal_quality_display();

diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c
index f780b89..aedaf56 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils.c
+++ b/code/sdk/zhihui/utils/custom_utils.c
@@ -733,19 +733,7 @@ void startup_post_init_task(void)
     system_init_uart();//配置uartat
 #endif
 
-#ifdef BOARD_LEINIAO
-    // zhihui_ppp_init();
-#else
-    if ( cm_poweron_cat1_on_bootup_flag() )
-    {
-        PRINT("PowerOn Cat1 !\r\n");
-        uapi_set4GCapability(true);       
-    }else{
-        PRINT("PowerOff Cat1 !\r\n");
-        uapi_set4GCapability(false);
-    }
-#endif
-    
+
     uint8_t len = 1;
     uapi_get_file_data("user/userdata/timestamp_of_day.bin",&day,&len);
     time(&rawtime);
@@ -758,6 +746,11 @@ void startup_post_init_task(void)
 
     
 #ifdef SUPPORT_CAT1_SERVICE
+
+#ifdef BOARD_LEINIAO
+    PRINT("PowerOn Cat1 !\r\n");
+    uapi_set4GCapability(true);     
+#else
 if ( cm_poweron_cat1_on_bootup_flag() )
 {
     PRINT("PowerOn Cat1 !\r\n");
@@ -766,6 +759,7 @@ if ( cm_poweron_cat1_on_bootup_flag() )
     PRINT("PowerOff Cat1 !\r\n");
     uapi_set4GCapability(false);
 }
+#endif
 #else
 
 #ifdef BOARD_LEINIAO