From: SnickerSun <snickersun@163.com>
Date: Wed, 17 Apr 2024 03:03:14 +0000 (+0800)
Subject: 支付宝绑定验证通过
X-Git-Tag: release_V1.2.70_20241020_135402~1176^2~1
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=refs%2Fchanges%2F26%2F1;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 1653ff279..ef70ddf96 100644
--- a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
+++ b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c
@@ -17,9 +17,25 @@
 
 #include "wearable_log.h"
 #ifdef SUPPORT_ALIPAY_SEC
-#include "bleService.h"
-#include "alipay_bluetooth.h"
 
+/* 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  "WatchDemo"
+#define ALIPAY_BLE_DEFAULT_NAME_LEN 9 
 
 // Alipay 蓝牙模块全局变量
 static gap_ble_callbacks_t g_alipay_gapble_cbs;
@@ -61,7 +77,7 @@ static void svr_alipay_ble_adv_data_set(int adv_id)
     memset_s(&adv_data_info, sizeof(gap_ble_config_adv_data_t), 0, sizeof(gap_ble_config_adv_data_t));
 
     int32_t ret = gap_ble_get_local_name(ble_name, &ble_name_len);
-    if (ret != 0) 
+    // if (ret != 0) 
     {
         ALIPAY_PRINT_ERR(0, "gap_ble_get_local_name fail, name:%s,len:%u,ret:%u.", ble_name, ble_name_len, ret);
         memset_s(ble_name, ALIPAY_BLE_NAME_LENGTH, 0, ALIPAY_BLE_NAME_LENGTH);
@@ -149,8 +165,6 @@ static void svr_alipay_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t
     g_alipay_conn_id = conn_id;
     if (GAP_BLE_STATE_DISCONNECTED == conn_state) { // restart ble adv when disconnected
         svr_alipay_ble_adv_start();
-        // svr_alipay_reset_init();
-        //gap_ble_start_adv(ALIPAY_BLE_ADV_ID);
     } else {
         svr_alipay_set_adv_start_state(false);
     }
@@ -171,11 +185,10 @@ static void svr_alipay_ble_adv_stop_cb(uint8_t adv_id, adv_status_t status)
 {
     ALIPAY_PRINT_DEBUG(0, "BleAdvStopCallback adv_id: %d, status:%d\n", adv_id, status);
 }
-// static uint16_t alipay_server_handle = 0;
+
 static void svr_alipay_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, uint16_t srv_handle,
     errcode_t status)
 {
-    // alipay_server_handle = srv_handle;
     ALIPAY_PRINT_DEBUG(0, "BtGattsServiceAddCallback 0x%x 0x%x 0x%x 0x%x", status, server_id, srv_handle,
         *((uint16_t *)uuid->uuid));
     int ret;
@@ -320,7 +333,6 @@ static void svr_alipay_btcallback_reg(void)
     g_alipay_gatts_cbs.mtu_changed_cb = NULL;
     gatts_register_callbacks(&g_alipay_gatts_cbs);
 }
-//gatts_unregister_server
 
 static void svr_alipay_bt_init_gatts(void)
 {
@@ -368,7 +380,7 @@ void svr_alipay_bluetooth_init(void)
     }
     svr_alipay_btcallback_reg();
     svr_alipay_bt_init_gatts();
-    svr_alipay_ble_adv_start();
+    //svr_alipay_ble_adv_start();
     g_alipay_ble_init_flag = true;
     return;
 }
diff --git a/code/sdk/application/wearable/alipay/service/alipay_feature.c b/code/sdk/application/wearable/alipay/service/alipay_feature.c
index d4d435d02..542527a03 100755
--- a/code/sdk/application/wearable/alipay/service/alipay_feature.c
+++ b/code/sdk/application/wearable/alipay/service/alipay_feature.c
@@ -22,8 +22,6 @@
 #include "osal_msgqueue.h"
 #include "thread_init.h"
 #include "alipay_transit.h"
-#include "bleService.h"
-#include "alipay_bluetooth.h"
 #include "vendor_file.h"
 #if defined(__FREERTOS__)
 #include "FreeRTOS.h"
@@ -69,7 +67,7 @@ static mc_payment_state_t svr_alipay_get_paystate(void)
 {
     return PAYMENT_UNSUPPORTED;
 }
-// extern void svr_alipay_reset_init(void);
+
 static int32_t svr_alipay_notify_bt(bool value)
 {
     if (value) {
@@ -609,7 +607,7 @@ errcode_t uapi_alipay_svr_init(void)
     uapi_gpio_set_dir(ALIPAY_SEC_GPIO, GPIO_DIRECTION_OUTPUT);
     uapi_gpio_set_val(ALIPAY_SEC_GPIO, GPIO_LEVEL_HIGH);
     osDelay(30);
-    
+    svr_alipay_bluetooth_init();
     HS_IIC_Init();
     alipay_pre_init();
     svr_alipay_enter_lpm();