diff --git a/APP_Framework/Framework/connection/wifi/Kconfig b/APP_Framework/Framework/connection/wifi/Kconfig
index 11617b352..9afa7bf28 100644
--- a/APP_Framework/Framework/connection/wifi/Kconfig
+++ b/APP_Framework/Framework/connection/wifi/Kconfig
@@ -7,3 +7,11 @@ config ADAPTER_HFA21_WIFI
 if ADAPTER_HFA21_WIFI
     source "$APP_DIR/Framework/connection/wifi/hfa21_wifi/Kconfig"
 endif
+
+config ADAPTER_ESP07S_WIFI
+        bool "Using wifi adapter device esp07s"
+        default n
+
+if ADAPTER_ESP07S_WIFI
+    source "$APP_DIR/Framework/connection/wifi/esp07s_wifi/Kconfig"
+endif 
diff --git a/APP_Framework/Framework/connection/wifi/Makefile b/APP_Framework/Framework/connection/wifi/Makefile
index 3e08f0652..2930fd977 100644
--- a/APP_Framework/Framework/connection/wifi/Makefile
+++ b/APP_Framework/Framework/connection/wifi/Makefile
@@ -4,4 +4,8 @@ ifeq ($(CONFIG_ADAPTER_HFA21_WIFI),y)
 	SRC_DIR += hfa21_wifi
 endif
 
+ifeq ($(CONFIG_ADAPTER_ESP07S_WIFI),y)
+	SRC_DIR += esp07s_wifi
+endif
+
 include $(KERNEL_ROOT)/compiler.mk
diff --git a/APP_Framework/Framework/connection/wifi/adapter_wifi.c b/APP_Framework/Framework/connection/wifi/adapter_wifi.c
index ab6ea8ca6..c4fab060a 100644
--- a/APP_Framework/Framework/connection/wifi/adapter_wifi.c
+++ b/APP_Framework/Framework/connection/wifi/adapter_wifi.c
@@ -24,6 +24,9 @@
 #ifdef ADAPTER_HFA21_WIFI
 extern AdapterProductInfoType Hfa21WifiAttach(struct Adapter *adapter);
 #endif
+#ifdef ADAPTER_ESP07S_WIFI
+extern AdapterProductInfoType Esp07sWifiAttach(struct Adapter *adapter);
+#endif
 
 #define ADAPTER_WIFI_NAME "wifi"
 
@@ -77,6 +80,19 @@ int AdapterWifiInit(void)
     adapter->info = product_info;
     adapter->done = product_info->model_done;
 
+#endif
+#ifdef ADAPTER_ESP07S_WIFI
+    AdapterProductInfoType product_info = Esp07sWifiAttach(adapter);
+    if (!product_info) {
+        printf("AdapterWifiInit ESP07S attach error\n");
+        PrivFree(adapter);
+        return -1;
+    }
+
+    adapter->product_info_flag = 1;
+    adapter->info = product_info;
+    adapter->done = product_info->model_done;
+
 #endif
 
     return ret;
diff --git a/APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig b/APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig
new file mode 100755
index 000000000..3c2bbfb7e
--- /dev/null
+++ b/APP_Framework/Framework/connection/wifi/esp07s_wifi/Kconfig
@@ -0,0 +1,33 @@
+config ADAPTER_WIFI_ESP07S
+        string "ESP07S WIFI adapter name"
+        default "esp07s_wifi"
+
+if ADD_XIZI_FETURES
+
+        config ADAPTER_ESP07S_DRIVER_EXTUART
+                bool "Using extra uart to support wifi"
+                default n
+
+        config ADAPTER_ESP07S_DRIVER
+                string "ESP07S device uart driver path"
+                default "/dev/usart2_dev2"
+                depends on !ADAPTER_ESP07S_DRIVER_EXTUART
+
+        if ADAPTER_ESP07S_DRIVER_EXTUART                    
+                config ADAPTER_ESP07S_DRIVER
+                        string "ESP07S device extra uart driver path"
+                        default "/dev/extuart_dev6"
+
+                config ADAPTER_ESP07S_DRIVER_EXT_PORT
+                        int "if ESP07S device using extuart, choose port"
+                        default "6"
+        endif
+endif
+
+if ADD_NUTTX_FETURES
+
+endif
+
+if ADD_RTTHREAD_FETURES
+
+endif
diff --git a/APP_Framework/Framework/connection/wifi/esp07s_wifi/Makefile b/APP_Framework/Framework/connection/wifi/esp07s_wifi/Makefile
new file mode 100755
index 000000000..e0ce0a8ac
--- /dev/null
+++ b/APP_Framework/Framework/connection/wifi/esp07s_wifi/Makefile
@@ -0,0 +1,3 @@
+SRC_FILES := esp07s_wifi.c
+
+include $(KERNEL_ROOT)/compiler.mk
diff --git a/APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c b/APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c
new file mode 100755
index 000000000..f6ab7feb5
--- /dev/null
+++ b/APP_Framework/Framework/connection/wifi/esp07s_wifi/esp07s_wifi.c
@@ -0,0 +1,524 @@
+/*
+* Copyright (c) 2020 AIIT XUOS Lab
+* XiUOS is licensed under Mulan PSL v2.
+* You can use this software according to the terms and conditions of the Mulan PSL v2.
+* You may obtain a copy of Mulan PSL v2 at:
+*        http://license.coscl.org.cn/MulanPSL2
+* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+* See the Mulan PSL v2 for more details.
+*/
+
+/**
+ * @file esp07_wifi.c
+ * @brief Implement the connection wifi adapter function, using ESP07S device
+ * @version 1.1
+ * @author AIIT XUOS Lab
+ * @date 2022.04.08
+ */
+
+#include <adapter.h>
+#include <at_agent.h>
+
+#define LEN_PARA_BUF 128
+
+static int Esp07sWifiSetDown(struct Adapter *adapter_at);
+
+/**
+ * @description: enter AT command mode
+ * @param at_agent - wifi device agent pointer
+ * @return success: EOK
+ */
+static int Esp07sWifiInitAtCmd(ATAgentType at_agent)
+{
+    ATOrderSend(at_agent, REPLY_TIME_OUT, NULL, "+++");
+    PrivTaskDelay(100);
+
+    ATOrderSend(at_agent, REPLY_TIME_OUT, NULL, "a");
+    PrivTaskDelay(500);
+
+    return 0;
+}
+
+/**
+ * @description: Open wifi
+ * @param adapter - wifi device pointer
+ * @return success: EOK, failure: ENOMEMORY
+ */
+static int Esp07sWifiOpen(struct Adapter *adapter)
+{
+    /*step1: open esp07s serial port*/
+    adapter->fd = PrivOpen(ADAPTER_ESP07S_DRIVER, O_RDWR);
+    if (adapter->fd < 0) {
+        printf("Esp07sWifiOpen get serial %s fd error\n", ADAPTER_ESP07S_DRIVER);
+        return -1;
+    }
+
+    /*step2: init AT agent*/
+    if (!adapter->agent) {
+        char *agent_name = "wifi_uart_client";
+        if (EOK != InitATAgent(agent_name, adapter->fd, 512)) {
+            printf("at agent init failed !\n");
+            return -1;
+        }
+        ATAgentType at_agent = GetATAgent(agent_name);
+
+        adapter->agent = at_agent;
+    }
+
+    ADAPTER_DEBUG("Esp07sWifi open done\n");
+
+    return 0;
+}
+
+/**
+ * @description: Close wifi
+ * @param adapter - wifi device pointer
+ * @return success: EOK
+ */
+static int Esp07sWifiClose(struct Adapter *adapter)
+{
+    return Esp07sWifiSetDown(adapter);
+}
+
+/**
+ * @description: send data to adapter
+ * @param adapter - wifi device pointer
+ * @param data - data buffer
+ * @param data - data length
+ * @return success: EOK
+ */
+static int Esp07sWifiSend(struct Adapter *adapter, const void *data, size_t len)
+{
+    x_err_t result = EOK;
+    if (adapter->agent) {
+        EntmSend(adapter->agent, (const char *)data, len);
+    }else {
+        printf("Esp07sWifiSend can not find agent!\n");
+	}
+
+__exit:
+
+    return result;
+}
+
+/**
+ * @description: receive data from adapter
+ * @param adapter - wifi device pointer
+ * @param data - data buffer
+ * @param data - data length
+ * @return success: EOK
+ */
+static int Esp07sWifiReceive(struct Adapter *adapter, void *rev_buffer, size_t buffer_len)
+{
+    x_err_t result = EOK;
+    printf("esp07s receive waiting ... \n");
+
+    if (adapter->agent) {
+        return EntmRecv(adapter->agent, (char *)rev_buffer, buffer_len, 40);
+    } else {
+        printf("Esp07sWifiReceive can not find agent!\n");
+	}
+
+__exit:
+
+    return result;
+}
+
+/**
+ * @description: connnect wifi to internet
+ * @param adapter - wifi device pointer
+ * @return success: EOK
+ */
+static int Esp07sWifiSetUp(struct Adapter *adapter)
+{
+    uint8 wifi_ssid[LEN_PARA_BUF] = "AIIT-Guest";
+    uint8 wifi_pwd[LEN_PARA_BUF] = "";
+    char cmd[LEN_PARA_BUF];
+
+    struct ATAgent *agent = adapter->agent;
+
+    /* wait esp07s device startup finish */
+    PrivTaskDelay(5000);
+
+    Esp07sWifiInitAtCmd(agent);
+
+    memset(cmd,0,sizeof(cmd));
+    strcpy(cmd,"AT+FCLR\r");
+    ATOrderSend(agent, REPLY_TIME_OUT, NULL, cmd);
+    PrivTaskDelay(20000);
+
+    Esp07sWifiInitAtCmd(agent);
+
+    memset(cmd,0,sizeof(cmd));
+    strcpy(cmd,"AT+WSSSID=");
+    strcat(cmd,wifi_ssid);
+    strcat(cmd,"\r");
+    ATOrderSend(agent, REPLY_TIME_OUT, NULL, cmd);
+    PrivTaskDelay(2500);
+    
+    memset(cmd,0,sizeof(cmd));
+    strcpy(cmd,"AT+WSKEY=OPEN,NONE,");
+    strcat(cmd,wifi_pwd);
+    strcat(cmd,"\r");
+    ATOrderSend(agent, REPLY_TIME_OUT, NULL, cmd);
+    PrivTaskDelay(2500);
+
+    memset(cmd,0,sizeof(cmd));
+    strcpy(cmd,"AT+WMODE=sta\r");
+    ATOrderSend(agent, REPLY_TIME_OUT, NULL, cmd);
+    PrivTaskDelay(2500);
+
+    memset(cmd,0,sizeof(cmd));
+    strcat(cmd,"AT+Z\r");
+    ATOrderSend(agent, REPLY_TIME_OUT, NULL, cmd);
+    PrivTaskDelay(10000);
+
+    return 0;
+}
+
+/**
+ * @description: disconnnect wifi from internet
+ * @param adapter - wifi device pointer
+ * @return success: EOK
+ */
+static int Esp07sWifiSetDown(struct Adapter *adapter)
+{
+    Esp07sWifiInitAtCmd(adapter->agent);
+
+    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+FCLR\r");
+    PrivTaskDelay(20000);
+
+    return 0;
+}
+
+/**
+ * @description: set wifi ip/gateway/netmask address(in sta mode)
+ * @param adapter - wifi device pointer
+ * @param ip - ip address
+ * @param gateway - gateway address
+ * @param netmask - netmask address
+ * @return success: EOK, failure: ENOMEMORY
+ */
+static int Esp07sWifiSetAddr(struct Adapter *adapter, const char *ip, const char *gateway, const char *netmask)
+{
+    #define ESP07S_SET_ADDR_EXPRESSION        "+ok=%[^,],%[^,],%[^,],%[^,]\r"
+    char *dhcp_mode =NULL;
+    char *ip_str = NULL;
+    char *gw_str = NULL;
+    char *mask_str = NULL;
+
+    dhcp_mode = (char *) PrivCalloc(1, 8);
+    ip_str = (char *) PrivCalloc(1, 17);
+    gw_str = (char *) PrivCalloc(1, 17);
+    mask_str = (char *) PrivCalloc(1, 17);
+
+    Esp07sWifiInitAtCmd(adapter->agent);
+
+    x_err_t result = EOK;
+
+    ATReplyType reply = CreateATReply(64);
+    if (NULL == reply) {
+        printf("at_create_resp failed ! \n");
+        result = ENOMEMORY;
+        goto __exit;
+    }
+
+    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+WANN=%s,%s,%s,%s\r", "dhcp", ip, netmask, gateway);
+    PrivTaskDelay(2500);
+
+    ATOrderSend(adapter->agent, REPLY_TIME_OUT, reply, "AT+WANN\r");
+    PrivTaskDelay(2500);
+
+    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+Z\r");
+    PrivTaskDelay(10000);
+
+    const char * result_buf = GetReplyText(reply);
+
+    char* str = strstr(result_buf, "+ok=");
+
+    ParseATReply(str, ESP07S_SET_ADDR_EXPRESSION, dhcp_mode,ip_str,mask_str,gw_str);
+    printf("after configure:\n mode:%s\n ip:%s\n netmask:%s\n gateway:%s\n", dhcp_mode, ip_str, mask_str, gw_str);
+
+__exit:
+    if (reply) {
+        DeleteATReply(reply);
+    }
+
+    return result;
+}
+
+/**
+ * @description: wifi ping function
+ * @param adapter - wifi device pointer
+ * @param destination - domain name or ip address
+ * @return success: EOK, failure: ENOMEMORY
+ */
+static int Esp07sWifiPing(struct Adapter *adapter, const char *destination)
+{
+    char *ping_result = NONE;
+    char *dst = NONE;
+    ping_result = (char *) PrivCalloc(1, 17);
+    dst = (char *) PrivCalloc(1, 17);
+    strcpy(dst, destination);
+    strcat(dst, "\r");
+
+    Esp07sWifiInitAtCmd(adapter->agent);
+
+    uint32 result = EOK;
+
+    ATReplyType reply = CreateATReply(64);
+    if (NULL == reply) {
+        printf("at_create_resp failed ! \n");
+        result = ENOMEMORY;
+        goto __exit;
+    }
+
+    //ping baidu.com
+    ATOrderSend(adapter->agent, REPLY_TIME_OUT, reply, "AT+PING=%s", dst);
+
+    PrivTaskDelay(2500);
+
+    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+Z\r");
+    PrivTaskDelay(10000);
+
+    const char * result_buf = GetReplyText(reply);
+
+    char* str = strstr(result_buf, "+ok=");
+
+    ParseATReply(str, "+ok=%s\r", ping_result);
+
+    printf("ping www.baidu.com(36.152.44.95) result is:%s\n", ping_result);
+
+__exit:
+    if (reply) {
+        DeleteATReply(reply);
+    }
+
+    return result;
+}
+
+/**
+ * @description: display wifi network configuration
+ * @param adapter - wifi device pointer
+ * @return success: EOK, failure: ENOMEMORY
+ */
+static int Esp07sWifiNetstat(struct Adapter *adapter)
+{
+    #define ESP07S_NETSTAT_RESP_SIZE         320
+    #define ESP07S_NETSTAT_TYPE_SIZE         10
+    #define ESP07S_NETSTAT_IPADDR_SIZE       17
+    #define ESP07S_WANN_EXPRESSION        "+ok=%[^,],%[^,],%[^,],%[^,]\r"
+    #define ESP07S_LANN_EXPRESSION        "+ok=%[^,],%[^,]\r"
+    #define ESP07S_WMODE_EXPRESSION       "+ok=%s\r"
+
+    ATReplyType reply = NULL;
+    struct ATAgent *agent = adapter->agent;
+    uint32 result;
+    char * result_buf = NULL;
+    char * str = NULL;
+
+    /* sta/ap */
+    char *work_mode = NULL;
+    /* dhcp/static */
+    char *ip_mode = NULL;
+    char *local_ipaddr = NULL;
+    char *gateway = NULL;
+    char *netmask = NULL;
+    local_ipaddr = (char *) PrivCalloc(1, ESP07S_NETSTAT_IPADDR_SIZE);
+    gateway = (char *) PrivCalloc(1, ESP07S_NETSTAT_IPADDR_SIZE);
+    netmask = (char *) PrivCalloc(1, ESP07S_NETSTAT_IPADDR_SIZE);
+    work_mode = (char *) PrivCalloc(1, ESP07S_NETSTAT_IPADDR_SIZE);
+    ip_mode = (char *) PrivCalloc(1, ESP07S_NETSTAT_IPADDR_SIZE);
+
+    reply = CreateATReply(ESP07S_NETSTAT_RESP_SIZE);
+    if (reply == NULL) {
+        result = ENOMEMORY;
+        goto __exit;
+    }
+
+    ATOrderSend(agent, REPLY_TIME_OUT, NULL, "+++");
+    PrivTaskDelay(100);
+
+    ATOrderSend(agent, REPLY_TIME_OUT, NULL, "a");
+    PrivTaskDelay(2500);
+
+    ATOrderSend(agent, REPLY_TIME_OUT, reply, "AT+WMODE\r");
+    PrivTaskDelay(2500);
+
+    result_buf = GetReplyText(reply);
+
+    str = strstr(result_buf, "+ok=");
+    /* parse the third line of response data, get the network connection information */
+    ParseATReply(str, ESP07S_WMODE_EXPRESSION, work_mode);
+
+    if (work_mode[0]=='S') {
+        if (ATOrderSend(agent, REPLY_TIME_OUT, reply, "AT+WANN\r") < 0) {
+            goto __exit;
+        }
+
+        PrivTaskDelay(2500);
+
+        GetReplyText(reply);
+        str = strstr(result_buf, "+ok=");
+        /* parse the third line of response data, get the network connection information */
+        ParseATReply(str, ESP07S_WANN_EXPRESSION, ip_mode, local_ipaddr, netmask, gateway);
+    } else {
+        ATOrderSend(agent, REPLY_TIME_OUT, reply, "AT+LANN\r");
+        PrivTaskDelay(2500);
+
+        GetReplyText(reply);
+
+        str = strstr(result_buf, "+ok=");
+        /* parse the third line of response data, get the network connection information */
+        ParseATReply(str, ESP07S_LANN_EXPRESSION, local_ipaddr, netmask);
+    }
+
+    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+Z\r");
+    PrivTaskDelay(10000);
+
+    printf("work mode: %s\n", work_mode);
+    if (work_mode[0]=='S')
+        printf("ip mode: %s\nlocal ip: %s\nnetmask: %s\ngateway: %s\n", ip_mode, local_ipaddr, netmask, gateway);
+    else
+        printf("local ip: %s\nnetmask: %s\n", local_ipaddr, netmask);
+
+    return EOK;
+
+__exit:
+    if (reply)
+        DeleteATReply(reply);
+    if (local_ipaddr)
+        PrivFree(local_ipaddr);
+    if (netmask)
+        PrivFree(netmask);
+    if (gateway)
+        PrivFree(gateway);
+    if (work_mode)
+        PrivFree(work_mode);
+}
+
+/**
+ * @description: wifi connect function
+ * @param adapter - wifi device pointer
+ * @param net_role - net role, CLIENT or SERVER
+ * @param ip - ip address
+ * @param port - port num
+ * @param ip_type - ip type, IPV4 or IPV6
+ * @return success: 0, failure: -1
+ */
+static int Esp07sWifiConnect(struct Adapter *adapter, enum NetRoleType net_role, const char *ip, const char *port, enum IpType ip_type)
+{
+    int result = EOK;
+    ATReplyType reply = NONE;
+    char cmd[LEN_PARA_BUF];
+    struct ATAgent *agent = adapter->agent;
+
+    reply = CreateATReply(64);
+    if (reply == NONE) {
+        printf("no memory for reply struct.");
+        return ENOMEMORY;
+    }
+
+    Esp07sWifiInitAtCmd(adapter->agent);
+
+    memset(cmd,0,sizeof(cmd));
+    strcpy(cmd,"AT+NETP=TCP,");
+    if(net_role == CLIENT)
+        strcat(cmd,"CLIENT,");
+    else if(net_role == SERVER)
+        strcat(cmd,"SERVER,");
+    strcat(cmd,port);
+    strcat(cmd,",");
+    if(ip_type == IPV4)
+        strcat(cmd,ip);
+    else if(ip_type == IPV6)
+    {
+        
+    }
+    strcat(cmd,"\r");
+    ATOrderSend(agent, REPLY_TIME_OUT, NULL, cmd);
+    PrivTaskDelay(2500);
+
+    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, "AT+Z\r");
+    PrivTaskDelay(10000);
+
+    adapter->net_role = net_role;
+
+__exit:
+    if (reply) {
+        DeleteATReply(reply);
+    }
+
+    return result;
+}
+
+static int Esp07sWifiIoctl(struct Adapter *adapter, int cmd, void *args)
+{
+    if (OPE_INT != cmd) {
+        printf("Esp07sWifiIoctl only support OPE_INT, do not support %d\n", cmd);
+        return -1;
+    }
+
+    uint32_t baud_rate = *((uint32_t *)args);
+
+    struct SerialDataCfg serial_cfg;
+    memset(&serial_cfg, 0 ,sizeof(struct SerialDataCfg));
+    serial_cfg.serial_baud_rate = baud_rate;
+    serial_cfg.serial_data_bits = DATA_BITS_8;
+    serial_cfg.serial_stop_bits = STOP_BITS_1;
+    serial_cfg.serial_buffer_size = SERIAL_RB_BUFSZ;
+    serial_cfg.serial_parity_mode = PARITY_NONE;
+    serial_cfg.serial_bit_order = BIT_ORDER_LSB;
+    serial_cfg.serial_invert_mode = NRZ_NORMAL;
+#ifdef ADAPTER_ESP07S_DRIVER_EXT_PORT
+    serial_cfg.ext_uart_no = ADAPTER_ESP07S_DRIVER_EXT_PORT;
+    serial_cfg.port_configure = PORT_CFG_INIT;
+#endif
+
+    struct PrivIoctlCfg ioctl_cfg;
+    ioctl_cfg.ioctl_driver_type = SERIAL_TYPE;
+    ioctl_cfg.args = &serial_cfg;
+    PrivIoctl(adapter->fd, OPE_INT, &ioctl_cfg);
+    printf("Esp07sWifiIoctl success\n");
+    return 0;
+}
+
+static const struct IpProtocolDone esp07s_wifi_done =
+{
+    .open = Esp07sWifiOpen,
+    .close =  Esp07sWifiClose,
+    .ioctl = Esp07sWifiIoctl,
+    .setup = Esp07sWifiSetUp,
+    .setdown = Esp07sWifiSetDown,
+    .setaddr = Esp07sWifiSetAddr,
+    .setdns = NULL,
+    .setdhcp = NULL,
+    .ping = Esp07sWifiPing,
+    .netstat = Esp07sWifiNetstat,
+    .connect = Esp07sWifiConnect,
+    .send = Esp07sWifiSend,
+    .recv = Esp07sWifiReceive,
+    .disconnect = NULL,
+};
+
+/**
+ * @description: Register wifi device esp07s
+ * @return success: EOK, failure: ERROR
+ */
+AdapterProductInfoType Esp07sWifiAttach(struct Adapter *adapter)
+{
+    struct AdapterProductInfo *product_info = PrivMalloc(sizeof(struct AdapterProductInfo));
+    if (!product_info) {
+        printf("Esp07sWifiAttach Attach malloc product_info error\n");
+        PrivFree(product_info);
+        return NULL;
+    }
+
+    strcpy(product_info->model_name, ADAPTER_WIFI_ESP07S);
+
+    product_info->model_done = (void *)&esp07s_wifi_done;
+
+    return product_info;
+}
\ No newline at end of file