Browse Source

update: 调整airkiss/esptouch配网的系统消息发送时机,不等待相关协议向配网发起方的协议回包

Wendal Chen 2 years ago
parent
commit
6d0968c127
1 changed files with 4 additions and 7 deletions
  1. 4 7
      src/app/oneshotconfig/wm_wifi_oneshot.c

+ 4 - 7
src/app/oneshotconfig/wm_wifi_oneshot.c

@@ -1575,6 +1575,10 @@ void tls_oneshot_task_handle(void *arg)
            tls_netif_remove_status_event(wm_oneshot_netif_status_event);
            tls_netif_remove_status_event(wm_oneshot_netif_status_event);
            if (1 == glast_ucOneshotPsFlag)
            if (1 == glast_ucOneshotPsFlag)
 		   {
 		   {
+				if (gpfResult) {
+					// printf("CALL gpfResult\n");
+					gpfResult(WM_WIFI_ONESHOT_TYPE_SSIDPWD);
+				}
 #if TLS_CONFIG_AIRKISS_MODE_ONESHOT
 #if TLS_CONFIG_AIRKISS_MODE_ONESHOT
 				if (is_airkiss)
 				if (is_airkiss)
 				{
 				{
@@ -1590,13 +1594,6 @@ void tls_oneshot_task_handle(void *arg)
 #endif
 #endif
 				}
 				}
            }
            }
-			if (gpfResult) {
-				// printf("CALL gpfResult\n");
-				gpfResult(WM_WIFI_ONESHOT_TYPE_SSIDPWD);
-			}
-			else {
-				// printf("gpfResult is NULL\n");
-			}
            break;
            break;
 
 
 #if TLS_CONFIG_AP_MODE_ONESHOT
 #if TLS_CONFIG_AP_MODE_ONESHOT