From c501a310c733ddf698b7dc8612967b715148954c Mon Sep 17 00:00:00 2001
From: zogodo <742782908@qq.com>
Date: Wed, 9 Oct 2019 21:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TC1/main.c      | 8 +++++---
 TC1/user_wifi.c | 4 ++--
 TC1/user_wifi.h | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/TC1/main.c b/TC1/main.c
index b968f80..2fa7cb1 100644
--- a/TC1/main.c
+++ b/TC1/main.c
@@ -89,11 +89,13 @@ int application_start(void)
         ApInit();
     }
 
+    bool open_ap = false;
     MicoGpioInitialize((mico_gpio_t) Led, OUTPUT_PUSH_PULL);
     for (i = 0; i < Relay_NUM; i++)
     {
         MicoGpioInitialize(Relay[i], OUTPUT_PUSH_PULL);
         UserRelaySet(i, user_config->socket[i].on);
+        open_ap = true;
     }
     MicoSysLed(0);
 
@@ -127,8 +129,8 @@ int application_start(void)
     os_log("mqtt_password:%s",user_config->mqtt_password);
     os_log("version:%d",user_config->version);
 
-    StationInit();
-    if (sys_config->micoSystemConfig.reserved != NOTIFY_STATION_UP)
+    WifiInit();
+    if (sys_config->micoSystemConfig.reserved != NOTIFY_STATION_UP && !open_ap)
     {
         ApInit();
     }
@@ -145,7 +147,7 @@ int application_start(void)
     user_power_init();
 
     /* start http server thread */
-    app_httpd_start();
+    AppHttpdStart();
     while (1)
     {
         main_num++;
diff --git a/TC1/user_wifi.c b/TC1/user_wifi.c
index 9c8a636..6d574b8 100644
--- a/TC1/user_wifi.c
+++ b/TC1/user_wifi.c
@@ -43,7 +43,7 @@ static void WifiStatusCallback(WiFiEvent status, void* arg)
         sys_config->micoSystemConfig.reserved = status;
         mico_system_context_update(sys_config);
 
-        ap_init(); //打开AP
+        ApInit(); //打开AP
 
         wifi_status = WIFI_STATE_NOCONNECT;
         if (!mico_rtos_is_timer_running(&wifi_led_timer))
@@ -139,7 +139,7 @@ void WifiConnect(char* wifi_ssid, char* wifi_key)
     wifi_status = WIFI_STATE_NOCONNECT;
 }
 
-void StationInit(void)
+void WifiInit(void)
 {
     //wifi状态下led闪烁定时器初始化
     mico_rtos_init_timer(&wifi_led_timer, 100, (void *) WifiLedTimerCallback, NULL);
diff --git a/TC1/user_wifi.h b/TC1/user_wifi.h
index 42ce291..d4477b4 100644
--- a/TC1/user_wifi.h
+++ b/TC1/user_wifi.h
@@ -19,7 +19,7 @@ extern char* wifi_ret;
 
 extern char wifi_status;
 
-extern void StationInit(void);
+extern void WifiInit(void);
 extern void ApInit(void);
 extern void WifiConnect(char* wifi_ssid, char* wifi_key);