From 48b632e74484279a7d1a833c1506c5692feb5c8a Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=AD=99=E6=98=A5=E9=98=B3?= <snickersun@163.com>
Date: Thu, 18 Sep 2025 12:13:22 +0800
Subject: [PATCH] =?utf8?q?=E9=9B=B7=E9=B8=9F=EF=BC=8C=E5=BC=80=E6=9C=BA?=
 =?utf8?q?=E8=87=AA=E5=8A=A8=E5=BC=804G=20=EF=BC=8C=20=E9=BB=98=E8=AE=A4AT?=
 =?utf8?q?=E6=8C=87=E4=BB=A4=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 code/sdk/zhihui/ppp/example/ppp_at_cmd.c  |  1 +
 code/sdk/zhihui/ppp/example/ppp_example.c | 25 ++++++++++++-------
 code/sdk/zhihui/ppp/include/ppp_example.h |  8 +++----
 code/sdk/zhihui/utils/custom_utils.c      | 29 +++++++++++++----------
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/code/sdk/zhihui/ppp/example/ppp_at_cmd.c b/code/sdk/zhihui/ppp/example/ppp_at_cmd.c
index e71376e51..f2f92e24b 100644
--- a/code/sdk/zhihui/ppp/example/ppp_at_cmd.c
+++ b/code/sdk/zhihui/ppp/example/ppp_at_cmd.c
@@ -757,6 +757,7 @@ static errcode_t at_ppp_env_init(uint8_t *para, uint32_t paraLen)
     int ret = ppp_env_init();
     if (ret == 0) {
         ppp_print_info("PPP ENV INIT: PPP environment initialized successfully (AT mode)\n");
+        ppp_env_init_monitor_task();
         return ERRCODE_SUCC;
     } else {
         ppp_print_err("PPP ENV INIT: Failed to initialize PPP environment, error: %d\n", ret);
diff --git a/code/sdk/zhihui/ppp/example/ppp_example.c b/code/sdk/zhihui/ppp/example/ppp_example.c
index 7334b3a81..844d5c6c7 100644
--- a/code/sdk/zhihui/ppp/example/ppp_example.c
+++ b/code/sdk/zhihui/ppp/example/ppp_example.c
@@ -66,15 +66,6 @@ int ppp_env_init(void)
         return -1;
     }
 
-    /* 4. 创建网络监控任务 */
-    PRINT("Creating network monitor task...\r\n");
-    g_monitor_task = osal_kthread_create(network_monitor_task, NULL, "net_monitor", (2048+1024));  // 恢复原始栈大小，AT函数已优化
-    if (g_monitor_task == NULL) {
-        PRINT("Failed to create monitor task\r\n");
-        zhihui_ppp_deinit();
-        return -1;
-    }
-
     g_ppp_env_initialized = true;
     PRINT("PPP environment initialized successfully (AT mode)\r\n");
     if (ppp_is_4g_power_initialized()) {
@@ -88,6 +79,22 @@ int ppp_env_init(void)
 
 }
 
+int ppp_env_init_monitor_task(void)
+{
+    /* 4. 创建网络监控任务 */
+    if (g_monitor_task != NULL) {
+        PRINT("Monitor task already exists\r\n");
+        return 0;
+    }
+    PRINT("Creating network monitor task...\r\n");
+    g_monitor_task = osal_kthread_create(network_monitor_task, NULL, "net_monitor", (2048+1024));  // 恢复原始栈大小，AT函数已优化
+    if (g_monitor_task == NULL) {
+        PRINT("Failed to create monitor task\r\n");
+        return -1;
+    }
+    return 0;
+}
+
 /**
  * @brief 开始PPP拨号（异步版本，不阻塞AT命令线程）
  * @return 0成功启动拨号，-1失败
diff --git a/code/sdk/zhihui/ppp/include/ppp_example.h b/code/sdk/zhihui/ppp/include/ppp_example.h
index a79021b11..e4c4fbf2e 100644
--- a/code/sdk/zhihui/ppp/include/ppp_example.h
+++ b/code/sdk/zhihui/ppp/include/ppp_example.h
@@ -62,14 +62,14 @@ int ppp_test_stop_dial(void);
  */
 int ppp_env_deinit(void);
 
+
 /**
- * @brief PPP拨号示例主函数
- * 
- * 使用新的模块化函数实现的示例主函数，展示完整的PPP使用流程。
+ * @brief 初始化网络监控任务
  * 
  * @return 0成功，-1失败
  */
-int ppp_example_main(void);
+int ppp_env_init_monitor_task(void);
+
 
 #ifdef __cplusplus
 }
diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c
index 795b500e7..ffe74d9c4 100644
--- a/code/sdk/zhihui/utils/custom_utils.c
+++ b/code/sdk/zhihui/utils/custom_utils.c
@@ -670,18 +670,6 @@ 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
     uapi_gei_btmac_and_chipinfo();
 
     uint8_t buildversion[128]={0};
@@ -698,6 +686,23 @@ void startup_post_init_task(void)
     {
         CustomEventPublish(TOPIC_EVENT_NEXTDAY_UPDATE, NULL , 0);
     }
+
+
+    
+#ifdef BOARD_LEINIAO
+    extern int ppp_env_init(void);
+    ppp_env_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
+
 #ifdef A5133_DEMO_SERVER
     uapi_button_register_event_cb(a5133_demo_msg_unbind_callback, BUTTON_PWR_CLICKUP_2);
     a5133_demo_msg_change_callback();
-- 
2.17.1