diff --git a/APP_Framework/Applications/framework_init.c b/APP_Framework/Applications/framework_init.c
index d0915952..d21aeb7a 100644
--- a/APP_Framework/Applications/framework_init.c
+++ b/APP_Framework/Applications/framework_init.c
@@ -17,6 +17,7 @@ extern int SensorFrameworkInit(void);
 extern int AdapterFrameworkInit(void);
 
 extern int Adapter4GInit(void);
+extern int AdapterNbiotInit(void);
 extern int AdapterBlueToothInit(void);
 extern int AdapterWifiInit(void);
 extern int AdapterZigbeeInit(void);
@@ -94,6 +95,9 @@ static struct InitDesc connection_desc[] =
 #ifdef CONNECTION_ADAPTER_4G
 	{ "4G adpter", Adapter4GInit},
 #endif
+#ifdef CONNECTION_ADAPTER_NB
+	{ "NB adpter", AdapterNbiotInit},
+#endif
 #ifdef CONNECTION_ADAPTER_ZIGBEE
 	{ "zigbee adpter", AdapterZigbeeInit},
 #endif
diff --git a/APP_Framework/Framework/connection/adapter_agent.c b/APP_Framework/Framework/connection/adapter_agent.c
index 401dec9a..5cc8d9d5 100755
--- a/APP_Framework/Framework/connection/adapter_agent.c
+++ b/APP_Framework/Framework/connection/adapter_agent.c
@@ -309,9 +309,9 @@ static int GetCompleteATReply(ATAgentType agent)
 
     while (1) {
         PrivRead(agent->fd, &ch, 1);
-
+#ifdef CONNECTION_FRAMEWORK_DEBUG
         printf(" %c (0x%x)\n", ch, ch);
-
+#endif
         if (agent->receive_mode == ENTM_MODE){
             if (agent->entm_recv_len < ENTM_RECV_MAX) {
                 PrivMutexObtain(&agent->lock); 
diff --git a/APP_Framework/Framework/connection/at_agent.h b/APP_Framework/Framework/connection/at_agent.h
index 4f690f50..794c27bb 100755
--- a/APP_Framework/Framework/connection/at_agent.h
+++ b/APP_Framework/Framework/connection/at_agent.h
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#define REPLY_TIME_OUT 3000
+#define REPLY_TIME_OUT 3
 
 enum ReceiveMode
 {
diff --git a/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c b/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c
index 44cff9c8..ddba196a 100644
--- a/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c
+++ b/APP_Framework/Framework/connection/bluetooth/hc08/hc08.c
@@ -355,7 +355,7 @@ static int Hc08Send(struct Adapter *adapter, const void *buf, size_t len)
 static int Hc08Recv(struct Adapter *adapter, void *buf, size_t len)
 {
     if (adapter->agent) {
-        return EntmRecv(adapter->agent, (char *)buf, len, 40000);
+        return EntmRecv(adapter->agent, (char *)buf, len, 40);
     } else {
         printf("Hc08Recv can not find agent\n");
 	}
diff --git a/APP_Framework/Framework/connection/nbiot/Kconfig b/APP_Framework/Framework/connection/nbiot/Kconfig
index e69de29b..bf9a087d 100644
--- a/APP_Framework/Framework/connection/nbiot/Kconfig
+++ b/APP_Framework/Framework/connection/nbiot/Kconfig
@@ -0,0 +1,10 @@
+if CONNECTION_ADAPTER_NB
+    config ADAPTER_BC28
+            bool "Using nbiot adapter device BC28"
+            default y
+    
+    if ADAPTER_BC28
+        source "$APP_DIR/Framework/connection/nbiot/bc28/Kconfig"
+    endif
+        
+endif
diff --git a/APP_Framework/Framework/connection/nbiot/Makefile b/APP_Framework/Framework/connection/nbiot/Makefile
index 3dc3423a..29f2e7d1 100644
--- a/APP_Framework/Framework/connection/nbiot/Makefile
+++ b/APP_Framework/Framework/connection/nbiot/Makefile
@@ -1,3 +1,7 @@
 SRC_FILES := adapter_nbiot.c
 
+ifeq ($(CONFIG_ADAPTER_BC28),y)
+	SRC_DIR += bc28
+endif
+
 include $(KERNEL_ROOT)/compiler.mk
diff --git a/APP_Framework/Framework/connection/nbiot/adapter_nbiot.c b/APP_Framework/Framework/connection/nbiot/adapter_nbiot.c
index 04f98462..e4ef085d 100644
--- a/APP_Framework/Framework/connection/nbiot/adapter_nbiot.c
+++ b/APP_Framework/Framework/connection/nbiot/adapter_nbiot.c
@@ -17,3 +17,156 @@
  * @author AIIT XUOS Lab
  * @date 2021.06.25
  */
+#include <adapter.h>
+
+
+#ifdef ADAPTER_BC28
+extern AdapterProductInfoType BC28Attach(struct Adapter *adapter);
+#endif
+
+#define ADAPTER_NBIOT_NAME "nbiot"
+
+static int AdapterNbiotRegister(struct Adapter *adapter)
+{
+    int ret = 0;
+
+    strncpy(adapter->name, ADAPTER_NBIOT_NAME, NAME_NUM_MAX); 
+ 
+    adapter->net_protocol = IP_PROTOCOL;
+    adapter->net_role = CLIENT;
+
+    adapter->adapter_status = UNREGISTERED;
+
+    ret = AdapterDeviceRegister(adapter);
+    if (ret < 0) {
+        printf("AdapterNbiot register error\n");
+        return -1;
+    }
+
+    return ret;
+}
+
+int AdapterNbiotInit(void)
+{
+    int ret = 0;
+
+    struct Adapter *adapter = malloc(sizeof(struct Adapter));
+    if (!adapter) {
+        printf("malloc adapter failed.\n");
+        return -1;
+    }
+    memset(adapter, 0, sizeof(struct Adapter));
+    ret = AdapterNbiotRegister(adapter);
+    if (ret < 0) {
+        printf("register nbiot adapter error\n");
+        free(adapter);
+        return -1;
+    }
+#ifdef ADAPTER_BC28
+    AdapterProductInfoType product_info = BC28Attach(adapter);
+    if (!product_info) {
+        printf("bc28 attach error\n");
+        free(adapter);
+        return -1;
+    }
+
+    adapter->product_info_flag = 1;
+    adapter->info = product_info;
+    adapter->done = product_info->model_done;
+#endif
+
+    return ret;
+}
+
+/******************TEST*********************/
+int opennb(void)
+{
+    int ret = 0;
+
+    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_NBIOT_NAME);
+
+#ifdef ADAPTER_BC28
+    ret = AdapterDeviceOpen(adapter);
+    if(ret < 0){
+        printf("open adapter failed\n");
+        return -1;
+    }
+
+#endif
+
+     return 0;    
+ }
+ SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, opennb, opennb, show adapter nb information);
+int closenb(void)
+{
+    int ret = 0;
+
+    struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_NBIOT_NAME);
+
+#ifdef ADAPTER_BC28
+    ret = AdapterDeviceClose(adapter);
+    if(ret < 0){
+        printf("open adapter failed\n");
+        return -1;
+    }
+
+#endif
+
+     return 0;    
+ }
+ SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, closenb, closenb, show adapter nb information);
+ 
+ int connectnb(int argc, char *argv[])
+ {
+     const char *send_msg = argv[1];
+     int ret = 0;
+
+     struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_NBIOT_NAME);
+
+    
+     ret = AdapterDeviceConnect(adapter, 1, "101.68.82.219","9898",1);
+     if(ret < 0){
+         printf(" adapter send failed\n");
+         return -1;
+     }
+    
+
+
+     return 0;    
+ }
+ SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(2)|SHELL_CMD_DISABLE_RETURN, connectnb, connectnb, show adapter nb information);
+
+ int sendnb(int argc, char *argv[])
+ {
+     const char *send_msg = argv[1];
+     int msg_len = atoi(argv[2]);
+     int ret = 0;
+
+     struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_NBIOT_NAME);
+
+     printf("send argv1 %s len = %d\n",argv[1],msg_len);
+     ret = AdapterDeviceSend(adapter, send_msg, msg_len);
+     if(ret < 0){
+         printf(" adapter send failed\n");
+         return -1;
+     }
+     printf("nb send msg %s\n", send_msg);
+
+
+     return 0;    
+ }
+ SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_MAIN)|SHELL_CMD_PARAM_NUM(2)|SHELL_CMD_DISABLE_RETURN, sendnb, sendnb, show adapter nb information);
+
+ int recvnb(void)
+ {
+     char recv_msg[128];
+     struct Adapter* adapter =  AdapterDeviceFindByName(ADAPTER_NBIOT_NAME);
+     memset(recv_msg,0,128);
+     AdapterDeviceRecv(adapter, recv_msg, 128);
+     PrivTaskDelay(2000);
+     printf("nb recv msg %s\n", recv_msg);
+
+     return 0;    
+ }
+ SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0)|SHELL_CMD_DISABLE_RETURN, recvnb, recvnb, show adapter nb information);
+
diff --git a/APP_Framework/Framework/connection/nbiot/adapter_nbiot.h b/APP_Framework/Framework/connection/nbiot/adapter_nbiot.h
new file mode 100644
index 00000000..97c69862
--- /dev/null
+++ b/APP_Framework/Framework/connection/nbiot/adapter_nbiot.h
@@ -0,0 +1,12 @@
+#ifndef ADAPTER_NBIOT_H
+#define ADAPTER_NBIOT_H
+
+#define CONFIG_NBIOT_RESET            (0)
+#define CONFIG_NBIOT_CREATE_SOCKET    (1)
+#define CONFIG_NBIOT_DELETE_SOCKET    (2)
+
+#define SOCKET_TYPE_DGRAM   (0)
+#define SOCKET_TYPE_STREAM  (1)
+
+
+#endif
\ No newline at end of file
diff --git a/APP_Framework/Framework/connection/nbiot/bc28/Kconfig b/APP_Framework/Framework/connection/nbiot/bc28/Kconfig
index e69de29b..6f7d7500 100644
--- a/APP_Framework/Framework/connection/nbiot/bc28/Kconfig
+++ b/APP_Framework/Framework/connection/nbiot/bc28/Kconfig
@@ -0,0 +1,40 @@
+config ADAPTER_NBIOT_BC28
+        string "BC28 adapter name"
+        default "bc28"
+
+if ADD_XIUOS_FETURES
+        config ADAPTER_BC28_RESETPIN
+                int "BC28 RESET pin number"
+                default "100"
+
+        config ADAPTER_BC28_PIN_DRIVER
+                string "BC28 device pin driver path"
+                default "/dev/pin_dev"
+
+        config ADAPTER_BC28_DRIVER_EXTUART
+                bool "Using extra uart to support nbiot"
+                default n
+
+        config ADAPTER_BC28_DRIVER
+                string "BC28 device uart driver path"
+                default "/dev/usart2_dev2"
+                depends on !ADAPTER_BC28_DRIVER_EXTUART
+
+        if ADAPTER_BC28_DRIVER_EXTUART                    
+                config ADAPTER_BC28_DRIVER
+                        string "BC28 device extra uart driver path"
+                        default "/dev/extuart_dev5"
+
+                config ADAPTER_BC28_DRIVER_EXT_PORT
+                        int "if BC28 device using extuart, choose port"
+                        default "5"
+        endif
+endif
+
+if ADD_NUTTX_FETURES
+
+endif
+
+if ADD_RTTHREAD_FETURES
+
+endif
diff --git a/APP_Framework/Framework/connection/nbiot/bc28/Makefile b/APP_Framework/Framework/connection/nbiot/bc28/Makefile
index e69de29b..3963d112 100644
--- a/APP_Framework/Framework/connection/nbiot/bc28/Makefile
+++ b/APP_Framework/Framework/connection/nbiot/bc28/Makefile
@@ -0,0 +1,3 @@
+SRC_FILES := bc28.c
+
+include $(KERNEL_ROOT)/compiler.mk
\ No newline at end of file
diff --git a/APP_Framework/Framework/connection/nbiot/bc28/bc28.c b/APP_Framework/Framework/connection/nbiot/bc28/bc28.c
index e69de29b..7135b091 100644
--- a/APP_Framework/Framework/connection/nbiot/bc28/bc28.c
+++ b/APP_Framework/Framework/connection/nbiot/bc28/bc28.c
@@ -0,0 +1,551 @@
+/*
+* 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 bc28.c
+ * @brief Implement the connection nbiot adapter function, using BC28 device
+ * @version 1.1
+ * @author AIIT XUOS Lab
+ * @date 2021.09.15
+ */
+
+#include <adapter.h>
+#include <at_agent.h>
+#include "../adapter_nbiot.h"
+
+#define SOCKET_PROTOCOL_TCP  (6)
+#define SOCKET_PROTOCOL_UDP  (17)
+
+#define NET_TYPE_AF_INET   (0)
+#define NET_TYPE_AF_INET6  (1)
+
+#define SOCKET_INVALID_ID  (-1)
+
+
+static int BC28UartOpen(struct Adapter *adapter)
+{
+    if (NULL == adapter) {
+        return -1;
+    }
+
+    /* Open device in read-write mode */
+    adapter->fd = PrivOpen(ADAPTER_BC28_DRIVER,O_RDWR);
+    if (adapter->fd < 0) {
+        printf("BC28UartOpen get serial %s fd error\n", ADAPTER_BC28_DRIVER);
+        return -1;
+    }
+    /* set serial config, serial_baud_rate = 9600 */
+
+    struct SerialDataCfg cfg;
+    memset(&cfg, 0 ,sizeof(struct SerialDataCfg));
+
+    cfg.serial_baud_rate = BAUD_RATE_9600;
+    cfg.serial_data_bits = DATA_BITS_8;
+    cfg.serial_stop_bits = STOP_BITS_1;
+    cfg.serial_parity_mode = PARITY_NONE;
+    cfg.serial_bit_order = BIT_ORDER_LSB;
+    cfg.serial_invert_mode = NRZ_NORMAL;
+    cfg.serial_buffer_size = SERIAL_RB_BUFSZ;
+
+    /*aiit board use ch438, so it needs more serial configuration*/
+#ifdef ADAPTER_BC28_DRIVER_EXTUART
+    cfg.ext_uart_no         = ADAPTER_BC28_DRIVER_EXT_PORT;
+    cfg.port_configure      = PORT_CFG_INIT;
+#endif
+
+    struct PrivIoctlCfg ioctl_cfg;
+    ioctl_cfg.ioctl_driver_type = SERIAL_TYPE;
+    ioctl_cfg.args = &cfg;
+
+    PrivIoctl(adapter->fd, OPE_INT, &ioctl_cfg);
+    PrivTaskDelay(1000);
+
+    printf("NBIot uart config ready\n");
+    return 0;
+}
+
+static void BC28PowerSet(void)
+{
+    int pin_fd;
+    pin_fd = PrivOpen(ADAPTER_BC28_PIN_DRIVER, O_RDWR);
+
+    struct PinParam pin_param;
+    pin_param.cmd = GPIO_CONFIG_MODE;
+    pin_param.mode = GPIO_CFG_OUTPUT; 
+    pin_param.pin = ADAPTER_BC28_RESETPIN;
+
+    struct PrivIoctlCfg ioctl_cfg;
+    ioctl_cfg.ioctl_driver_type = PIN_TYPE;
+    ioctl_cfg.args = &pin_param;
+    PrivIoctl(pin_fd, OPE_CFG, &ioctl_cfg);
+
+    struct PinStat pin_stat;
+    pin_stat.pin = ADAPTER_BC28_RESETPIN;
+    pin_stat.val = GPIO_HIGH;
+    PrivWrite(pin_fd, &pin_stat, 1);
+
+    PrivTaskDelay(200);//at least 200ms
+
+    pin_stat.val = GPIO_LOW;
+    PrivWrite(pin_fd, &pin_stat, 1);
+
+    PrivClose(pin_fd);
+}
+
+int NBIoTStatusCheck(struct Adapter *adapter )
+{
+    int32 result = 0;
+
+    if (!adapter ){
+        return -1;
+    }
+
+    char at_cmd[64] = {0};
+
+    AtSetReplyEndChar(adapter->agent, 0x4F, 0x4B); /* set receive end flag as 'OK'*/
+
+    memcpy(at_cmd, "AT+CSQ", 6);
+    strcat(at_cmd, "\n");
+    printf("cmd : %s\n", at_cmd);
+    result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
+    if(result < 0) {
+        printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
+        result = -1;
+    }
+
+    memcpy(at_cmd, "AT+CFUN?", 8);
+    strcat(at_cmd, "\n");
+    printf("cmd : %s\n", at_cmd);
+    result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
+    if(result < 0) {
+        printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
+        result = -1;
+    }
+
+    memcpy(at_cmd, "AT+CIMI", 7);
+    strcat(at_cmd, "\n");
+    printf("cmd : %s\n", at_cmd);
+    result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
+    if(result < 0) {
+        printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
+        result = -1;
+    }
+
+    memcpy(at_cmd, "AT+CEREG?", 9);
+    strcat(at_cmd, "\n");
+    printf("cmd : %s\n", at_cmd);
+    result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
+    if(result < 0) {
+        printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
+        result = -1;
+    }   
+
+    memcpy(at_cmd, "AT+CGATT?", 9);
+    strcat(at_cmd, "\n");
+    printf("cmd : %s\n", at_cmd);
+    result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
+    if(result < 0) {
+        printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
+        result = -1;
+    }
+
+    memcpy(at_cmd, "AT+CGPADDR", 10);
+    strcat(at_cmd, "\n");
+    printf("cmd : %s\n", at_cmd);
+    result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
+    if(result < 0) {
+        printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
+        result = -1;
+    }
+
+    return result;
+}
+
+/**
+ * @description: NBIoT device create a socket connection
+ * @param adapter - NBIoT adapter AT
+ * @param socket_fd - socket file description
+ * @param type - socket type
+ * @param af_type - IPv4 or IPv6
+ * @return success: EOK, failure: -ERROR
+ */
+int NBIoTSocketCreate(struct Adapter *adapter, struct Socket *socket )
+{
+    int32 result = 0;
+
+    if (!adapter || !socket){
+        return -1;
+    }
+
+    if ( socket->af_type == NET_TYPE_AF_INET6 ) {
+        printf("IPv6 not surport !\n");
+        result = -1;
+        goto out;
+    }
+
+    char *str_af_type = "AF_INET";
+    char *str_type;
+    char str_fd[3] = {1};
+    char *str_protocol ;
+    char at_cmd[64] = {0};
+    char listen_port[] = {0};
+
+    if (socket->socket_id >= 0 && socket->socket_id < 7) {
+        itoa(socket->socket_id, str_fd, 10);
+        adapter->socket.socket_id = socket->socket_id;
+    } else {
+        printf("surport max 0-6, socket_id = [%d] is error!\n",socket->socket_id);
+        result = -1;
+        goto out;
+    }
+
+    if( socket->listen_port >= 0 && socket->listen_port <= 65535){
+        itoa(socket->listen_port, listen_port, 10);
+    } 
+    
+    adapter->socket.af_type = NET_TYPE_AF_INET;
+
+    if (socket->type == SOCKET_TYPE_STREAM) {   //tcp = AT+NSOCR=STREAM,6,0,1,AF_INET
+        adapter->socket.protocal = SOCKET_PROTOCOL_TCP;
+        adapter->socket.type = SOCKET_TYPE_STREAM;
+        str_type = "STREAM";
+        str_protocol = "6";
+
+    } else if ( socket->type == SOCKET_TYPE_DGRAM ){  //udp
+        adapter->socket.type = SOCKET_TYPE_DGRAM;
+        adapter->socket.protocal = SOCKET_PROTOCOL_UDP;
+        str_type = "DGRAM";
+        str_protocol = "17";
+
+    } else {
+        printf("error socket type \n");
+        result = -1;
+        goto out;
+    }
+
+    memcpy(at_cmd, "AT+NSOCR=", 9);
+    strcat(at_cmd, str_type);
+    strcat(at_cmd, ",");
+    strcat(at_cmd, str_protocol);
+    strcat(at_cmd, ",");
+    strcat(at_cmd, listen_port);
+    strcat(at_cmd, ",");
+    strcat(at_cmd, str_fd);
+    strcat(at_cmd, ",");
+    strcat(at_cmd, str_af_type);
+    strcat(at_cmd, "\n");
+
+    printf("cmd : %s\n", at_cmd);
+
+    AtSetReplyEndChar(adapter->agent, 0x4F, 0x4B); /* set receive end flag as 'OK'*/
+
+    result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
+    if(result < 0) {
+        printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
+        result = -1;
+    }
+
+out:
+    return result;
+}
+
+/**
+ * @description: NBIoT device close a socket connection
+ * @param adapter - NBIoT adapter AT
+ * @param socket_fd - socket file description
+ * @return success: EOK, failure: -ERROR
+ */
+int NBIoTSocketDelete(struct Adapter *adapter )
+{
+
+    if (!adapter) {
+        return -1;
+    }
+
+    if (adapter->socket.socket_id >= 7) {
+        printf("socket fd error \n");
+        return -1;
+    }
+
+    char str_fd[2] = {0};
+    char at_cmd[16] = {0};
+    itoa(adapter->socket.socket_id, str_fd, 10);
+
+    memcpy(at_cmd, "AT+NSOCL=", 9);
+    strcat(at_cmd, str_fd);
+    strcat(at_cmd, "\n");
+
+    printf("cmd : %s\n", at_cmd);
+    AtSetReplyCharNum(adapter->agent, 1);
+    ATOrderSend(adapter->agent, REPLY_TIME_OUT, NULL, at_cmd);
+    PrivTaskDelay(300);
+
+    adapter->socket.socket_id = SOCKET_INVALID_ID;
+
+    return 0;
+}
+
+static int BC28Open(struct Adapter *adapter)
+{
+    int ret = 0;
+    struct Socket create_socket;
+
+    if (NULL == adapter) {
+        return -1;
+    }
+    /*step1: open BC8 serial port*/
+    ret = BC28UartOpen(adapter);
+    if (ret < 0) {
+        printf("bc18 setup failed.\n");
+        return -1;
+    }
+     /*step2: init AT agent*/
+    if (!adapter->agent) {
+        char *agent_name = "niot_device";
+        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;
+    }
+    create_socket.type = SOCKET_TYPE_STREAM;
+    create_socket.listen_port = 0;
+    create_socket.socket_id = 1;
+    create_socket.af_type = NET_TYPE_AF_INET;
+
+    BC28PowerSet(); /* reset bc28 module by set reset pin */
+    PrivTaskDelay(6000);
+
+    NBIoTStatusCheck(adapter); /* ask module status*/
+
+    /*step3: create a tcp socket default */
+    ret = NBIoTSocketCreate(adapter, &create_socket);
+    if(ret < 0){
+        printf("NBIot create tcp socket failed.\n");
+        return -1;
+    }
+
+    printf("NBiot BC28 open successful\n");
+    return 0;
+}
+
+static int BC28Close(struct Adapter *adapter)
+{
+    NBIoTSocketDelete(adapter);
+    PrivClose(adapter->fd);
+    return 0;
+}
+
+static int BC28Ioctl(struct Adapter *adapter, int cmd, void *args)
+{
+    int ret = 0;
+    switch (cmd)
+    {
+        case CONFIG_NBIOT_RESET: /* reset nbiot */
+            BC28PowerSet();
+            break;
+        case CONFIG_NBIOT_CREATE_SOCKET: /* create tcp/UDP socket */
+            if(!args){
+                return -1;
+            }
+            struct Socket *create_socket = ( struct Socket *) args;
+            ret = NBIoTSocketCreate(adapter, create_socket);
+            break;
+        case CONFIG_NBIOT_DELETE_SOCKET: /* close socket */
+            ret = NBIoTSocketDelete(adapter);
+            break;
+        default:
+            ret = -1;
+            break;
+    }
+
+    return ret;
+}
+
+static int BC28Connect(struct Adapter *adapter, enum NetRoleType net_role, const char *ip, const char *port, enum IpType ip_type)
+{
+    int result = 0;
+
+    if (adapter->socket.socket_id > 6) {
+        printf("socket fd error \n");
+        result = -1;
+        goto __exit;
+    }
+
+    if ( ip_type != SOCKET_TYPE_STREAM) {
+        printf("socket type error \n");
+        result = -1;
+        goto __exit;
+    }
+
+    char at_cmd[64] = {0};
+    char str_fd[2] = {0};
+
+    itoa(adapter->socket.socket_id, str_fd, 10);
+
+    memcpy(at_cmd, "AT+NSOCO=", 9);
+    strcat(at_cmd, str_fd);
+    strcat(at_cmd, ",");
+    strcat(at_cmd, ip);
+    strcat(at_cmd, ",");
+    strcat(at_cmd, port);
+    strcat(at_cmd, "\n");
+
+    printf("cmd : %s\n", at_cmd);
+    AtSetReplyEndChar(adapter->agent, 0x4F, 0x4B);
+    result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
+    if(result < 0) {
+        printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
+        result = -1;
+    }
+
+__exit:
+    return result;
+}
+
+static int BC28Send(struct Adapter *adapter, const void *buf, size_t len)
+{
+    uint32_t result = 0;
+    char at_cmd[64] = {0};
+    char str_fd[2] = {0};
+
+
+    if (adapter->socket.type == SOCKET_TYPE_STREAM ) {
+
+        char size[2] = {0};
+
+        itoa(adapter->socket.socket_id, str_fd, 10);
+        size[0] = len + '0';
+
+        memcpy(at_cmd, "AT+NSOSD=", 9);
+        strcat(at_cmd, str_fd);
+        strcat(at_cmd, ",");
+        strcat(at_cmd, size);
+        strcat(at_cmd, ",");
+        strcat(at_cmd, buf);
+        strcat(at_cmd, "\n");
+
+    } else if(adapter->socket.type == SOCKET_TYPE_DGRAM ) {
+
+        char listen_port[] = {0};
+
+        itoa(adapter->socket.socket_id, str_fd, 10);
+
+        itoa(adapter->socket.listen_port, listen_port, 10);
+
+        memcpy(at_cmd, "AT+NSOST=", 9);
+        strcat(at_cmd, str_fd);
+        strcat(at_cmd, ",");
+        strcat(at_cmd, adapter->socket.dst_ip_addr);
+        strcat(at_cmd, ",");
+        strcat(at_cmd, listen_port);
+        strcat(at_cmd, ",");
+        strcat(at_cmd, buf);
+        strcat(at_cmd, "\n");
+
+    }
+
+    printf("cmd : %s\n", at_cmd);
+    AtSetReplyEndChar(adapter->agent, 0x4F, 0x4B);
+    result = AtCmdConfigAndCheck(adapter->agent, at_cmd, "OK");
+    if(result < 0) {
+        printf("%s %d cmd[%s] config failed!\n",__func__,__LINE__,at_cmd);
+        result = -1;
+    }
+
+    return result;
+}
+
+static int BC28Recv(struct Adapter *adapter, void *buf, size_t len)
+{
+    char at_cmd[64] = {0};
+    char str_fd[2] = {0};
+    char size[2] = {0};
+    char *result = NULL;
+
+    ATReplyType reply = CreateATReply(64);
+    if (NULL == reply) {
+        printf("at create failed ! \n");
+        return -1;
+    }
+    
+    itoa(adapter->socket.socket_id, str_fd, 10);
+    itoa(len, size, 10);
+
+    memcpy(at_cmd, "AT+NSORF=", 9);
+    strcat(at_cmd, str_fd);
+    strcat(at_cmd, ",");
+    strcat(at_cmd, size);
+    strcat(at_cmd, "\n");
+
+    printf("cmd : %s\n", at_cmd);
+    ATOrderSend(adapter->agent, REPLY_TIME_OUT, reply, at_cmd);
+    PrivTaskDelay(300);
+    
+    result = GetReplyText(reply);
+    if (!result) {
+        printf("%s %n get reply failed.\n",__func__,__LINE__);
+    }
+    memcpy(buf, result, reply->reply_len);
+
+    if (reply) {
+        DeleteATReply(reply);
+    }
+
+    return 0;
+}
+
+static int BC28Disconnect(struct Adapter *adapter)
+{
+    if (!adapter) {
+        return -1;
+    }
+
+    return NBIoTSocketDelete(adapter);
+}
+
+static const struct IpProtocolDone BC28_done = 
+{
+    .open = BC28Open,
+    .close = BC28Close,
+    .ioctl = BC28Ioctl,
+    .setup = NULL,
+    .setdown = NULL,
+    .setaddr = NULL,
+    .setdns = NULL,
+    .setdhcp = NULL,
+    .ping = NULL,
+    .netstat = NULL,
+    .connect = BC28Connect,
+    .send = BC28Send,
+    .recv = BC28Recv,
+    .disconnect = BC28Disconnect,
+};
+
+AdapterProductInfoType BC28Attach(struct Adapter *adapter)
+{
+    struct AdapterProductInfo *product_info = malloc(sizeof(struct AdapterProductInfo));
+    if (!product_info) {
+        printf("BC28Attach malloc product_info error\n");
+        return NULL;
+    }
+    memset(product_info, 0, sizeof(struct AdapterProductInfo));
+
+    strncpy(product_info->model_name, ADAPTER_NBIOT_BC28,sizeof(product_info->model_name));
+    product_info->model_done = (void *)&BC28_done;
+
+    return product_info;
+}
+
+
+
diff --git a/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c b/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c
index 0d1d18e3..31a12652 100755
--- a/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c
+++ b/APP_Framework/Framework/connection/wifi/hfa21_wifi/hfa21_wifi.c
@@ -116,7 +116,7 @@ static int Hfa21Receive(struct Adapter *adapter, void *rev_buffer, size_t buffer
     printf("hfa21 receive waiting ... \n");
 
     if (adapter->agent) {
-        return EntmRecv(adapter->agent, (char *)rev_buffer, buffer_len, 40000);
+        return EntmRecv(adapter->agent, (char *)rev_buffer, buffer_len, 40);
     } else {
         printf("Can not find agent \n");
 	}
diff --git a/APP_Framework/Framework/connection/zigbee/e18/e18.c b/APP_Framework/Framework/connection/zigbee/e18/e18.c
index 1342ad63..09088625 100644
--- a/APP_Framework/Framework/connection/zigbee/e18/e18.c
+++ b/APP_Framework/Framework/connection/zigbee/e18/e18.c
@@ -211,7 +211,9 @@ static int E18Open(struct Adapter *adapter)
         ATAgentType at_agent = GetATAgent(agent_name);
         adapter->agent = at_agent;
     }
-    
+
+    AtSetReplyLrEnd(adapter->agent, 1);
+
 try_again:
     while(try_times--){
         ret = E18NetRoleConfig(adapter);
@@ -355,7 +357,7 @@ static int E18Recv(struct Adapter *adapter, void *buf, size_t len)
             if(!adapter->agent){
                 PrivRead(adapter->fd, buf, len);
             } else {
-               EntmRecv(adapter->agent, buf, len, 3000);/* wait timeout 3000ms*/
+               EntmRecv(adapter->agent, buf, len, 3);/* wait timeout 3000ms*/
             }
             break;
         case STT_MODE2:
@@ -405,7 +407,8 @@ AdapterProductInfoType E18Attach(struct Adapter *adapter)
         printf("E18Attach malloc product_info error\n");
         return NULL;
     }
-
+    memset(product_info, 0, sizeof(struct AdapterProductInfo));
+    
     strncpy(product_info->model_name, ADAPTER_ZIGBEE_E18,sizeof(product_info->model_name));
     product_info->model_done = (void *)&E18_done;