合并解决冲突

diff --cc code/sdk/application/wearable/service/ble_service/bleService.c
index 9d9f8ab,42ba3e7..a9211ff
--- 1/code/sdk/application/wearable/service/ble_service/bleService.c
--- 2/code/sdk/application/wearable/service/ble_service/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleService.c
@@@ -88,8 -89,7 +89,7 @@@ static osal_timer g_a2dp_stream_accept_
  \r
  uint8_t data2ae3Cmd = 0;//2ae3短指令特征值\r
  uint8_t data2ae4Cmd = 0;\r
 -\r
 +#ifdef SUPPORT_BLE_SERVICE\r
- \r
  static void set_phone_info(bd_addr_t *addr)//保存手机信息 包含手机mac地址\r
  {\r
      phone_addr.addr[0] = addr->addr[5];\r
@@@ -186,10 -199,10 +194,10 @@@ static void svr_ble_adv_data_set(int ad
      }\r
      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble_info:%02x:%02x:%02x:%02x:%02x:%02x", ble_data_mac_switch[0], ble_data_mac_switch[1],\r
          ble_data_mac_switch[2], ble_data_mac_switch[3], ble_data_mac_switch[4], ble_data_mac_switch[5]);\r
--    memcpy_s(adv_mac_head + BLE_ADV_MAC_HEAD_LENTH, BD_ADDR_LEN, ble_data_mac_switch, BD_ADDR_LEN);\r
++    // memcpy_s(adv_mac_head + BLE_ADV_MAC_HEAD_LENTH, BD_ADDR_LEN, ble_data_mac_switch, BD_ADDR_LEN);\r
  \r
 -    memcpy_s(adv_data + adv_data_len, sizeof(adv_mac_head), adv_mac_head, sizeof(adv_mac_head));\r
 -    adv_data_len = adv_data_len + sizeof(adv_mac_head);\r
 +    // memcpy_s(adv_data + adv_data_len, sizeof(adv_mac_head), adv_mac_head, sizeof(adv_mac_head));\r
 +    // adv_data_len = adv_data_len + sizeof(adv_mac_head);\r
  \r
      scan_data[0] = 0x0f;//长度\r
      scan_data[1] = 0xff;//数据类型 manufactory data\r
@@@ -731,7 -804,24 +799,16 @@@ static void svr_ble_bt_gatts_req_write_
          printf("%x ",write_cb_para->value[i]);\r
         \r
      }\r
-     revBleOldData(write_cb_para->value,write_cb_para->length,write_cb_para->handle);\r
 -\r
+     if (write_cb_para->handle == get_factory_ate_write_handl()) \r
+     {\r
+         factory_recv_cmd_data(write_cb_para->value,write_cb_para->length,write_cb_para->handle);\r
+     }\r
+     else if (write_cb_para->handle == get_factory_ota_write_handl())\r
+     {\r
+         factory_recv_ota_data(write_cb_para->value,write_cb_para->length,write_cb_para->handle);\r
+     }else{\r
+         revBleOldData(write_cb_para->value,write_cb_para->length,write_cb_para->handle);\r
+     }\r
 -    // if(write_cb_para->handle == g_alipay_server_handle)\r
 -    // {\r
 -    //     printf("g_alipay_server_handle:%d",g_alipay_server_handle);\r
 -    //     uint8_t *msg_data = write_cb_para->value;\r
 -    //     svr_alipay_msg_write(ALIPAY_MSG_BT, msg_data, write_cb_para->length, false);\r
 -    // }\r
 -    \r
  }\r
  static void svr_ble_mtu_exchange(uint8_t server_id, uint16_t conn_id, uint16_t mtu_size, errcode_t status)\r
  {\r
@@@ -1153,13 -1244,11 +1231,14 @@@ void svr_bluetooth_init(void
      }\r
      // osDelay(100);\r
      svr_ble_btcallback_reg();\r
 +    #ifdef SUPPORT_BLE_SERVICE\r
      svr_ble_bt_init_gatts();\r
 +    #endif\r
 +    #ifdef SUPPORT_HID_SERVICE\r
      ble_hid_server_init();\r
 +    #endif\r
+     ble_factory_server_init();\r
      svr_ble_adv_start_param();\r
 -    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "svr_bluetooth_init22222222222\r\n");\r
      ble_recv_register_msg_callback(ble_recv_msg_callback);//注册驱动回调\r
      return;\r
  }\r

diff --cc code/sdk/build/config/target_config/brandy/config.py
Simple merge