From 986786b565fec3bc8a89323f964e26fec8a9950c Mon Sep 17 00:00:00 2001
From: SnickerSun <snickersun@163.com>
Date: Wed, 3 Jul 2024 19:45:52 +0800
Subject: [PATCH] =?utf8?q?=E9=87=8D=E6=9E=84=E8=93=9D=E7=89=99=E6=9C=8D?=
 =?utf8?q?=E5=8A=A1=E6=9E=B6=E6=9E=84=EF=BC=8C=E9=80=82=E9=85=8D=E6=96=B0?=
 =?utf8?q?=E7=9A=840626patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../brandy/brandy_standard/thread_pri_init.c  |  11 +-
 .../alipay/service/alipay_bluetooth.c         |  16 +-
 .../wearable/alipay/service/alipay_feature.c  |   7 +-
 .../bluetooth/include/BluetoothModel.h        |   3 +
 .../nativeui/bluetooth/src/BluetoothModel.cpp |  61 ++++-
 .../bluetooth/src/BluetoothWrapper.cpp        |   8 +-
 .../src/ClassicBlueToothPresenter.cpp         |  12 +-
 .../service/ble_service/bleservice/bleEvent.c | 117 +--------
 .../service/ble_service/bleservice/bleEvent.h |   4 -
 .../ble_service/bleservice/bleService.c       | 235 +++++++++---------
 .../ble_service/bleservice/bleService.h       |   3 +-
 .../factorytest_service/factorytestService.c  |  20 +-
 .../factorytest_service/factorytestService.h  |   2 +-
 .../ppg/ppgBleService/ppgBleService.c         |  18 +-
 .../ppg/ppgBleService/ppgBleService.h         |   2 +-
 .../drivers/peripheral/utils/custom_utils.c   |  30 +--
 16 files changed, 241 insertions(+), 308 deletions(-)

diff --git a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
index a2a7353e9..4fc14019d 100755
--- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
+++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
@@ -449,10 +449,7 @@ static void thread_main(const void *unused)
 
 
 
-#ifdef SUPPORT_ALIPAY_SEC
-    uapi_alipay_svr_init();
-#endif
- 
+
 
 #ifdef SUPPORT_CAT1_SERVICE
     cat1_server_init();
@@ -461,7 +458,11 @@ static void thread_main(const void *unused)
     uapi_blesrv_service_init();
     
     start_custom_ble_service();
-
+    
+#ifdef SUPPORT_ALIPAY_SEC
+    uapi_alipay_svr_init();
+#endif
+ 
     startup_post_init();
 
     set_startup_finish_flag();
diff --git a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
index d311c6554..03fe767a3 100644
--- a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
+++ b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
@@ -373,24 +373,32 @@ void svr_alipay_bt_init_gatts(void)
     memcpy_s(uuid.uuid, sizeof(uuid.uuid), (char *)&service_id, sizeof(service_id));
 #ifndef SUPPORT_AT_OHOSFWK
     ret = gatts_register_server(&uuid, &server_id); /* 注册gatt server */
+    if (ret != ERRCODE_SUCC) {
+        ALIPAY_PRINT_ERR(0, "gatts_register_server ret:0x%x.\r\n", ret);
+    }
 #else
     ret = wrapper_gatts_register_server(&uuid, &server_id); /* 注册gatt server */
-#endif
     if (ret != ERRCODE_SUCC) {
-        ALIPAY_PRINT_ERR(0, "gatts_register_server ret:%u.\r\n", ret);
+        ALIPAY_PRINT_ERR(0, "wrapper_gatts_register_server ret:0x%x.\r\n", ret);
     }
+#endif
+    
     ALIPAY_PRINT_DEBUG(0, "gatts_register_server ret: 0x%x server_id = 0x%x", ret, server_id);
     g_alipay_server_id = server_id;
     uuid.uuid_len = sizeof(service_id);
     memcpy_s(uuid.uuid, sizeof(uuid.uuid), (char *)&service_id, sizeof(service_id));
 #ifndef SUPPORT_AT_OHOSFWK
     ret = gatts_add_service(server_id, &uuid, true);
+    if (ret != ERRCODE_SUCC) {
+        ALIPAY_PRINT_ERR(0, "gatts_add_service ret:0x%x.\r\n", ret);
+    }
 #else
     ret = wrapper_gatts_add_service(server_id, &uuid, true);
-#endif
     if (ret != ERRCODE_SUCC) {
-        ALIPAY_PRINT_ERR(0, "gatts_add_service ret:%u.\r\n", ret);
+        ALIPAY_PRINT_ERR(0, "wrapper_gatts_add_service ret:0x%x.\r\n", ret);
     }
+#endif
+    
     return;
 }
 
diff --git a/code/sdk/application/wearable/alipay/service/alipay_feature.c b/code/sdk/application/wearable/alipay/service/alipay_feature.c
index 653cd2581..70207684f 100644
--- a/code/sdk/application/wearable/alipay/service/alipay_feature.c
+++ b/code/sdk/application/wearable/alipay/service/alipay_feature.c
@@ -73,10 +73,9 @@ static mc_payment_state_t svr_alipay_get_paystate(void)
 static int32_t svr_alipay_notify_bt(bool value)
 {
     if (value) {
-        printf("svr_alipay_notify_bt true:%d",value);
-        ble_avd_mode_change(1);
+        // svr_alipay_ble_adv_start();  //统一采用 bleService的adv
     } else {
-        printf("svr_alipay_notify_bt false:%d",value);
+        // svr_alipay_ble_adv_stop();   //统一采用 bleService的adv
     }
     return 0;
 }
@@ -605,7 +604,7 @@ errcode_t uapi_alipay_svr_init(void)
     uapi_gpio_set_dir(ALIPAY_SEC_GPIO, GPIO_DIRECTION_OUTPUT);
     uapi_gpio_set_val(ALIPAY_SEC_GPIO, GPIO_LEVEL_HIGH);
     osDelay(30);
-    
+    // svr_alipay_bluetooth_init();
     HS_IIC_Init();
     alipay_pre_init();
     svr_alipay_enter_lpm();
diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModel.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModel.h
index 4bdac91a2..6d6ccdf6a 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/BluetoothModel.h
@@ -123,6 +123,9 @@ void BtA2dpInit(void);
 void BtInitGatts(void);
 void BtInitSpp(void);
 void BleAdvStart(void);
+void bluetooth_init(void);
+void bluetooth_enable_all(void);
+void bluetooth_close_all(void);
 #ifdef __cplusplus
 }
 #endif
diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
index d9142b0ff..56f3cff9c 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -34,6 +34,7 @@
 #include "dfx_channel.h"
 #include "tcxo.h"
 #include "custom_runtime.h"
+#include "bleService.h"
 namespace OHOS {
 
 #define BT_SPP_TASK_STACK_SIZE 2048
@@ -104,7 +105,8 @@ void BluetoothModel::InitBluetoothInfo(void)
         WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "nameLen: %u", nameLen);
     }
 }
-void BluetoothModel::Init()
+
+void bluetooth_enable_all(void)
 {
 #ifndef SUPPORT_AUTO_OTA
     errcode_t ret;
@@ -119,25 +121,60 @@ void BluetoothModel::Init()
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt enable_bt_stack ret = %u", ret);
 
     // 设置安全连接
-    gap_ble_sec_params_t sec_param = { 1, GAP_BLE_IO_CAPABILITY_NOINPUTNOOUTPUT, 1, GAP_BLE_GAP_SECURITY_MODE1_LEVEL3 };
-    ret = gap_ble_set_sec_param(&sec_param);
+    gap_ble_sec_params_t sec_params = {0};
+    sec_params.bondable = 0x01;
+    sec_params.io_capability = GAP_BLE_IO_CAPABILITY_NOINPUTNOOUTPUT;//最好选择没有输入输出IO能力
+    sec_params.sc_enable = 0x00;
+    sec_params.sc_mode = GAP_BLE_GAP_SECURITY_MODE1_LEVEL2;
+    errcode_t ret = gap_ble_set_sec_param(&sec_params);//设置配对参数 发起配对弹窗
+
+    // gap_ble_sec_params_t sec_param = { 1, GAP_BLE_IO_CAPABILITY_NOINPUTNOOUTPUT, 1, GAP_BLE_GAP_SECURITY_MODE1_LEVEL3 };
+    // gap_ble_sec_params_t sec_param = { 1, GAP_BLE_IO_CAPABILITY_NOINPUTNOOUTPUT, 0, GAP_BLE_GAP_SECURITY_MODE1_LEVEL2 };
+    // ret = gap_ble_set_sec_param(&sec_param);
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt gap_ble_set_sec_param ret = %u", ret);
 
-    InitBluetoothInfo();
     BtInitCallBacks();
     wrapper_ble_register();
 #ifdef SUPPORT_ALIPAY_SEC
-    svr_alipay_bluetooth_init();
+    // svr_alipay_bluetooth_init(); //Alipay BLE
 #endif
-    BtInitCallBacksEx();
-    BtInitGatts();
-    BtInitSpp();
 
-    SetUpListCase();
-    SetUpConnedDevicesList();
+    /***Custom BleService */
+    svr_ble_bluetooth_init(); //CUSTOM BLE
+    // BtInitCallBacksEx(); //BLE
+    // BtInitGatts(); //BLE 
+
+    wrapper_gatts_service_start(); //start reg ble server
+
+    // BtInitSpp();
+    BtA2dpInit();
+
+    /**开始ble广播*/
+    // openBle();
+    // BleAdvStart();
+
 #endif
 }
 
+void bluetooth_close_all(void)
+{
+    errcode_t ret;
+    
+    /**停止扫描，清除协议缓存*/
+    closeBle();
+
+    ret = disable_bt_stack();
+    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "bt disable_bt_stack ret = %u", ret);
+}
+
+void BluetoothModel::Init()
+{
+// bluetooth_init();
+// InitBluetoothInfo();
+SetUpListCase();
+SetUpConnedDevicesList();
+}
+
 void BluetoothModel::SetCaseListClear()
 {
     btScansDevicesList_.clear();
@@ -1302,7 +1339,7 @@ void BtInitGatts(void)
 {
     uint16_t id = 0x1FF0;
     uint16_t ser_id = 0x1FFF;
-    uint8_t serverId = 0;
+    uint8_t serverId = 1;
     bt_uuid_t uuid;
     int ret;
 
@@ -1315,8 +1352,6 @@ void BtInitGatts(void)
     memcpy_s(uuid.uuid, sizeof(uuid.uuid), (char *)&id, sizeof(id));
     ret = wrapper_gatts_add_service(serverId, &uuid, true);
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gatts_add_service ret: 0x%x", ret);
-
-    wrapper_gatts_service_start();
 }
 
 static uint8_t Char2Num(int8_t c)
diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothWrapper.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothWrapper.cpp
index fd9dd57f0..7293cfdc5 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothWrapper.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothWrapper.cpp
@@ -300,16 +300,20 @@ errcode_t wrapper_gatts_add_service(uint8_t server_id, bt_uuid_t *service_uuid,
     g_uuid_list.push_back(*service_uuid);
     return ERRCODE_SUCC;
 }
-
+#include "debug_print.h"
+extern "C" void openBle(void);
 void wrapper_gatts_service_start(void)
 {
     if (!g_uuid_list.empty()) {
         bt_uuid_t &uuid = g_uuid_list.front();
         // 服务异步添加，需要保证当前服务start后，再添加下一个服务
-        (void)gatts_add_service(gatts_server_id, &uuid, true);
+        errcode_t ret = gatts_add_service(gatts_server_id, &uuid, true);
+        printf("wrapper_gatts_service_start gatts_add_service uuid len %x [0x%04X],gatts_server_id %u, ret 0x%x\n",uuid.uuid_len,*((uint16_t*)&uuid.uuid),gatts_server_id,ret);
         g_uuid_list.pop_front();
     } else {
         g_svr_handle_list.clear();
+         /**开始ble广播*/
+        openBle();
     }
 }
 
diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
index 26c18396a..e91a7ede4 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
@@ -1,8 +1,8 @@
 /*
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-25 11:50:57
- * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-04-25 15:54:05
+ * @LastEditors: SnickerSun snickersun@163.com
+ * @LastEditTime: 2024-07-03 15:18:50
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
  */
 #include "classicbluetooth/include/ClassicBlueToothPresenter.h"
@@ -102,14 +102,6 @@ namespace OHOS
         return true;
     }
 
-    extern "C"
-    {
-        void closeBle(void);       // 主动关闭蓝牙
-        void openBle(void);        // 主动开启蓝牙
-        bool get_ble_status(void); // 获取蓝牙是否关闭还是开启 1就是开启 0关闭 一开机默认是开启蓝牙
-        void getDeviceState(void);
-        void malloc_test(void);
-    }
     bool ClassicBlueToothPresenter::OnChange(UICheckBox::UICheckBoxState state)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClassicBlueToothPresenter::OnChange");
diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 413982566..02f36283d 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -56,7 +56,6 @@ static bool muiltFlag = 0;//多包数据flag
 static bool ANCSBigBufFlag = 0;//ANCS多包数据flag
 static uint16_t data_len = 0;
 ble_recv_data_info_t ble_recv_data;
-ble_recv_msg_callback_t g_recv_msg_toUI = NULL;
 static uint8_t TRANSMIT_DATA;
 #if 1
 #include "app_msg_manager.h"
@@ -124,106 +123,8 @@ static errcode_t get_dial_file_path(char* input_dialname ,uint32_t input_size, c
 
     return ERRCODE_SUCC;
 } 
-// typedef void (*hx3695_msg_callback_t)(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen);
-uint32_t ble_recv_register_msg_callback(ble_recv_msg_callback_t func)
-{
-    g_recv_msg_toUI = func;
-    return 0;
-}
-
-ble_recv_msg_callback_t ble_recv_get_send_msg_callback_func(void)
-{
-    return g_recv_msg_toUI;
-}
-static msg_get_heart_set_param_info_t hr_param;
-static msg_get_spo2_set_param_info_t spo2_param;
-static msg_drink_set_param_info_t drink_info;
-static msg_drink_param_info_t drink_on_t;//喝水提醒开关
-static msg_watch_lcd_param_info_t watch_lcd_param;//手表屏幕参数
-static msg_get_voice_vibration_info_t voice_vibration;
-static msg_caramer_info_t caramer_info;//拍照手势状态 0退出拍照 1进入拍照
-static msg_user_info_t user_info;//用户信息 体重 身高 年龄 性别
-//手表TODO 这是一个sample
-int ble_recv_msg_callback(uint8_t writ_read,uint16_t msg_typeID, uint8_t *msg_data, uint16_t msg_datalen)
-{
-    if(writ_read == READ_FLASH_DATA){//读手表数据 WRITE_FLASH_DATA 写手表数据
-        switch (msg_typeID)
-        {
-            case SET_DRINK_PARAM_CMD:
-                memset(&drink_info,0,sizeof(msg_drink_set_param_info_t));
-                drink_info.drink_on = 1;
-                drink_info.alarm_mode = 1;
-                drink_info.start_hour = 8;
-                drink_info.startt_min = 9;
-                drink_info.end_hour = 23;
-                drink_info.end_min = 59;
-                drink_info.frequenc = 1;
-                memcpy(msg_data,&drink_info,sizeof(msg_drink_set_param_info_t));
-                
-                break;
-            case GET_WATCH_HR_SET_PARAM_CMD:
-                memset(&hr_param,0,sizeof(msg_get_heart_set_param_info_t));
-                hr_param.frequence = 1;
-                hr_param.remind_on = 1;
-                hr_param.max_min = 1;
-                hr_param.heart = 180;
-                memcpy(msg_data,&hr_param,sizeof(msg_get_heart_set_param_info_t));
-               
-                break;
-            case GET_DRINK_SWITCH_CMD:
-                
-                memset(&drink_on_t,0,sizeof(msg_drink_param_info_t));
-                drink_on_t.drink_on = 1;
-                memcpy(msg_data,&drink_on_t,sizeof(msg_drink_param_info_t));
-                break;
-            case GET_WATCH_LCD_PARAM_CMD:
-                memset(&watch_lcd_param,0,sizeof(msg_watch_lcd_param_info_t));
-                watch_lcd_param.brigntess = 10;
-                watch_lcd_param.screen_time = 3;
-                watch_lcd_param.wrist_on = 0;
-                memcpy(msg_data,&watch_lcd_param,sizeof(msg_get_heart_set_param_info_t));
-               
-                break;
-            default:
-                break;
-        }
-        
-       
-    }else{
-        switch (msg_typeID)
-        {
-            case SET_DRINK_PARAM_CMD:
-                
-                memset(&drink_info,0,sizeof(msg_drink_set_param_info_t));
-                drink_info.drink_on = msg_data[0];
-                drink_info.alarm_mode = msg_data[1];
-                drink_info.target_drink = msg_data[2]+msg_data[3]*256;
-                drink_info.start_hour = msg_data[4];
-                drink_info.startt_min = msg_data[5];
-                drink_info.end_hour = msg_data[6];
-                drink_info.end_min = msg_data[7];
-                drink_info.frequenc = msg_data[8];
-                // memcpy(msg_data,&drink_info,sizeof(msg_drink_set_param_info_t));
-                break;
-            case GET_DRINK_SWITCH_CMD:
-                
-                memset(&drink_on_t,0,sizeof(msg_drink_param_info_t));
-                drink_on_t.drink_on = 1;
-                memcpy(msg_data,&drink_on_t,sizeof(msg_drink_param_info_t));
-                break;
 
-            case USER_INFOR_CMD:
-                
-                break;
 
-            
-            default:
-                break;
-        }
-    }
-    int ret = 1;
-    return ret;
-}
 int char_to_dec(char ch)
 {
     int num = 0;
@@ -2258,13 +2159,6 @@ void getUserInfo(ble_read_data *buffer_handle,uint16_t cmd,uint8_t *data,uint16_
         );
         
         set_user_data(&msg_userinfo);
-
-        ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func();
-        if (func !=NULL)
-        {
-            
-        }
-        
         
     }else{
         ble_reply_cmd(USER_INFOR_CMD,0);//crc error
@@ -6533,8 +6427,19 @@ void free_ble_data(void)//以防断开蓝牙没有释放数据类型
     packdataLen = 0;
     totalDataLen = 0;
     ANCSBigBufFlag = 0;
+
     recvBigDataBufState = false;
     sendbigDataBufState = false;
+
+    for (int i = 0 ; i < MAX_HANDLE_NUM ; i++)
+    {
+        if (handle_l[i].data != NULL)
+        {
+            free(handle_l[i].data);
+            handle_l[i].data=NULL;
+        }
+        memset((void*)&handle_l[i],0,sizeof(ble_read_data));
+    }
     return;
     
 }
diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
index ce675a9fa..56cec656c 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
@@ -26,9 +26,6 @@ typedef struct {
     uint16_t data_len;       /* data_len 数据长度        */
     uint16_t handle;         /* handle   数据句柄        */
 } ble_recv_data_info_t;
-typedef int (*ble_recv_msg_callback_t)(uint8_t writ_read,uint16_t msg_typeID, uint8_t *msg_data, uint16_t msg_datalen);
-uint32_t ble_recv_register_msg_callback(ble_recv_msg_callback_t func);
-ble_recv_msg_callback_t ble_recv_get_send_msg_callback_func(void);
 //write_read 0x01是从手表中读取数据 0x02 是app将数据传给设备 设备保存
 //msy_typeid 是协议指令类型+ID拼接 去bleEvent.h里面或者协议文档查找对应的协议指令 比如 01 02 会拼接成0x0102两个字节的数据
 //msg_data 是数据内容 如果数据没有就传NULL
@@ -36,7 +33,6 @@ ble_recv_msg_callback_t ble_recv_get_send_msg_callback_func(void);
 //返回值 解析数据成功返回 1 解析失败返回 0 
 // 
 void malloc_test(void);
-int ble_recv_msg_callback(uint8_t writ_read,uint16_t msg_typeID, uint8_t *msg_data, uint16_t msg_datalen);
 void cameram_send_data(void);
 /*********************TYPE+ID***********************************
  * TYPE:01 
diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
index 25ed5dd10..06c59fb06 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
@@ -39,7 +39,9 @@ extern "C" {
 #include "custom_runtime.h"
 #include "custom_utils.h"
 #include "bletest.h"
-
+#ifdef SUPPORT_AT_OHOSFWK
+#include "BluetoothWrapper.h"
+#endif
 
 // extern void bts_data_to_uuid_len2(uint16_t uuid_data, bt_uuid_t *out_uuid);
 // extern void bts_init_128bit_uuid(const bt_uuid_t *uuid);
@@ -73,7 +75,8 @@ extern "C" {
 #define BLE_DEFAULT_NAME_LEN 32
 #define BLE_MAC_MAX_LEN 6 //蓝牙mac地址最大个数6个
 
-#define BLE_CHANGE_MODE //开启是不需要切换广播数据 屏蔽掉就需要切换广播模式数据
+#define SWAP_U16(x) ((uint16_t)((((uint16_t)(x) & (uint16_t)0x00ffU) << 8) | \
+                    (((uint16_t)(x) & (uint16_t)0xff00U) >> 8)))
 
 static uint8_t exit_alipay_gui = 0;
 //  蓝牙模块全局变量
@@ -126,6 +129,8 @@ enum{
     BLE_CHARACTERISTIC_READ_BATTERY_ID_PROPERTIES = GATT_CHARACTER_PROPERTY_BIT_READ|GATT_CHARACTER_PROPERTY_BIT_NOTIFY,
 };
 static uint8_t ble_adv_falg = 0;
+static bool g_custom_ble_init_flag = false;
+
 void svr_ble_adv_stop(void)
 {
     ble_adv_falg = 0;
@@ -158,8 +163,6 @@ static void svr_ble_adv_data_set(int adv_id)
     unsigned int len = BLE_MAC_MAX_LEN;
     errcode_t ret = 0;
 
-
-   
     ret = bluetooth_get_local_name(ble_name, &ble_name_len);
     if (ret != 0) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_get_local_name fail, name:%s,len:%u,ret:%u.", ble_name, ble_name_len, ret);
@@ -239,16 +242,14 @@ static void svr_ble_adv_data_set(int adv_id)
     // printf("scan_data_len!!!!3333:%d\r\n",scan_data_len);
    
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble_info:%02x:%02x:%02x:%02x:%02x:%02x", ble_data_mac_switch[0], ble_data_mac_switch[1],
-        ble_data_mac_switch[2], ble_data_mac_switch[3], ble_data_mac_switch[4], ble_data_mac_switch[5]);
-    
-    
-    #ifdef BLE_CHANGE_MODE
+        ble_data_mac_switch[2], ble_data_mac_switch[3], ble_data_mac_switch[4], ble_data_mac_switch[5]);    
+   
     memcpy_s(adv_mac_head + BLE_ADV_MAC_HEAD_LENTH, BD_ADDR_LEN, ble_data_mac_switch, BD_ADDR_LEN);
 
     memcpy_s(scan_data + scan_data_len, sizeof(adv_mac_head), adv_mac_head, sizeof(adv_mac_head));
     scan_data_len = scan_data_len + sizeof(adv_mac_head);
     // printf("adv_data_len!!!!4444:%d\r\n",scan_data_len);
-    #endif
+   
 
     if (scan_data_len > BLE_SCAN_DATA_LENTH){
         scan_data_len = BLE_SCAN_DATA_LENTH;
@@ -298,6 +299,7 @@ static void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr,
     gap_ble_pair_state_t pair_state, gap_ble_disc_reason_t disc_reason)
 {
     
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "svr_ble_connstate_change_cb gap_ble_conn_state_t conn_state:%d  pair_state:%d disc_reason:%d\r\n",conn_state,pair_state,disc_reason);
     
     g_ble_conn_id = conn_id;
     if (GAP_BLE_STATE_DISCONNECTED == conn_state) { // restart ble adv when disconnected
@@ -305,41 +307,17 @@ static void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr,
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GAP_BLE_STATE_DISCONNECTED!!! \r\n");
         // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GAP_BLE_STATE_DISCONNECTED!!! svr_alipay_get_adv_start_state %d alipay_get_binding_status:%d\r\n",svr_alipay_get_adv_start_state(),alipay_get_binding_status());
         // if(AdverFlag == true){
-            free_ble_data();
-            #ifdef BLE_CHANGE_MODE
-            svr_ble_adv_start();
-            #else
-            if(svr_alipay_get_adv_start_state())//如果绑定二维码识图界面并且没有绑定成功断开连接还是广播alipay服务
-            {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "alipay_get_binding_status  error!!!");
-                svr_alipay_ble_adv_start_t();
-            }else{
-                svr_ble_adv_start();
-            }
-            
-            #endif
-            
+            free_ble_data();            
+            svr_ble_adv_start();                        
         // }    
     } else {
         devpair_state = 0;//
-        #ifdef BLE_CHANGE_MODE
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "exit_alipay_gui  error!!! %d",exit_alipay_gui);
+ 
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "exit_alipay_gui  !!! %d",exit_alipay_gui);
         if(!exit_alipay_gui)//如果进入了绑定二维码界面 正在连接app 不需要停止广播数据
         {
             svr_ble_adv_stop();
-        }
-        #else
-        if(svr_alipay_get_adv_start_state())//进了支付宝二维码界面没有绑定连接才停止当前alipay的服务
-        {
-            if(alipay_get_binding_status() == false)//如果还在绑定二维码码所有的识图界面没有绑定成功都不需要关闭广播数据还是继续广播数据
-            {   
-                svr_alipay_ble_adv_stop();
-            }
-        }else{
-            svr_ble_adv_stop();
-        }
-        #endif
-        
+        }              
         set_phone_info(addr);
         Bleconnect = GAP_BLE_STATE_CONNECTED;//蓝牙已连接
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GAP_BLE_STATE_CONNECTED!!! 0x%x\r\n",pair_state);
@@ -739,10 +717,24 @@ void alipay_add_chart_decr_cb(uint8_t server_id,uint16_t srv_handle)
 static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, uint16_t srv_handle,
     errcode_t status)
 {
+    if (uuid->uuid_len != sizeof(uint16_t)) return ;
+    uint16_t uuid_tmp = *((uint16_t*)uuid->uuid);
+    uuid_tmp = SWAP_U16(uuid_tmp);
+    if ( uuid_tmp == BLE_SERVICE_UUID 
+        || uuid_tmp == BLE_UUID_HUMAN_INTERFACE_DEVICE 
+        || uuid_tmp == BLE_UUID_ATE_FACTORYTEST_SERVICE 
+        || uuid_tmp == BLE_UUID_PPG_BLE_SERVICE 
+        || uuid_tmp == 0x3802 ) 
+    {
+
+    }else{
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_ble_bt_gatts_service_add_cb UUID not supported 0x%x\r\n",uuid_tmp);
+        return ;
+    }
     ble_server_handle = srv_handle;
     // ALIPAY_PRINT_DEBUG(0, "BtGattsServiceAddCallback 0x%x 0x%x 0x%x 0x%x", status, server_id, srv_handle,
         // *((uint16_t *)uuid->uuid));
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_ble_bt_gatts_service_add_cb 0x%x\r\n",srv_handle);
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_ble_bt_gatts_service_add_cb srv_handle 0x%x\r\n",srv_handle);
     if (status != ERRCODE_BT_SUCCESS)
     {
         return;
@@ -802,7 +794,10 @@ uint16_t g_hid_server_handle = 0;
 static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t *uuid, uint16_t srv_handle,
     gatts_add_character_result_t *result, errcode_t status)
 {
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bt_gatts_characteristic_add_cb uuid:0x%02x%02x 0x%x %d %d\r\n",uuid->uuid[0],uuid->uuid[1],srv_handle,result->handle,result->value_handle);
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bt_gatts_characteristic_add_cb uuid:0x%02x%02x 0x%x %d %d , status %x\r\n",
+        uuid->uuid[0],uuid->uuid[1],
+        srv_handle,result->handle,
+        result->value_handle,status);
     bt_uuid_t chara_uuid_data_2ae0 = {0};
     bts_data_to_uuid_len2(BLE_CHARACTERISTIC_SNED_OTA_ID, &chara_uuid_data_2ae0);
 
@@ -1154,43 +1149,43 @@ static void sample_gap_ble_scan_result_cbk(const gap_scan_result_data_t *scan_re
         scan_result_data->addr.addr[0], scan_result_data->addr.addr[4],
         scan_result_data->addr.addr[5], scan_result_data->rssi );
 }
-void srv_ble_start_scan(void)
-{
-    gap_ble_scan_params_t scan_param = { 0 };
-    scan_param.scan_interval = 0x0050;
-    scan_param.scan_window = 0x0030;
-    scan_param.scan_type = GAP_BLE_SCAN_TYPE_ACTIVE;
-    scan_param.scan_phy = GAP_BLE_PHY_NO_PACKET;
-    scan_param.scan_filter_policy = GAP_BLE_ADV_FILTER_ALLOW_SCAN_ANY_CON_ANY;
-    errcode_t ret = gap_ble_set_scan_parameters(&scan_param);
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"gap ble set scan parameters ret(errcode_t): %x\n", ret);
-
-    errcode_t reT_gap=gap_ble_start_scan();
-    if(reT_gap==ERRCODE_SUCC)
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_start_scan %d !",reT_gap);
-    else
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_start_scan fail %d !",reT_gap);
+// void srv_ble_start_scan(void)
+// {
+//     gap_ble_scan_params_t scan_param = { 0 };
+//     scan_param.scan_interval = 0x0050;
+//     scan_param.scan_window = 0x0030;
+//     scan_param.scan_type = GAP_BLE_SCAN_TYPE_ACTIVE;
+//     scan_param.scan_phy = GAP_BLE_PHY_NO_PACKET;
+//     scan_param.scan_filter_policy = GAP_BLE_ADV_FILTER_ALLOW_SCAN_ANY_CON_ANY;
+//     errcode_t ret = gap_ble_set_scan_parameters(&scan_param);
+//     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"gap ble set scan parameters ret(errcode_t): %x\n", ret);
+
+//     errcode_t reT_gap=gap_ble_start_scan();
+//     if(reT_gap==ERRCODE_SUCC)
+//         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_start_scan %d !",reT_gap);
+//     else
+//         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_start_scan fail %d !",reT_gap);
     
-}
+// }
 
-void srv_ble_stop_scan(void)
-{
-    errcode_t reT_gap=gap_ble_stop_scan();
-    if(reT_gap==ERRCODE_SUCC)
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_stop_scan %d !",reT_gap);
-    else
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_stop_scan fail %d !",reT_gap);
-}
+// void srv_ble_stop_scan(void)
+// {
+//     errcode_t reT_gap=gap_ble_stop_scan();
+//     if(reT_gap==ERRCODE_SUCC)
+//         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_stop_scan %d !",reT_gap);
+//     else
+//         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "gap_ble_stop_scan fail %d !",reT_gap);
+// }
 
 void svr_ble_btcallback_reg(void)//ble基础通讯服务注册回调函数
 {
     
-    gap_ble_sec_params_t sec_params = {0};
-    sec_params.bondable = 0x01;
-    sec_params.io_capability = GAP_BLE_IO_CAPABILITY_NOINPUTNOOUTPUT;//最好选择没有输入输出IO能力
-    sec_params.sc_enable = 0x00;
-    sec_params.sc_mode = GAP_BLE_GAP_SECURITY_MODE1_LEVEL2;
-    errcode_t ret = gap_ble_set_sec_param(&sec_params);//设置配对参数 发起配对弹窗
+    // gap_ble_sec_params_t sec_params = {0};
+    // sec_params.bondable = 0x01;
+    // sec_params.io_capability = GAP_BLE_IO_CAPABILITY_NOINPUTNOOUTPUT;//最好选择没有输入输出IO能力
+    // sec_params.sc_enable = 0x00;
+    // sec_params.sc_mode = GAP_BLE_GAP_SECURITY_MODE1_LEVEL2;
+    // errcode_t ret = gap_ble_set_sec_param(&sec_params);//设置配对参数 发起配对弹窗
 
 
     g_ble_gapble_cbs.ble_enable_cb = NULL;
@@ -1208,8 +1203,11 @@ void svr_ble_btcallback_reg(void)//ble基础通讯服务注册回调函数
     g_ble_gapble_cbs.auth_complete_cb = svr_gap_ble_auth_complete_callback;
     g_ble_gapble_cbs.conn_param_update_cb = svr_gap_ble_connect_param_update_callback;
    
+#ifndef SUPPORT_AT_OHOSFWK
     gap_ble_register_callbacks(&g_ble_gapble_cbs);
-
+#else
+    wrapper_gap_ble_register_callbacks(&g_ble_gapble_cbs);
+#endif
     srv_ble_server_register_gatt_callbacks();
 }
 void srv_ble_server_register_gatt_callbacks(void)
@@ -1224,7 +1222,12 @@ void srv_ble_server_register_gatt_callbacks(void)
     g_ble_gatts_cbs.read_request_cb = svr_ble_bt_gatts_req_read_cb;
     g_ble_gatts_cbs.write_request_cb = svr_ble_bt_gatts_req_write_cb;
     g_ble_gatts_cbs.mtu_changed_cb = svr_ble_mtu_exchange;
+
+#ifndef SUPPORT_AT_OHOSFWK
     gatts_register_callbacks(&g_ble_gatts_cbs);
+#else
+    wrapper_gatts_register_callbacks(&g_ble_gatts_cbs);
+#endif
     return;
 }
 static uint8_t g_server_id = 0;
@@ -1238,16 +1241,25 @@ static void svr_ble_bt_init_gatts(void)
     errcode_t ret = 0;
     uuid.uuid_len = (uint8_t)sizeof(srevr_id);
     memcpy_s(uuid.uuid, sizeof(uuid.uuid), (char *)&srevr_id, sizeof(srevr_id));
+
+#ifndef SUPPORT_AT_OHOSFWK
     ret = gatts_register_server(&uuid, &serverId); /* 注册gatt server */
+#else
+    ret = wrapper_gatts_register_server(&uuid, &serverId); /* 注册gatt server */
+#endif
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gatts_register_server ret: 0x%x serverId = 0x%x uuid.uuid_len:%d", ret, serverId,uuid.uuid_len);
     g_ble_server_id = serverId;
 
     bt_uuid_t ble_service_uuid = {0};
     bts_data_to_uuid_len2(id, &ble_service_uuid);
+
+#ifndef SUPPORT_AT_OHOSFWK
     ret = gatts_add_service(serverId, &ble_service_uuid, true);
+#else
+    ret = wrapper_gatts_add_service(serverId, &ble_service_uuid, true);
+#endif
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gatts_add_service ret: 0x%x", ret);
 
-    
     return;
 }
 bool ble_gatts_cmp_uuid(const bt_uuid_t *tgt_uuid, const bt_uuid_t *src_uuid)//比较源uuid和给定的uuid是否匹配
@@ -1288,29 +1300,32 @@ void ble_unregist_server(void)
 //     svr_ble_adv_start_param();
 // }
 
-void svr_bluetooth_init(void)
+void svr_ble_bluetooth_init(void)
 {
     memset(&phone_addr,0,sizeof(bd_addr_t));
-    bool ret = enable_bt_stack();
-    // bool ret = enable_ble();
-    if (ret != ERRCODE_SUCC) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_bluetooth_init enable_bt_stack ret:%u.\r\n", ret);
+    // bool ret = enable_bt_stack();
+    // // bool ret = enable_ble();
+    // if (ret != ERRCODE_SUCC) {
+    //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_ble_bluetooth_init enable_bt_stack ret:%u.\r\n", ret);
+    // }
+
+    if (g_custom_ble_init_flag)
+    {
+        return ;
     }
     // osDelay(100);
     svr_ble_btcallback_reg();
   
-    #ifdef SUPPORT_BLE_SERVICE
     //add server and ble service
     svr_ble_bt_init_gatts();
-    #endif
     #ifdef SUPPORT_HID_SERVICE
     // ble_hid_server_init();
     #endif
-    svr_alipay_bt_init_gatts();
-    ble_factory_server_init();
-    ble_ppgtest_server_init();
-    svr_ble_adv_start_param();
-    ble_recv_register_msg_callback(ble_recv_msg_callback);//注册驱动回调
+    // svr_alipay_bt_init_gatts();
+    ble_factory_server_init(g_ble_server_id);
+    ble_ppgtest_server_init(g_ble_server_id);
+
+    g_custom_ble_init_flag = true;
     return;
 }
 //关闭蓝牙
@@ -1321,22 +1336,22 @@ void closeBle(void)
     {
         AdverFlag = false;
         g_ble_init_flag = false;
-        bd_addr_t bd_addr;
-        unsigned char addr[BLE_MAC_MAX_LEN] = {0};
-        bluetooth_get_local_addr(&addr[0],BD_ADDR_LEN);
-        memcpy(bd_addr.addr,addr,BLE_MAC_MAX_LEN);
+        // bd_addr_t bd_addr;
+        // unsigned char addr[BLE_MAC_MAX_LEN] = {0};
+        // bluetooth_get_local_addr(&addr[0],BD_ADDR_LEN);
+        // memcpy(bd_addr.addr,addr,BLE_MAC_MAX_LEN);
         errcode_t ret = 0;
         if(Bleconnect == GAP_BLE_STATE_CONNECTED){//设备连接需要断开
             ret = gap_ble_disconnect_remote_device((const bd_addr_t *)&phone_addr);//与固定的mac设置地址进行断开连接
         }
-        // ret = gap_ble_remove_all_pairs();//删除和所有配对的手机app
-        // gap_remove_all_pairs();
+        // // ret = gap_ble_remove_all_pairs();//删除和所有配对的手机app
+        // // gap_remove_all_pairs();
         svr_ble_adv_stop();//停止广播 不发送广播数据 就是app搜索不到该设备了
-
-        ble_recv_register_msg_callback(NULL);
-        ret = disable_bt_stack();//关闭ble 直接断开和当前连接的手机app
+        free_ble_data();
+        // ble_recv_register_msg_callback(NULL);
+        // ret = disable_bt_stack();//关闭ble 直接断开和当前连接的手机app
         // ret = disable_ble();//关闭ble 直接断开和当前连接的手机app
-        WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "closeBle ret%d 0x%x-0x%x-0x%x-0x%x-0x%x-0x%x\r\n",ret,bd_addr.addr[0],bd_addr.addr[1],bd_addr.addr[2],bd_addr.addr[3],bd_addr.addr[4],bd_addr.addr[5]);
+        // WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "closeBle ret%d 0x%x-0x%x-0x%x-0x%x-0x%x-0x%x\r\n",ret,bd_addr.addr[0],bd_addr.addr[1],bd_addr.addr[2],bd_addr.addr[3],bd_addr.addr[4],bd_addr.addr[5]);
     }else{
         WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "AdverFlag false no need closeBle\r\n");
 
@@ -1350,7 +1365,7 @@ void openBle(void)
     {
         WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "AdverFlag true need openBle again\r\n");
         AdverFlag = true;
-        svr_bluetooth_init();
+        svr_ble_adv_start_param();
     }else{
         WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "AdverFlag true no need openBle again\r\n");
 
@@ -1369,7 +1384,7 @@ void ble_avd_mode_change(uint8_t mode)
     switch(mode)
     {
         case MODE_BLE_ADV_SRV:
-            #ifdef BLE_CHANGE_MODE 
+            
             if(exit_alipay_gui == 1)//如果进了绑定二维码界面就走这里
             {
                 exit_alipay_gui = 0;
@@ -1384,35 +1399,15 @@ void ble_avd_mode_change(uint8_t mode)
                     svr_ble_adv_stop();
                 }
             }
-            #else
-            if(alipay_get_binding_status() == false)//已经绑定了就不需要再开关蓝牙服务了
-            {
-                printf("ble_advd_start!!!!!!!!!");
-
-                exit_alipay_gui= 0;
-                printf("svr_alipay_ble_adv stop !!!!!!!!!");
-                svr_alipay_ble_adv_stop();
-                svr_alipay_set_adv_start_state(0);
-                svr_ble_adv_start_param();
-            }
-            #endif
+          
             break;
         case MODE_ALIPAY_ADV_SRV:
 
-            #ifdef BLE_CHANGE_MODE
+            
             exit_alipay_gui = 1;
             printf("alipay_ble_advd_start!!!!!!!!! %d %d",ble_adv_falg,AdverFlag);
             svr_ble_adv_start(); 
-            #else
-            if(alipay_get_binding_status() == false)//已经绑定了就不需要再开关蓝牙服务了 未绑定就需要切换开启服务
-            {
-                exit_alipay_gui = 1;
-                printf("alipay_advd_start!!!!!!!!!");
-                svr_ble_adv_stop();
-                svr_alipay_set_adv_start_state(1);
-                svr_alipay_ble_adv_start();
-            }
-            #endif
+          
             break;
         default:
             break;
diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h
index d1ce8ca2a..162ae5f5f 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.h
@@ -26,9 +26,10 @@ extern uint16_t ble_nus_max_data_len;
 extern uint16_t alipay_handle;
 extern uint16_t g_ble_conn_id;
 extern uint16_t g_ble_server_handle;
-void svr_bluetooth_init(void);//蓝牙服务初始化
+void svr_ble_bluetooth_init(void);//蓝牙服务初始化
 void closeBle(void);//主动关闭蓝牙
 void openBle(void);//主动开启蓝牙
+
 void svr_ble_adv_start_param(void);//开始蓝牙广播
 bool get_ble_status(void);//默认是开启一开机
 void svr_ble_btcallback_reg(void);
diff --git a/code/sdk/application/wearable/service/factorytest_service/factorytestService.c b/code/sdk/application/wearable/service/factorytest_service/factorytestService.c
index b5fa022ad..baa64b41a 100644
--- a/code/sdk/application/wearable/service/factorytest_service/factorytestService.c
+++ b/code/sdk/application/wearable/service/factorytest_service/factorytestService.c
@@ -11,9 +11,9 @@
 #include "bts_gatt_server.h"
 #include "securec.h"
 #include "wearable_log.h"
-
-
-#define BLE_HID_SERVER_ID 1
+#ifdef SUPPORT_AT_OHOSFWK
+#include "BluetoothWrapper.h"
+#endif
 
 /* HID gatt notification flag, do not need confirm */
 #define GATT_NOTIFICATION_FLAG 0
@@ -44,12 +44,18 @@ uint32_t g_factory_ota_report_hdl = 0;
 uint32_t factory_ota_write_handl = 0;
 
 /* 创建服务 */
-static void ble_factorytest_add_service(void)
+static void ble_factorytest_add_service(uint8_t server_id)
 {
     bt_uuid_t factory_service_uuid = {0};
     bts_data_to_uuid_len2(BLE_UUID_ATE_FACTORYTEST_SERVICE, &factory_service_uuid);
     //只有一个服务,永远是1
-    gatts_add_service(BLE_HID_SERVER_ID, &factory_service_uuid, true);
+   errcode_t ret = 0;
+#ifndef SUPPORT_AT_OHOSFWK
+    ret = gatts_add_service(server_id, &factory_service_uuid, true);
+#else
+    ret = wrapper_gatts_add_service(server_id, &factory_service_uuid, true);
+#endif
+
 }
 static void ble_factory_add_descriptor_report_reference(uint8_t server_id, uint16_t srvc_handle, bool is_notify_report)
 {
@@ -218,9 +224,9 @@ void ble_factorytest_add_characters_and_descriptors(uint8_t server_id, uint16_t
     ble_factorytest_add_character_and_information(server_id, srvc_handle);
 }
 
-void ble_factory_server_init(void)
+void ble_factory_server_init(uint8_t server_id)
 {
-    ble_factorytest_add_service();
+    ble_factorytest_add_service(server_id);
 }
 
 extern void factorytest_protocol_decode(uint8_t *buf, uint16_t event_size);
diff --git a/code/sdk/application/wearable/service/factorytest_service/factorytestService.h b/code/sdk/application/wearable/service/factorytest_service/factorytestService.h
index c88dccd99..f788c6929 100644
--- a/code/sdk/application/wearable/service/factorytest_service/factorytestService.h
+++ b/code/sdk/application/wearable/service/factorytest_service/factorytestService.h
@@ -54,7 +54,7 @@ extern "C" {
  * @li ble_hid_server.h
  * @endif
  */
-void ble_factory_server_init(void);
+void ble_factory_server_init(uint8_t server_id);
 
 /**
  * @if Eng
diff --git a/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.c b/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.c
index a3eee9a21..0131acb09 100644
--- a/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.c
+++ b/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.c
@@ -17,7 +17,9 @@ extern "C" {
 #include "bts_gatt_server.h"
 #include "securec.h"
 #include "wearable_log.h"
-
+#ifdef SUPPORT_AT_OHOSFWK
+#include "BluetoothWrapper.h"
+#endif
 // #include "bts_def.h"
 // #include "sdk_general.h"
 // #include "bts_gatt_stru.h"
@@ -25,7 +27,6 @@ extern "C" {
 // #include "ble_gatts_callbacks.h"
 // #include "bts_uuid.h"
 
-#define BLE_HID_SERVER_ID 1
 
 /* HID gatt notification flag, do not need confirm */
 #define GATT_NOTIFICATION_FLAG 0
@@ -56,12 +57,17 @@ uint32_t g_ppgtest_ota_report_hdl = 0;
 uint32_t ppgtest_ota_write_handl = 0;
 
 /* 创建服务 */
-static void ble_ppgtest_add_service(void)
+static void ble_ppgtest_add_service(uint8_t server_id)
 {
     bt_uuid_t ppgtest_service_uuid = {0};
     bts_data_to_uuid_len2(BLE_UUID_PPG_BLE_SERVICE, &ppgtest_service_uuid);
     //只有一个服务,永远是1
-    gatts_add_service(BLE_HID_SERVER_ID, &ppgtest_service_uuid, true);
+    errcode_t ret = 0;
+#ifndef SUPPORT_AT_OHOSFWK
+    ret = gatts_add_service(server_id, &ppgtest_service_uuid, true);
+#else
+    ret = wrapper_gatts_add_service(server_id, &ppgtest_service_uuid, true);
+#endif
 }
 static void ble_ppgtest_add_descriptor_report_reference(uint8_t server_id, uint16_t srvc_handle, bool is_notify_report)
 {
@@ -141,9 +147,9 @@ void ble_ppgtest_add_characters_and_descriptors(uint8_t server_id, uint16_t srvc
     ble_ppgtest_add_character_and_information(server_id, srvc_handle);
 }
 
-void ble_ppgtest_server_init(void)
+void ble_ppgtest_server_init(uint8_t server_id)
 {
-    ble_ppgtest_add_service();
+    ble_ppgtest_add_service(server_id);
 }
 
 #ifdef __cplusplus
diff --git a/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.h b/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.h
index d988d6820..5492cab39 100644
--- a/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.h
+++ b/code/sdk/drivers/peripheral/ppg/ppgBleService/ppgBleService.h
@@ -42,7 +42,7 @@ extern "C" {
  * @li ble_hid_server.h
  * @endif
  */
-void ble_ppgtest_server_init(void);
+void ble_ppgtest_server_init(uint8_t server_id);
 
 /**
  * @if Eng
diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 247fcee9d..ae48297bd 100644
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -231,30 +231,14 @@ bool enable_spp_service(bool _enable)
     return true;
 }
 
-extern void BtInitSpp(void);
-extern void BtA2dpInit(void);
-extern void BtInitCallBacks(void);
+extern void bluetooth_close_all(void);
+extern void bluetooth_enable_all(void);
 bool start_custom_ble_service(void)
 {
 #ifdef SUPPORT_BLE_SERVICE
-        openBle();
         PRINT("start custom protocol classic bt ble service !\r\n");
-        // bool ret = enable_bt_stack();
+        bluetooth_enable_all();
 #endif 
-    // if(uapi_dev_runtime_get_bt_powerstat()==true)
-    {
-
-        PRINT("register custom protocol classic bt service !\r\n");
-
-        BtInitCallBacks();
-        #ifdef FD230
-        BtA2dpInit();
-        #endif
-        enable_a2dp_service(true);
-        BtInitSpp();
-        enable_spp_service(true);
-        
-    }
 
     uapi_dev_runtime_set_bt_powerstat(1);
     return true;
@@ -263,10 +247,8 @@ bool start_custom_ble_service(void)
 bool stop_custom_ble_service(void)
 {
 #ifdef SUPPORT_BLE_SERVICE
-        PRINT("start custom protocol classic bt ble service !\r\n");
-        // ble_unregist_server();
-        closeBle();
-        // bool ret = disable_bt_stack();
+    PRINT("stop custom protocol classic bt ble service !\r\n");
+    bluetooth_close_all();
 #endif 
     uapi_dev_runtime_set_bt_powerstat(0);
     return true;
@@ -274,7 +256,7 @@ bool stop_custom_ble_service(void)
 
 bool start_alipay_ble_service(void)
 {
-    // ble_avd_mode_change(1);
+    ble_avd_mode_change(1);
     // if(get_ble_status())
     // {
     //     PRINT("stop custom protocol classic bt ble service first !\r\n");
-- 
2.17.1