From: dxy <1731678236@qq.com>
Date: Thu, 28 Mar 2024 02:50:49 +0000 (+0800)
Subject: 合并解决冲突
X-Git-Tag: release_V1.2.70_20241020_135402~1241^2~24
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=19e4c06f0dab576c99140eadd2c510489636359c;p=mirrors%2FFD230.git

合并解决冲突
---

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