From: dxy <1731678236@qq.com>
Date: Tue, 26 Mar 2024 11:37:53 +0000 (+0800)
Subject: 合并提交
X-Git-Tag: release_V1.2.70_20241020_135402~1241^2~27
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=e6bb5e20fda3362b2b5ec176141aad41d4de0842;p=mirrors%2FFD230.git

合并提交
---

e6bb5e20fda3362b2b5ec176141aad41d4de0842
diff --cc code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
index 833568605,c83f5fb2d..d3134e3a7
--- a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
+++ b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
@@@ -14,24 -14,11 +14,32 @@@
  #include "osal_task.h"
  #include "alipay_feature.h"
  #include "securec.h"
++<<<<<<< HEAD
 +/* Gatt service UUID */
 +#define ALIPAYY_SERVICE_ID 0x0238
 +/* Gatt Characteristic UUID */
 +#define ALIPAYY_CHARACTERISTIC_ID 0x024A
 +/* Client Characteristic Configuration UUID */
 +#define ALIPAYY_BLE_UUID_CLIENT_CHARACTERISTIC_CONF 0x2902
 +/* Gatt Characteristic max length */
 +#define ALIPAY_CHARACTERISTIC_MAX_LENGTH 256
 +#define ALIPAY_BLE_ADV_ID 1
 +#define ALIPAY_BLE_ADV_DATA_MAX_LENGTH 31
 +#define ALIPAY_BLE_ADV_BLE_NAME_MAX_LENGTH 13 // 31-4-2-3-9 = 13
 +#define ALIPAY_BLE_NAME_LENGTH 20
 +#define ALIPAY_BLE_ADV_MAC_HEAD_LENTH 4
 +#define ALIPAY_BLE_ADV_MAC_LENTH 10
 +#define ALIPAY_BLE_ADV_TYPE_LENTH 3
 +#define ALIPAY_BLE_ADV_UUID_LENTH 4
 +#define ALIPAY_BLE_DEFAULT_NAME  "KUMIU6"
 +#define ALIPAY_BLE_DEFAULT_NAME_LEN 9 
++=======
+ #include "wearable_log.h"
+ #ifdef SUPPORT_BLE_SERVICE
+ #include "bleService.h"
+ #endif
+ #include "alipay_bluetooth.h"
++>>>>>>> fa34c31711cfbb71ac19ba08823d760738f8e547
  
  // Alipay 蓝牙模块全局变量
  static gap_ble_callbacks_t g_alipay_gapble_cbs;
diff --cc code/sdk/application/wearable/service/ble_service/bleEvent.c
index 6cda489f0,f1ff522c7..29b354c08
--- a/code/sdk/application/wearable/service/ble_service/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleEvent.c
@@@ -25,21 -25,15 +25,26 @@@
  #include "bts_a2dp_sink.h"
  #include "osal_timer.h"
  #include "bleEvent.h"
+ #ifdef SUPPORT_BLE_SERVICE
  #include "app_common_api.h"
++<<<<<<< HEAD
 +#include "hidService.h"
++=======
+ #endif
++>>>>>>> fa34c31711cfbb71ac19ba08823d760738f8e547
  #include "../../../../../open_source/openharmony/third_party/cJSON/cJSON.h"
  #include "errcode.h"
 -
 +#define PHONE_WATCH_CONFIG_PATH "/user/userdata/phone_watch.json"
 +#define ALARM_DATA_CONFIG_PATH "/user/userdata/alarm_test.json"
 +uint8_t *bigDataBuf = NULL;//大数据buf
 +uint8_t bigDataBufLen=0;
 +bool sendbigDataBufState = false;//发送大数据表示不要被其他指令打断
 +bool recvBigDataBufState = false;//接收大数据标志
 +static bool muiltFlag = 0;//多包数据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;
 -
 +#if 1
  
  // 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)