From: luozheng <1732036298@qq.com> Date: Fri, 23 May 2025 10:23:39 +0000 (+0800) Subject: 支付宝代码合并 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~285 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.js?a=commitdiff_plain;h=550bacfe674e673552d5c0be3a5f384e0be27703;p=mirrors%2FFD230.git 支付宝代码合并 --- diff --git a/code/sdk/application/wearable/alipay/driver_adapt/soc_adapt.c b/code/sdk/application/wearable/alipay/driver_adapt/soc_adapt.c index 7f3b052dc..c9613fb10 100644 --- a/code/sdk/application/wearable/alipay/driver_adapt/soc_adapt.c +++ b/code/sdk/application/wearable/alipay/driver_adapt/soc_adapt.c @@ -93,7 +93,7 @@ void IIC_Master_Receive(unsigned char byAddr, unsigned char *pData, unsigned sho } if (ret != ERRCODE_SUCC) { - if (ret != ERRCODE_I2C_TIMEOUT) MyPrintf("se i2c data read fail! and not equal ERRCODE_I2C_TIMEOUT , ret=0x%x", ret); + MyPrintf("se i2c data read fail! ret=0x%x", ret); } #if PRINT_I2C_LOG diff --git a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c index 0bb7eb569..65aafbd99 100644 --- a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c +++ b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c @@ -207,46 +207,47 @@ static void svr_alipay_ble_adv_stop_cb(uint8_t adv_id, adv_status_t status) } } -//在服务添加成功后添加特征 static void svr_alipay_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, uint16_t srv_handle, errcode_t status) { unused(status); - // 检查UUID是否匹配支付宝服务ID - if ((uuid->uuid_len == sizeof(uint16_t)) && (*((uint16_t *)uuid->uuid) == ALIPAYY_SERVICE_ID)) - { - // 打印服务添加回调的调试信息 + if ((uuid->uuid_len == sizeof(uint16_t)) && (*((uint16_t *)uuid->uuid) == ALIPAYY_SERVICE_ID)) { ALIPAY_PRINT_DEBUG(0, "BtGattsServiceAddCallback 0x%x 0x%x 0x%x 0x%x", status, server_id, srv_handle, *((uint16_t *)uuid->uuid)); - uint16_t id = ALIPAYY_CHARACTERISTIC_ID;// 支付宝特征值ID - gatts_add_chara_info_t character;// 特征值信息结构体 + uint16_t id = ALIPAYY_CHARACTERISTIC_ID; + gatts_add_chara_info_t character; uint16_t value = 0; - // 初始化特征值信息结构体 memset_s(&character, sizeof(gatts_add_chara_info_t), 0, sizeof(gatts_add_chara_info_t)); - character.chara_uuid.uuid_len = sizeof(id); // 设置特征值UUID长度 + character.chara_uuid.uuid_len = sizeof(id); memcpy_s(character.chara_uuid.uuid, sizeof(character.chara_uuid.uuid), (char *)&id, sizeof(id)); character.permissions = GATT_ATTRIBUTE_PERMISSION_READ | GATT_ATTRIBUTE_PERMISSION_WRITE; character.properties = GATT_CHARACTER_PROPERTY_BIT_READ | GATT_CHARACTER_PROPERTY_BIT_WRITE | GATT_CHARACTER_PROPERTY_BIT_NOTIFY; - character.value_len = ALIPAY_CHARACTERISTIC_MAX_LENGTH; // 设置特征值最大长度 - character.value = g_alipay_character_buf; // 设置特征值缓冲区 + character.value_len = ALIPAY_CHARACTERISTIC_MAX_LENGTH; + character.value = g_alipay_character_buf; - // 添加特征值到服务 int ret = gatts_add_characteristic(server_id, srv_handle, &character); if (ret != ERRCODE_SUCC) { ALIPAY_PRINT_ERR(0, "gatts_add_characteristic fail, ret:%u.\r\n", ret); } - g_alipay_svr_handle = srv_handle;// 保存服务句柄 + g_alipay_svr_handle = srv_handle; } } -//在特征添加成功后添加描述符。 +/* 将uint16的uuid数字转化为bt_uuid_t */ +static void bts_data_to_uuid_len2(uint16_t uuid_data, bt_uuid_t *out_uuid) +{ + out_uuid->uuid_len = UUID16_LEN; + out_uuid->uuid[0] = (uint8_t)(uuid_data >> 8); /* 8: octet bit num */ + out_uuid->uuid[1] = (uint8_t)(uuid_data); +} + static void svr_alipay_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) { - if ((uuid->uuid_len == sizeof(uint16_t)) && (*((uint16_t *)uuid->uuid) == ALIPAYY_CHARACTERISTIC_ID)) - { + unused(status); + if ((uuid->uuid_len == sizeof(uint16_t)) && (*((uint16_t *)uuid->uuid) == ALIPAYY_CHARACTERISTIC_ID)) { ALIPAY_PRINT_DEBUG(0, "BtGattsCharacteristicAddCallback 0x%x 0x%x 0x%x 0x%x 0x%x", status, server_id, srv_handle, result->handle, result->value_handle); uint8_t bas_ccc_val[] = { @@ -254,43 +255,38 @@ static void svr_alipay_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid 0x00 }; bt_uuid_t ccc_uuid = { 0 }; - bts_data_to_uuid_len2(0x2902, &ccc_uuid); // 将0x2902转换为UUID格式 - gatts_add_desc_info_t descriptor; - descriptor.desc_uuid = ccc_uuid; //设置描述符UUID - descriptor.permissions = GATT_ATTRIBUTE_PERMISSION_READ | GATT_ATTRIBUTE_PERMISSION_WRITE; // 设置描述符权限 - descriptor.value_len = (uint16_t)sizeof(bas_ccc_val); // 设置描述符值长度 + bts_data_to_uuid_len2(0x2902, &ccc_uuid); + gatts_add_desc_info_t descriptor; + descriptor.desc_uuid = ccc_uuid; + descriptor.permissions = GATT_ATTRIBUTE_PERMISSION_READ | GATT_ATTRIBUTE_PERMISSION_WRITE; + descriptor.value_len = (uint16_t)sizeof(bas_ccc_val); descriptor.value = bas_ccc_val; int ret = 0; ret = gatts_add_descriptor(server_id, srv_handle, &descriptor); if (ret != ERRCODE_SUCC) { ALIPAY_PRINT_ERR(0, "gatts_add_descriptor fail, ret:%u.\r\n", ret); } - // 获取本地蓝牙地址 bd_addr_t addr_info; gatts_add_desc_info_t descriptor_ap; gap_ble_get_local_addr(&addr_info); - bts_data_to_uuid_len2(0x4b02, &ccc_uuid); // 将0x4b02转换为UUID格式 - descriptor_ap.desc_uuid = ccc_uuid; // 设置描述符UUID - descriptor_ap.permissions = GATT_ATTRIBUTE_PERMISSION_READ | GATT_ATTRIBUTE_PERMISSION_WRITE; // 设置描述符权限 - descriptor_ap.value_len = BD_ADDR_LEN; // 设置描述符值长度 + bts_data_to_uuid_len2(0x4b02, &ccc_uuid); + descriptor_ap.desc_uuid = ccc_uuid; + descriptor_ap.permissions = GATT_ATTRIBUTE_PERMISSION_READ | GATT_ATTRIBUTE_PERMISSION_WRITE; + descriptor_ap.value_len = BD_ADDR_LEN; uint8_t ble_data_mac_switch[BD_ADDR_LEN] = {0}; int k = BD_ADDR_LEN; for (int i = 0; i < BD_ADDR_LEN; i++) { - ble_data_mac_switch[--k] = addr_info.addr[i]; // 反转蓝牙地址字节顺序 + ble_data_mac_switch[--k] = addr_info.addr[i]; } - - // 添加第二个描述符到特征值 - descriptor_ap.value = ble_data_mac_switch; // 设置描述符值为蓝牙地址 + descriptor_ap.value = ble_data_mac_switch; ret = gatts_add_descriptor(server_id, srv_handle, &descriptor_ap); if (ret != ERRCODE_SUCC) { ALIPAY_PRINT_ERR(0, "gatts_add_descriptor second fail, ret:%u.\r\n", ret); } - // 启动服务 ret = gatts_start_service(server_id, srv_handle); if (ret != ERRCODE_SUCC) { ALIPAY_PRINT_ERR(0, "gatts_start_service fail, ret:%u.\r\n", ret); } - // 保存特征值句柄 g_alipay_characteristic_handle = result->value_handle; } } @@ -298,6 +294,9 @@ static void svr_alipay_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid static void svr_alipay_bt_gatts_descriptor_add_cb(uint8_t server_id, bt_uuid_t *uuid, uint16_t srv_handle, uint16_t desc_handle, errcode_t status) { + unused(server_id); + unused(uuid); + unused(status); if (g_alipay_svr_handle == srv_handle) { ALIPAY_PRINT_DEBUG(0, "BtGattsDescriptorAddCallback 0x%x 0x%x 0x%x 0x%x", status, server_id, srv_handle, desc_handle); @@ -310,6 +309,8 @@ static void svr_alipay_bt_gatts_descriptor_add_cb(uint8_t server_id, bt_uuid_t * static void svr_alipay_bt_gatts_service_start_cb(uint8_t server_id, uint16_t srv_handle, errcode_t status) { + unused(server_id); + unused(status); if (g_alipay_svr_handle == srv_handle) { ALIPAY_PRINT_DEBUG(0, "BtGattsServiceStartCallback 0x%x 0x%x 0x%x", status, server_id, srv_handle); } @@ -317,17 +318,26 @@ static void svr_alipay_bt_gatts_service_start_cb(uint8_t server_id, uint16_t srv static void svr_alipay_bt_gatts_service_stop_cb(uint8_t server_id, uint16_t srv_handle, errcode_t status) { + unused(server_id); + unused(srv_handle); + unused(status); ALIPAY_PRINT_DEBUG(0, "BtGattsServiceStopCallback 0x%x 0x%x 0x%x", status, server_id, srv_handle); } static void svr_alipay_bt_gatts_service_del_cb(uint8_t server_id, errcode_t status) { + unused(server_id); + unused(status); ALIPAY_PRINT_DEBUG(0, "BtGattsServiceDeleteCallback 0x%x 0x%x", status, server_id); } static void svr_alipay_bt_gatts_req_read_cb(uint8_t server_id, uint16_t conn_id, gatts_req_read_cb_t *read_cb_para, errcode_t status) { + unused(server_id); + unused(conn_id); + unused(read_cb_para); + unused(status); ALIPAY_PRINT_DEBUG(0, "BtGattsRequestReadCallback"); } @@ -345,14 +355,15 @@ bool is_alipay_handle(uint16_t hande) static void svr_alipay_bt_gatts_req_write_cb(uint8_t server_id, uint16_t conn_id, gatts_req_write_cb_t *write_cb_para, errcode_t status) { - // 检查写入的句柄是否匹配支付宝特征值或描述符的句柄 + unused(server_id); + unused(conn_id); + unused(status); if ((g_alipay_characteristic_handle == write_cb_para->handle) || (g_alipay_descriptor_handle[0] == write_cb_para->handle) || (g_alipay_descriptor_handle[1] == write_cb_para->handle)) { ALIPAY_PRINT_DEBUG(0, "write callback,handle:%u str:%s len:%u", write_cb_para->handle, write_cb_para->value, write_cb_para->length); - uint8_t *msg_data = write_cb_para->value; - // 将数据写入支付宝消息队列 + uint8_t *msg_data = write_cb_para->value; errcode_t ret = svr_alipay_msg_write(ALIPAY_MSG_BT, msg_data, write_cb_para->length, false); if (ret != ERRCODE_SUCC) { ALIPAY_PRINT_ERR(0, "svr_alipay_msg_write fail, ret:%u.\r\n", ret); diff --git a/code/sdk/application/wearable/alipay/service/alipay_feature.c b/code/sdk/application/wearable/alipay/service/alipay_feature.c index ff219ef30..2387cbdea 100644 --- a/code/sdk/application/wearable/alipay/service/alipay_feature.c +++ b/code/sdk/application/wearable/alipay/service/alipay_feature.c @@ -505,7 +505,7 @@ static int32_t svr_alipay_msg_proc(uint32_t msg_id, uint8_t *data, uint16_t size return ERRCODE_SUCC; } -static errcode_t svr_alipay_msg_thread(void *data) +static void svr_alipay_msg_thread(void *data) { uint8_t msg_data[ALIPAY_MAX_SIZE + ALIPAY_ID_LEN + ALIPAY_MSG_LEN]; uint32_t msg_data_size = sizeof(msg_data); @@ -526,7 +526,7 @@ static errcode_t svr_alipay_msg_thread(void *data) svr_alipay_msg_proc(msg_id, &msg_data[ALIPAY_ID_LEN + ALIPAY_MSG_LEN], msg_len); } ALIPAY_PRINT_ERR(0, "svr_alipay_msg_thread exit"); - return ERRCODE_SUCC; + return; } static errcode_t svr_alipay_task_init(void) diff --git a/code/sdk/application/wearable/alipay/service/alipay_feature.h b/code/sdk/application/wearable/alipay/service/alipay_feature.h index 27b1ecfe1..6384ae022 100644 --- a/code/sdk/application/wearable/alipay/service/alipay_feature.h +++ b/code/sdk/application/wearable/alipay/service/alipay_feature.h @@ -30,16 +30,13 @@ extern "C" { #define APP_FAILURE (-1) #if !defined(SW_UART_DEBUG) && !defined(SW_RTT_DEBUG) -#ifdef WEARABLE_LOG_DEBUG -#define ALIPAY_PRINT_DEBUG(log_num, fmt, arg...) uapi_diag_debug_log(0, fmt, ##arg) #define ALIPAY_PRINT_ERR(log_num, fmt, arg...) uapi_diag_error_log(0, fmt, ##arg) #define ALIPAY_PRINT_WARN(log_num, fmt, arg...) uapi_diag_warning_log(0, fmt, ##arg) #define ALIPAY_PRINT_INFO(log_num, fmt, arg...) uapi_diag_info_log(0, fmt, ##arg) +#ifdef WEARABLE_LOG_DEBUG +#define ALIPAY_PRINT_DEBUG(log_num, fmt, arg...) uapi_diag_debug_log(0, fmt, ##arg) #else #define ALIPAY_PRINT_DEBUG(log_num, fmt, arg...) -#define ALIPAY_PRINT_ERR(log_num, fmt, arg...) -#define ALIPAY_PRINT_WARN(log_num, fmt, arg...) -#define ALIPAY_PRINT_INFO(log_num, fmt, arg...) #endif #else #define ALIPAY_PRINT_ERR(log_num, fmt, arg...) PRINT("[ALIPAY SVR E/] %s: " fmt "\r\n", __FUNCTION__, ##arg) diff --git a/code/sdk/application/wearable/fd230/service/alipay_msg/alipay_app.cpp b/code/sdk/application/wearable/fd230/service/alipay_msg/alipay_app.cpp index 8801d49f8..38b82aa9a 100644 --- a/code/sdk/application/wearable/fd230/service/alipay_msg/alipay_app.cpp +++ b/code/sdk/application/wearable/fd230/service/alipay_msg/alipay_app.cpp @@ -21,6 +21,7 @@ #ifdef __cplusplus extern "C" { #endif +#include "transspecard.h" #define HOSTENT_TIMEOUT 2000 #define TCP_CONNECT_TIMEOUT 2000 @@ -36,6 +37,7 @@ uint16_t g_tcp_data_readed = 0; uint32_t g_tcp_fd = 0; uint8_t g_netstatus = 0; +#define ALIPAY_TRANSSPECARD_SUPPORT_BLE 1 void msg_center_alipay_reply_ack(uint8_t cmd_id, uint8_t type) { uint8_t ack = 1; /* 与手机APK侧约定 */ @@ -45,6 +47,16 @@ void msg_center_alipay_reply_ack(uint8_t cmd_id, uint8_t type) errcode_t msg_center_alipay_network_status(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { + #if ALIPAY_TRANSSPECARD_SUPPORT_BLE + if(cmd_id != ALIPAY_TRANSSPECARD) + { + printf("msg_center_alipay_network_status cmd_id error:%d\r\n", cmd_id); + return -1; + } + g_netstatus = *((uint8_t *)usr_data); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_alipay_network_status:netstatus = %d\r\n", g_netstatus); + return 0; + #else uint8_t tl_len = msg_center_get_tlv_tl_len(usr_data); uint16_t payload_len = usr_len - tl_len; uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data); @@ -53,6 +65,7 @@ errcode_t msg_center_alipay_network_status(uint8_t cmd_id, uint8_t type, void *u WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_alipay netstatus = %d\r\n", g_netstatus); msg_center_alipay_reply_ack(cmd_id, type); return 0; + #endif } uint8_t msg_center_alipay_get_network_status(void) @@ -62,6 +75,19 @@ uint8_t msg_center_alipay_get_network_status(void) int msg_center_alipay_hostent_request(void *usr_data, uint16_t usr_len) { + #if ALIPAY_TRANSSPECARD_SUPPORT_BLE + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "DNS域名解析请求:%s\r\n", (char *)usr_data); + int ret; + if (g_alipay_hostent_sem == NULL) { + g_alipay_hostent_sem = osSemaphoreNew(1, 0, NULL); + } + ret = send_transspecard_data(MSGCENTER_TYPE_ID_ALIPAY_HOST_INFO, (uint8_t *)usr_data, usr_len); + if (ret != 0) { + return -1; + } else { + return 0; + } + #else int ret; if (g_alipay_hostent_sem == NULL) { g_alipay_hostent_sem = osSemaphoreNew(1, 0, NULL); @@ -73,10 +99,23 @@ int msg_center_alipay_hostent_request(void *usr_data, uint16_t usr_len) } else { return 0; } + #endif } errcode_t msg_center_alipay_hostent_recv(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { + #if ALIPAY_TRANSSPECARD_SUPPORT_BLE + if(cmd_id != ALIPAY_TRANSSPECARD) + { + printf("msg_center_alipay_network_status cmd_id error:%d\r\n", cmd_id); + return -1; + } + (void)memcpy_s(g_alipay_ip, IPV4_LEN, usr_data, usr_len); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "接收app下发的域名解析,域名转换后的IP地址:%d.%d.%d.%d\r\n", + g_alipay_ip[0], g_alipay_ip[1], g_alipay_ip[2], g_alipay_ip[3]); + osSemaphoreRelease(g_alipay_hostent_sem); + return ERRCODE_SUCC; + #else uint8_t tl_len = msg_center_get_tlv_tl_len(usr_data); uint16_t payload_len = usr_len - tl_len; uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data); @@ -86,6 +125,7 @@ errcode_t msg_center_alipay_hostent_recv(uint8_t cmd_id, uint8_t type, void *usr g_alipay_ip[0], g_alipay_ip[1], g_alipay_ip[2], g_alipay_ip[3]); osSemaphoreRelease(g_alipay_hostent_sem); return ERRCODE_SUCC; + #endif } int msg_center_alipay_hostent_reponse(unsigned char *ip) @@ -98,7 +138,7 @@ int msg_center_alipay_hostent_reponse(unsigned char *ip) } else { ret = -1; } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "hostent wait status = 0x%x\r\n", status); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "DNS解析 信号量获取状态 = 0x%x\r\n", status); osSemaphoreDelete(g_alipay_hostent_sem); g_alipay_hostent_sem = NULL; return ret; @@ -106,6 +146,19 @@ int msg_center_alipay_hostent_reponse(unsigned char *ip) int msg_center_alipay_connect_request(void *usr_data, uint16_t usr_len) { + #if ALIPAY_TRANSSPECARD_SUPPORT_BLE + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "tcp连接请求\r\n"); + int ret; + if (g_alipay_tcp_sem == NULL) { + g_alipay_tcp_sem = osSemaphoreNew(1, 0, NULL); + } + ret = send_transspecard_data(MSGCENTER_TYPE_ID_ALIPAY_CONNECT, (uint8_t *)usr_data, usr_len); + if (ret != 0) { + return -1; + } else { + return 0; + } + #else int ret; if (g_alipay_tcp_sem == NULL) { g_alipay_tcp_sem = osSemaphoreNew(1, 0, NULL); @@ -116,10 +169,26 @@ int msg_center_alipay_connect_request(void *usr_data, uint16_t usr_len) } else { return 0; } + #endif } errcode_t msg_center_alipay_connect_recv(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { + #if ALIPAY_TRANSSPECARD_SUPPORT_BLE + if(cmd_id != ALIPAY_TRANSSPECARD) + { + printf("msg_center_alipay_network_status cmd_id error:%d\r\n", cmd_id); + return -1; + } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "接收tcp连接状态\r\n"); + alipay_connect_reponse rep; + (void)memcpy_s(&rep, sizeof(alipay_connect_reponse), usr_data, usr_len); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "recv alipay_connect_reponse info--> %d %d\r\n", + rep.ret, rep.fd); + g_tcp_fd = rep.fd; + osSemaphoreRelease(g_alipay_tcp_sem); + return ERRCODE_SUCC; + #else uint8_t tl_len = msg_center_get_tlv_tl_len(usr_data); uint16_t payload_len = usr_len - tl_len; uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data); @@ -131,10 +200,12 @@ errcode_t msg_center_alipay_connect_recv(uint8_t cmd_id, uint8_t type, void *usr g_tcp_fd = rep.fd; osSemaphoreRelease(g_alipay_tcp_sem); return ERRCODE_SUCC; + #endif } int msg_center_alipay_connect_reponse(void) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_alipay_connect_reponse\r\n"); int ret; osStatus_t status = osSemaphoreAcquire(g_alipay_tcp_sem, TCP_CONNECT_TIMEOUT); if (status == osOK) { @@ -142,12 +213,22 @@ int msg_center_alipay_connect_reponse(void) } else { ret = -1; } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "connect wait status = 0x%x\r\n", status); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "建立TCP连接 信号量获取状态 = %x\r\n", status); return ret; } int msg_center_alipay_tcpdata_request(void *usr_data, uint16_t usr_len) { + #if ALIPAY_TRANSSPECARD_SUPPORT_BLE + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "tcp数据请求 = %d\r\n",usr_len); + int ret; + ret = send_transspecard_data(MSGCENTER_TYPE_ID_ALIPAY_TCPDATA_RECV, usr_data, usr_len); + if (ret != ERRCODE_SUCC) { + return -1; + } else { + return (int)usr_len; + } + #else WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "tcpdata send len = 0x%x\r\n", usr_len); int ret; ret = msg_center_send_data(MSGCENTER_CMD_ALIPAY, MSGCENTER_TYPE_ID_ALIPAY_TCPDATA_RECV, usr_data, usr_len); @@ -156,10 +237,12 @@ int msg_center_alipay_tcpdata_request(void *usr_data, uint16_t usr_len) } else { return (int)usr_len; } + #endif } int msg_center_alipay_tcpdata_wait(uint32_t timeout) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_alipay_tcpdata_wait = %d\r\n",timeout); int ret; osStatus_t status = osSemaphoreAcquire(g_alipay_tcp_sem, timeout); if (status == osOK) { @@ -167,12 +250,35 @@ int msg_center_alipay_tcpdata_wait(uint32_t timeout) } else { ret = 0; } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "tcpdata wait status = 0x%x\r\n", status); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "请求TCP数据 信号量获取状态 0x%x\r\n", status); return ret; } errcode_t msg_center_alipay_tcpdata_recv(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { + #if ALIPAY_TRANSSPECARD_SUPPORT_BLE + if(cmd_id != ALIPAY_TRANSSPECARD) + { + printf("msg_center_alipay_network_status cmd_id error:%d\r\n", cmd_id); + return -1; + } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "接收tcp数据:%d\r\n",usr_len); + if (g_tcp_data != NULL) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, + "The last buff hasn't been read yet, current payload len is %u.\r\n", usr_len); + return ERRCODE_FAIL; + } + g_tcp_data = (uint8_t *)malloc(usr_len); + if (g_tcp_data != NULL) { + g_tcp_data_len = usr_len; + (void)memcpy_s(g_tcp_data, g_tcp_data_len, usr_data, usr_len); + } + + WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "recv tcpdata len = %d\r\n", + g_tcp_data_len); + osSemaphoreRelease(g_alipay_tcp_sem); + return ERRCODE_SUCC; + #else uint8_t tl_len = msg_center_get_tlv_tl_len(usr_data); uint16_t payload_len = usr_len - tl_len; uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data); @@ -191,10 +297,44 @@ errcode_t msg_center_alipay_tcpdata_recv(uint8_t cmd_id, uint8_t type, void *usr g_tcp_data_len); osSemaphoreRelease(g_alipay_tcp_sem); return ERRCODE_SUCC; + #endif } +//接受数据 int msg_center_alipay_tcpdata_read(void *mem, int len) { + #if ALIPAY_TRANSSPECARD_SUPPORT_BLE + int ret = 0; + // printf("进入 msg_center_alipay_tcpdata_read 函数,请求读取的长度为: %d\n", len); + + if (g_tcp_data != NULL) { + // printf("g_tcp_data 不为 NULL,准备读取数据\n"); + int read_len = min(len, g_tcp_data_len); + // printf("实际可读取的长度为: %d\n", read_len); + + (void)memcpy_s(mem, len, g_tcp_data + g_tcp_data_readed, read_len); + // printf("已将 %d 字节的数据从 g_tcp_data 复制到 mem\n", read_len); + + g_tcp_data_readed += read_len; + g_tcp_data_len -= read_len; + // printf("更新后,已读取的数据长度为: %d,剩余数据长度为: %d\n", g_tcp_data_readed, g_tcp_data_len); + + ret = read_len; + + if (g_tcp_data_len == 0) { + // printf("数据已全部读取,释放 g_tcp_data 内存\n"); + free(g_tcp_data); + g_tcp_data = NULL; + g_tcp_data_readed = 0; + // printf("g_tcp_data 已置为 NULL,已读取数据长度重置为 0\n"); + } + } else { + ret = -2; // no data for read + // printf("g_tcp_data 为 NULL,没有数据可供读取,返回 -2\n"); + } + // printf("离开 msg_center_alipay_tcpdata_read 函数,实际读取的长度为: %d\n", ret); + return ret; + #else int ret = 0; if (g_tcp_data != NULL) { int read_len = min(len, g_tcp_data_len); @@ -212,10 +352,33 @@ int msg_center_alipay_tcpdata_read(void *mem, int len) } WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "read tcpdata len = (%d, %d)\r\n", len, ret); return ret; + #endif } int msg_center_alipay_close_request(void) { + #if ALIPAY_TRANSSPECARD_SUPPORT_BLE + WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "发送socket关闭请求\r\n"); + if (g_alipay_tcp_sem != NULL) { + osSemaphoreDelete(g_alipay_tcp_sem); + g_alipay_tcp_sem = NULL; + } + if (g_tcp_data != NULL) { + WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "need free data buff.\r\n"); + free(g_tcp_data); + g_tcp_data = NULL; + g_tcp_data_readed = 0; + } + int ret; + int send_ret = send_transspecard_data(MSGCENTER_TYPE_ID_ALIPAY_CLOSE, &g_tcp_fd, sizeof(g_tcp_fd)); + if (send_ret != ERRCODE_SUCC) { + ret = -1; + } else { + ret = 0; + } + g_tcp_fd = 0; + return ret; + #else if (g_alipay_tcp_sem != NULL) { osSemaphoreDelete(g_alipay_tcp_sem); g_alipay_tcp_sem = NULL; @@ -236,15 +399,25 @@ int msg_center_alipay_close_request(void) } g_tcp_fd = 0; return ret; + #endif } errcode_t msg_center_alipay_close(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { + #if ALIPAY_TRANSSPECARD_SUPPORT_BLE + if(cmd_id != ALIPAY_TRANSSPECARD) + { + printf("msg_center_alipay_close cmd_id error:%d,ecpected cmd_id is:0x09\r\n", cmd_id); + return -1; + } + return ERRCODE_SUCC; + #else uint8_t tl_len = msg_center_get_tlv_tl_len(usr_data); uint16_t payload_len = usr_len - tl_len; uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data); return ERRCODE_SUCC; + #endif } errcode_t msg_center_alipay_time_sync(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) diff --git a/code/sdk/application/wearable/service/alipay_msg/alipay_app.cpp b/code/sdk/application/wearable/service/alipay_msg/alipay_app.cpp index 38b82aa9a..8801d49f8 100644 --- a/code/sdk/application/wearable/service/alipay_msg/alipay_app.cpp +++ b/code/sdk/application/wearable/service/alipay_msg/alipay_app.cpp @@ -21,7 +21,6 @@ #ifdef __cplusplus extern "C" { #endif -#include "transspecard.h" #define HOSTENT_TIMEOUT 2000 #define TCP_CONNECT_TIMEOUT 2000 @@ -37,7 +36,6 @@ uint16_t g_tcp_data_readed = 0; uint32_t g_tcp_fd = 0; uint8_t g_netstatus = 0; -#define ALIPAY_TRANSSPECARD_SUPPORT_BLE 1 void msg_center_alipay_reply_ack(uint8_t cmd_id, uint8_t type) { uint8_t ack = 1; /* 与手机APK侧约定 */ @@ -47,16 +45,6 @@ void msg_center_alipay_reply_ack(uint8_t cmd_id, uint8_t type) errcode_t msg_center_alipay_network_status(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { - #if ALIPAY_TRANSSPECARD_SUPPORT_BLE - if(cmd_id != ALIPAY_TRANSSPECARD) - { - printf("msg_center_alipay_network_status cmd_id error:%d\r\n", cmd_id); - return -1; - } - g_netstatus = *((uint8_t *)usr_data); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_alipay_network_status:netstatus = %d\r\n", g_netstatus); - return 0; - #else uint8_t tl_len = msg_center_get_tlv_tl_len(usr_data); uint16_t payload_len = usr_len - tl_len; uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data); @@ -65,7 +53,6 @@ errcode_t msg_center_alipay_network_status(uint8_t cmd_id, uint8_t type, void *u WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_alipay netstatus = %d\r\n", g_netstatus); msg_center_alipay_reply_ack(cmd_id, type); return 0; - #endif } uint8_t msg_center_alipay_get_network_status(void) @@ -75,19 +62,6 @@ uint8_t msg_center_alipay_get_network_status(void) int msg_center_alipay_hostent_request(void *usr_data, uint16_t usr_len) { - #if ALIPAY_TRANSSPECARD_SUPPORT_BLE - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "DNS域名解析请求:%s\r\n", (char *)usr_data); - int ret; - if (g_alipay_hostent_sem == NULL) { - g_alipay_hostent_sem = osSemaphoreNew(1, 0, NULL); - } - ret = send_transspecard_data(MSGCENTER_TYPE_ID_ALIPAY_HOST_INFO, (uint8_t *)usr_data, usr_len); - if (ret != 0) { - return -1; - } else { - return 0; - } - #else int ret; if (g_alipay_hostent_sem == NULL) { g_alipay_hostent_sem = osSemaphoreNew(1, 0, NULL); @@ -99,23 +73,10 @@ int msg_center_alipay_hostent_request(void *usr_data, uint16_t usr_len) } else { return 0; } - #endif } errcode_t msg_center_alipay_hostent_recv(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { - #if ALIPAY_TRANSSPECARD_SUPPORT_BLE - if(cmd_id != ALIPAY_TRANSSPECARD) - { - printf("msg_center_alipay_network_status cmd_id error:%d\r\n", cmd_id); - return -1; - } - (void)memcpy_s(g_alipay_ip, IPV4_LEN, usr_data, usr_len); - WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "接收app下发的域名解析,域名转换后的IP地址:%d.%d.%d.%d\r\n", - g_alipay_ip[0], g_alipay_ip[1], g_alipay_ip[2], g_alipay_ip[3]); - osSemaphoreRelease(g_alipay_hostent_sem); - return ERRCODE_SUCC; - #else uint8_t tl_len = msg_center_get_tlv_tl_len(usr_data); uint16_t payload_len = usr_len - tl_len; uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data); @@ -125,7 +86,6 @@ errcode_t msg_center_alipay_hostent_recv(uint8_t cmd_id, uint8_t type, void *usr g_alipay_ip[0], g_alipay_ip[1], g_alipay_ip[2], g_alipay_ip[3]); osSemaphoreRelease(g_alipay_hostent_sem); return ERRCODE_SUCC; - #endif } int msg_center_alipay_hostent_reponse(unsigned char *ip) @@ -138,7 +98,7 @@ int msg_center_alipay_hostent_reponse(unsigned char *ip) } else { ret = -1; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "DNS解析 信号量获取状态 = 0x%x\r\n", status); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "hostent wait status = 0x%x\r\n", status); osSemaphoreDelete(g_alipay_hostent_sem); g_alipay_hostent_sem = NULL; return ret; @@ -146,19 +106,6 @@ int msg_center_alipay_hostent_reponse(unsigned char *ip) int msg_center_alipay_connect_request(void *usr_data, uint16_t usr_len) { - #if ALIPAY_TRANSSPECARD_SUPPORT_BLE - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "tcp连接请求\r\n"); - int ret; - if (g_alipay_tcp_sem == NULL) { - g_alipay_tcp_sem = osSemaphoreNew(1, 0, NULL); - } - ret = send_transspecard_data(MSGCENTER_TYPE_ID_ALIPAY_CONNECT, (uint8_t *)usr_data, usr_len); - if (ret != 0) { - return -1; - } else { - return 0; - } - #else int ret; if (g_alipay_tcp_sem == NULL) { g_alipay_tcp_sem = osSemaphoreNew(1, 0, NULL); @@ -169,26 +116,10 @@ int msg_center_alipay_connect_request(void *usr_data, uint16_t usr_len) } else { return 0; } - #endif } errcode_t msg_center_alipay_connect_recv(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { - #if ALIPAY_TRANSSPECARD_SUPPORT_BLE - if(cmd_id != ALIPAY_TRANSSPECARD) - { - printf("msg_center_alipay_network_status cmd_id error:%d\r\n", cmd_id); - return -1; - } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "接收tcp连接状态\r\n"); - alipay_connect_reponse rep; - (void)memcpy_s(&rep, sizeof(alipay_connect_reponse), usr_data, usr_len); - WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "recv alipay_connect_reponse info--> %d %d\r\n", - rep.ret, rep.fd); - g_tcp_fd = rep.fd; - osSemaphoreRelease(g_alipay_tcp_sem); - return ERRCODE_SUCC; - #else uint8_t tl_len = msg_center_get_tlv_tl_len(usr_data); uint16_t payload_len = usr_len - tl_len; uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data); @@ -200,12 +131,10 @@ errcode_t msg_center_alipay_connect_recv(uint8_t cmd_id, uint8_t type, void *usr g_tcp_fd = rep.fd; osSemaphoreRelease(g_alipay_tcp_sem); return ERRCODE_SUCC; - #endif } int msg_center_alipay_connect_reponse(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_alipay_connect_reponse\r\n"); int ret; osStatus_t status = osSemaphoreAcquire(g_alipay_tcp_sem, TCP_CONNECT_TIMEOUT); if (status == osOK) { @@ -213,22 +142,12 @@ int msg_center_alipay_connect_reponse(void) } else { ret = -1; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "建立TCP连接 信号量获取状态 = %x\r\n", status); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "connect wait status = 0x%x\r\n", status); return ret; } int msg_center_alipay_tcpdata_request(void *usr_data, uint16_t usr_len) { - #if ALIPAY_TRANSSPECARD_SUPPORT_BLE - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "tcp数据请求 = %d\r\n",usr_len); - int ret; - ret = send_transspecard_data(MSGCENTER_TYPE_ID_ALIPAY_TCPDATA_RECV, usr_data, usr_len); - if (ret != ERRCODE_SUCC) { - return -1; - } else { - return (int)usr_len; - } - #else WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "tcpdata send len = 0x%x\r\n", usr_len); int ret; ret = msg_center_send_data(MSGCENTER_CMD_ALIPAY, MSGCENTER_TYPE_ID_ALIPAY_TCPDATA_RECV, usr_data, usr_len); @@ -237,12 +156,10 @@ int msg_center_alipay_tcpdata_request(void *usr_data, uint16_t usr_len) } else { return (int)usr_len; } - #endif } int msg_center_alipay_tcpdata_wait(uint32_t timeout) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_alipay_tcpdata_wait = %d\r\n",timeout); int ret; osStatus_t status = osSemaphoreAcquire(g_alipay_tcp_sem, timeout); if (status == osOK) { @@ -250,35 +167,12 @@ int msg_center_alipay_tcpdata_wait(uint32_t timeout) } else { ret = 0; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "请求TCP数据 信号量获取状态 0x%x\r\n", status); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "tcpdata wait status = 0x%x\r\n", status); return ret; } errcode_t msg_center_alipay_tcpdata_recv(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { - #if ALIPAY_TRANSSPECARD_SUPPORT_BLE - if(cmd_id != ALIPAY_TRANSSPECARD) - { - printf("msg_center_alipay_network_status cmd_id error:%d\r\n", cmd_id); - return -1; - } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "接收tcp数据:%d\r\n",usr_len); - if (g_tcp_data != NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, - "The last buff hasn't been read yet, current payload len is %u.\r\n", usr_len); - return ERRCODE_FAIL; - } - g_tcp_data = (uint8_t *)malloc(usr_len); - if (g_tcp_data != NULL) { - g_tcp_data_len = usr_len; - (void)memcpy_s(g_tcp_data, g_tcp_data_len, usr_data, usr_len); - } - - WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "recv tcpdata len = %d\r\n", - g_tcp_data_len); - osSemaphoreRelease(g_alipay_tcp_sem); - return ERRCODE_SUCC; - #else uint8_t tl_len = msg_center_get_tlv_tl_len(usr_data); uint16_t payload_len = usr_len - tl_len; uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data); @@ -297,44 +191,10 @@ errcode_t msg_center_alipay_tcpdata_recv(uint8_t cmd_id, uint8_t type, void *usr g_tcp_data_len); osSemaphoreRelease(g_alipay_tcp_sem); return ERRCODE_SUCC; - #endif } -//接受数据 int msg_center_alipay_tcpdata_read(void *mem, int len) { - #if ALIPAY_TRANSSPECARD_SUPPORT_BLE - int ret = 0; - // printf("进入 msg_center_alipay_tcpdata_read 函数,请求读取的长度为: %d\n", len); - - if (g_tcp_data != NULL) { - // printf("g_tcp_data 不为 NULL,准备读取数据\n"); - int read_len = min(len, g_tcp_data_len); - // printf("实际可读取的长度为: %d\n", read_len); - - (void)memcpy_s(mem, len, g_tcp_data + g_tcp_data_readed, read_len); - // printf("已将 %d 字节的数据从 g_tcp_data 复制到 mem\n", read_len); - - g_tcp_data_readed += read_len; - g_tcp_data_len -= read_len; - // printf("更新后,已读取的数据长度为: %d,剩余数据长度为: %d\n", g_tcp_data_readed, g_tcp_data_len); - - ret = read_len; - - if (g_tcp_data_len == 0) { - // printf("数据已全部读取,释放 g_tcp_data 内存\n"); - free(g_tcp_data); - g_tcp_data = NULL; - g_tcp_data_readed = 0; - // printf("g_tcp_data 已置为 NULL,已读取数据长度重置为 0\n"); - } - } else { - ret = -2; // no data for read - // printf("g_tcp_data 为 NULL,没有数据可供读取,返回 -2\n"); - } - // printf("离开 msg_center_alipay_tcpdata_read 函数,实际读取的长度为: %d\n", ret); - return ret; - #else int ret = 0; if (g_tcp_data != NULL) { int read_len = min(len, g_tcp_data_len); @@ -352,33 +212,10 @@ int msg_center_alipay_tcpdata_read(void *mem, int len) } WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "read tcpdata len = (%d, %d)\r\n", len, ret); return ret; - #endif } int msg_center_alipay_close_request(void) { - #if ALIPAY_TRANSSPECARD_SUPPORT_BLE - WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "发送socket关闭请求\r\n"); - if (g_alipay_tcp_sem != NULL) { - osSemaphoreDelete(g_alipay_tcp_sem); - g_alipay_tcp_sem = NULL; - } - if (g_tcp_data != NULL) { - WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "need free data buff.\r\n"); - free(g_tcp_data); - g_tcp_data = NULL; - g_tcp_data_readed = 0; - } - int ret; - int send_ret = send_transspecard_data(MSGCENTER_TYPE_ID_ALIPAY_CLOSE, &g_tcp_fd, sizeof(g_tcp_fd)); - if (send_ret != ERRCODE_SUCC) { - ret = -1; - } else { - ret = 0; - } - g_tcp_fd = 0; - return ret; - #else if (g_alipay_tcp_sem != NULL) { osSemaphoreDelete(g_alipay_tcp_sem); g_alipay_tcp_sem = NULL; @@ -399,25 +236,15 @@ int msg_center_alipay_close_request(void) } g_tcp_fd = 0; return ret; - #endif } errcode_t msg_center_alipay_close(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { - #if ALIPAY_TRANSSPECARD_SUPPORT_BLE - if(cmd_id != ALIPAY_TRANSSPECARD) - { - printf("msg_center_alipay_close cmd_id error:%d,ecpected cmd_id is:0x09\r\n", cmd_id); - return -1; - } - return ERRCODE_SUCC; - #else uint8_t tl_len = msg_center_get_tlv_tl_len(usr_data); uint16_t payload_len = usr_len - tl_len; uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data); return ERRCODE_SUCC; - #endif } errcode_t msg_center_alipay_time_sync(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c index 678b7048e..b9cba497f 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c @@ -1890,12 +1890,14 @@ static void svr_ble_bt_gatts_req_write_cb(uint8_t server_id, uint16_t conn_id, g g_ble_conn_id=conn_id; uapi_save_runtime_log(RUNTIME_LOG_BLE_APP_CMD); } - // if(is_alipay_handle(write_cb_para->handle)) - // { - // g_ble_Alipay_conn_id=conn_id; - // uapi_save_runtime_log(RUNTIME_LOG_BLE_ALIPAY_CMD); - // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"g_ble_Alipay_conn_id\r\n"); - // } + #ifdef SUPPORT_ALIPAY_SEC + if(is_alipay_handle(write_cb_para->handle)) + { + g_ble_Alipay_conn_id=conn_id; + uapi_save_runtime_log(RUNTIME_LOG_BLE_ALIPAY_CMD); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"g_ble_Alipay_conn_id\r\n"); + } + #endif // else // { // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP," ?????\r\n"); @@ -2074,7 +2076,7 @@ void svr_ble_bluetooth_init(void) #ifdef SUPPORT_HID_SERVICE // ble_hid_server_init(); #endif - #ifdef AILPAY_SUPPORT + #ifdef SUPPORT_ALIPAY_SEC svr_alipay_bluetooth_init(g_ble_server_id); #endif #ifdef FACTORYTEST_SERVICE @@ -2156,7 +2158,7 @@ void ble_avd_mode_change(uint8_t mode) case MODE_ALIPAY_ADV_SRV: - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"alipay_ble_advd_start!!!!!!!!! ble_adv_falg: %d ,AdverFlag: %d",ble_adv_falg,AdverFlag); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"alipay_ble_advd_start!!!!!!!!! ble_adv_falg: %d ,AdverFlag: %d",ble_adv_falg,AdverFlag); svr_ble_adv_start(); break;