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

解决合并冲突
---

diff --git a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
index d3134e3a7..e3f490738 100644
--- 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"
 #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;
@@ -399,4 +379,5 @@ void svr_alipay_reset_init(void)//重新启动alipa的服务
     svr_alipay_bt_init_gatts();
     svr_alipay_ble_adv_start();
     return;
-}
\ No newline at end of file
+}
+#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 29b354c08..a01c1c093 100644
--- 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"
 #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"
@@ -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);
     bleDataRecv(buf,event_size,handle);
 }
+#endif
 #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 445b5fa5e..61e5a34eb 100644
--- 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);
     }
 }
-uint16_t g_alipay_server_handle = 0;
 uint16_t g_hid_server_handle = 0;
 static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t *uuid, uint16_t srv_handle,
     gatts_add_character_result_t *result, errcode_t status)
@@ -739,12 +738,12 @@ static void svr_ble_bt_gatts_req_write_cb(uint8_t server_id, uint16_t conn_id, g
        
     }
     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);
-    }
+    // 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)
diff --git a/code/sdk/application/wearable/service/ble_service/bleService.h b/code/sdk/application/wearable/service/ble_service/bleService.h
index f2ae7c71c..b5f3fa261 100644
--- 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];