合并提交

diff --cc code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
index 8335686,c83f5fb..d3134e3
--- 1/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
--- 2/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"\r
  #include "alipay_feature.h"\r
  #include "securec.h"\r
++<<<<<<< HEAD\r
 +/* Gatt service UUID */\r
 +#define ALIPAYY_SERVICE_ID 0x0238\r
 +/* Gatt Characteristic UUID */\r
 +#define ALIPAYY_CHARACTERISTIC_ID 0x024A\r
 +/* Client Characteristic Configuration UUID */\r
 +#define ALIPAYY_BLE_UUID_CLIENT_CHARACTERISTIC_CONF 0x2902\r
 +/* Gatt Characteristic max length */\r
 +#define ALIPAY_CHARACTERISTIC_MAX_LENGTH 256\r
 +#define ALIPAY_BLE_ADV_ID 1\r
 +#define ALIPAY_BLE_ADV_DATA_MAX_LENGTH 31\r
 +#define ALIPAY_BLE_ADV_BLE_NAME_MAX_LENGTH 13 // 31-4-2-3-9 = 13\r
 +#define ALIPAY_BLE_NAME_LENGTH 20\r
 +#define ALIPAY_BLE_ADV_MAC_HEAD_LENTH 4\r
 +#define ALIPAY_BLE_ADV_MAC_LENTH 10\r
 +#define ALIPAY_BLE_ADV_TYPE_LENTH 3\r
 +#define ALIPAY_BLE_ADV_UUID_LENTH 4\r
 +#define ALIPAY_BLE_DEFAULT_NAME  "KUMIU6"\r
 +#define ALIPAY_BLE_DEFAULT_NAME_LEN 9 \r
++=======\r
+ #include "wearable_log.h"\r
+ #ifdef SUPPORT_BLE_SERVICE\r
+ #include "bleService.h"\r
+ #endif\r
+ #include "alipay_bluetooth.h"\r
++>>>>>>> fa34c31711cfbb71ac19ba08823d760738f8e547\r
  \r
  // Alipay 蓝牙模块全局变量\r
  static gap_ble_callbacks_t g_alipay_gapble_cbs;\r

diff --cc code/sdk/application/wearable/service/ble_service/bleEvent.c
index 6cda489,f1ff522..29b354c
--- 1/code/sdk/application/wearable/service/ble_service/bleEvent.c
--- 2/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"\r
  #include "osal_timer.h"\r
  #include "bleEvent.h"\r
+ #ifdef SUPPORT_BLE_SERVICE\r
  #include "app_common_api.h"\r
++<<<<<<< HEAD\r
 +#include "hidService.h"\r
++=======\r
+ #endif\r
++>>>>>>> fa34c31711cfbb71ac19ba08823d760738f8e547\r
  #include "../../../../../open_source/openharmony/third_party/cJSON/cJSON.h"\r
  #include "errcode.h"\r
 -\r
 +#define PHONE_WATCH_CONFIG_PATH "/user/userdata/phone_watch.json"\r
 +#define ALARM_DATA_CONFIG_PATH "/user/userdata/alarm_test.json"\r
 +uint8_t *bigDataBuf = NULL;//大数据buf\r
 +uint8_t bigDataBufLen=0;\r
 +bool sendbigDataBufState = false;//发送大数据表示不要被其他指令打断\r
 +bool recvBigDataBufState = false;//接收大数据标志\r
 +static bool muiltFlag = 0;//多包数据flag\r
 +static uint16_t data_len = 0;\r
  ble_recv_data_info_t ble_recv_data;\r
  ble_recv_msg_callback_t g_recv_msg_toUI = NULL;\r
 -\r
 +#if 1\r
  \r
  // typedef void (*hx3695_msg_callback_t)(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen);\r
  uint32_t ble_recv_register_msg_callback(ble_recv_msg_callback_t func)\r

diff --cc code/sdk/application/wearable/service/hid_service/hidService.c
Simple merge