解决合并冲突

diff --git a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
index d3134e3..e3f4907 100644 (file)
--- a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
+++ b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
@@ -14,32 +14,12 @@
 #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
+\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
 \r
 // Alipay 蓝牙模块全局变量\r
 static gap_ble_callbacks_t g_alipay_gapble_cbs;\r
@@ -399,4 +379,5 @@ void svr_alipay_reset_init(void)//重新启动alipa的服务
     svr_alipay_bt_init_gatts();\r
     svr_alipay_ble_adv_start();\r
     return;\r
-}
\ No newline at end of file
+}\r
+#endif
\ No newline at end of file

diff --git a/code/sdk/application/wearable/service/ble_service/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleEvent.c
index 29b354c..a01c1c0 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleEvent.c
@@ -27,11 +27,7 @@
 #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
 #define PHONE_WATCH_CONFIG_PATH "/user/userdata/phone_watch.json"\r
@@ -3501,4 +3497,5 @@ void revBleOldData(uint8_t *buf, uint16_t event_size,uint16_t handle)//每包的
     printf("handle :%d data2ae3Cmd:%d data2ae4Cmd:%d buf:%d event_size %d\r\n",handle,data2ae3Cmd,data2ae4Cmd,buf,event_size);\r
     bleDataRecv(buf,event_size,handle);\r
 }\r
+#endif\r
 #endif
\ No newline at end of file

diff --git a/code/sdk/application/wearable/service/ble_service/bleService.c b/code/sdk/application/wearable/service/ble_service/bleService.c
index 445b5fa..61e5a34 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleService.c
@@ -616,7 +616,6 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid,
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "svr_ble_bt_gatts_service_add_cb ret:%d\r\n",ret);\r
     }\r
 }\r
-uint16_t g_alipay_server_handle = 0;\r
 uint16_t g_hid_server_handle = 0;\r
 static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t *uuid, uint16_t srv_handle,\r
     gatts_add_character_result_t *result, errcode_t status)\r
@@ -739,12 +738,12 @@ static void svr_ble_bt_gatts_req_write_cb(uint8_t server_id, uint16_t conn_id, g
        \r
     }\r
     revBleOldData(write_cb_para->value,write_cb_para->length,write_cb_para->handle);\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
+    // 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

diff --git a/code/sdk/application/wearable/service/ble_service/bleService.h b/code/sdk/application/wearable/service/ble_service/bleService.h
index f2ae7c7..b5f3fa2 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleService.h
+++ b/code/sdk/application/wearable/service/ble_service/bleService.h
@@ -7,7 +7,6 @@
 #include "errcode.h"
 extern uint16_t g_ble_conn_id;
 extern uint16_t g_ble_server_id;
-extern uint16_t g_alipay_server_handle;
 extern bd_addr_t phone_addr;
 extern uint8_t bond_flag;
 extern uint8_t phone_mac_data[6];