From: hcj <1224667075@qq.com> Date: Mon, 14 Oct 2024 10:31:41 +0000 (+0800) Subject: 支付宝断连修改 X-Git-Tag: release_V1.2.70_20241020_135402~9^2~24 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=69acf0c48f77a29eba2e5bfac50d596973776883;p=mirrors%2FFD230.git 支付宝断连修改 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h index 1895f63ad..8f47146f5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h @@ -23,6 +23,7 @@ void AlipaySwitchTimerCallBackProc(void *argument); void AlipayMsgCallBack(uint32_t msgId, uint32_t actionRes); #define ALIPAY_BIND_STATUS_TIMER_LENGTH 2000 +#define ALIPAY_BIND_STATUS_DISCONNECT 3000 #define ALIPAY_GET_BIND_STR_MAX_LENGTH 256 #define ALIPAY_GET_PAY_STR_MAX_LENGTH 20 #define ALIPAY_GET_AID_STR_MAX_LENGTH 256 diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp index f5e948a84..72b52bc6f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp @@ -40,6 +40,7 @@ int16 AlipayModel::GetAlipayInterLis(void) { return alipayInterLis; } +static uint8_t disconnectfalg=0; void AlipayBindCallBackProc(void *argument) { @@ -69,26 +70,40 @@ void AlipayBindCallBackProc(void *argument) AlipayMainView::GetInstance()->ChangeView(currentView, ALIPAY_BIND_RES_VIEW); - AlipayModel::GetInstance()->AlipayStopdisconnecTimer(); + //AlipayModel::GetInstance()->AlipayStopdisconnecTimer(); } else if (ALIPAY_INTER_STATUS_BINDING_FAIL == status && reFlag == 1) { AlipayModel::GetInstance()->AlipayStopBindTimer(); AlipayModel::GetInstance()->AlipaySetBindFlag(false); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayBindCallBackProc ALIPAY_INTER_STATUS_BINDING_FAIL"); AlipayModel::GetInstance()->AlipaySetRefreshFlag(0); AlipayMainView::GetInstance()->ChangeView(currentView, ALIPAY_BIND_RES_VIEW); - AlipayModel::GetInstance()->AlipayStopdisconnecTimer(); + + //AlipayModel::GetInstance()->AlipayStopdisconnecTimer(); } - else if (ALIPAY_INTER_STATUS_START_BINDING == status && reFlag == 1 && currentView==ALIPAY_BIND_ANI_VIEW) { + else if (ALIPAY_INTER_STATUS_START_BINDING == status && reFlag == 1) { if(get_Alipay_ble_connect()==false) { - AlipayModel::GetInstance()->ble_disconnect_AlipayStartBind(); + disconnectfalg++; + if(disconnectfalg>=2) + { + + AlipayModel::GetInstance()->AlipaySetBindFlag(false); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayBindCallBackProc ALIPAY_INTER_STATUS_BINDING_FAIL"); + AlipayModel::GetInstance()->AlipaySetRefreshFlag(0); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "ble 断开连接 "); + AlipayModel::GetInstance()->AlipayStopBindTimer(); + AlipayMainView::GetInstance()->ChangeView(currentView, ALIPAY_BIND_RES_VIEW); + } + + //AlipayModel::GetInstance()->ble_disconnect_AlipayStartBind(); } } } void AlipayBindCallBackProcdisconnect(void *argument) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayBindCallBackProc in."); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindCallBackProcdisconnect in."); const alipay_svr_api_t *alipay_api = alipay_svr_get_api(); int32_t status = 0; int32_t ret = alipay_api->get_bind_status(&status); @@ -100,13 +115,13 @@ void AlipayBindCallBackProcdisconnect(void *argument) int16_t currentView = AlipayModel::GetInstance()->GetAlipayInterLis(); uint32_t reFlag = AlipayModel::GetInstance()->AlipayGetRefreshFlag(); - if (ALIPAY_INTER_STATUS_START_BINDING == status && reFlag == 1 && currentView==ALIPAY_BIND_ANI_VIEW) { + if (ALIPAY_INTER_STATUS_START_BINDING == status && reFlag == 1 ) { if(get_Alipay_ble_connect()==false) { AlipayModel::GetInstance()->AlipayStopBindTimer(); AlipayModel::GetInstance()->AlipaySetBindFlag(false); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayBindCallBackProc ALIPAY_INTER_STATUS_BINDING_FAIL"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayBindCallBackProc ALIPAY_INTER_STATUS_BINDING_FAIL"); AlipayModel::GetInstance()->AlipaySetRefreshFlag(0); AlipayMainView::GetInstance()->ChangeView(currentView, ALIPAY_BIND_RES_VIEW); } @@ -126,31 +141,34 @@ void AlipayBindTimerCallBackbledisconnect(void *argument) bool AlipayModel::ble_disconnect_AlipayStartBind(void) { - if (ble_disconnect_bindTimerId == nullptr) { - ble_disconnect_bindTimerId = osTimerNew(AlipayBindTimerCallBackbledisconnect, osTimerOnce, (void *)0, nullptr); - if (ble_disconnect_bindTimerId == nullptr) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStartBind Create timer fail."); - return false; - } - } + // if (ble_disconnect_bindTimerId == nullptr) { + + // ble_disconnect_bindTimerId = osTimerNew(AlipayBindTimerCallBackbledisconnect, osTimerOnce, (void *)0, nullptr); + // if (ble_disconnect_bindTimerId == nullptr) { + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStartBind Create timer fail."); + // return false; + // } + + // int32_t retcode = osTimerStart(ble_disconnect_bindTimerId, ALIPAY_BIND_STATUS_DISCONNECT); + // if (retcode != 0) { + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStartBind Start timer fail"); + // return false; + // } + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayModel::ble_disconnect_AlipayStartBind"); + // } - int32_t retcode = osTimerStart(ble_disconnect_bindTimerId, ALIPAY_BIND_STATUS_TIMER_LENGTH*2); - if (retcode != 0) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStartBind Start timer fail"); - return false; - } return true; } void AlipayModel::AlipayStopdisconnecTimer(void) { - if (ble_disconnect_bindTimerId == nullptr) { - return; - } - int32_t ret = osTimerStop(ble_disconnect_bindTimerId); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStopBindTimer in,%u.", ret); - ble_disconnect_bindTimerId=nullptr; + // if (ble_disconnect_bindTimerId == nullptr) { + // return; + // } + // int32_t ret = osTimerStop(ble_disconnect_bindTimerId); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayStopBindTimer in,%u.", ret); + // ble_disconnect_bindTimerId=nullptr; return; } @@ -165,6 +183,7 @@ bool AlipayModel::AlipayStartBind(void) return false; } } + disconnectfalg=0; int32_t retcode = osTimerStart(bindTimerId, ALIPAY_BIND_STATUS_TIMER_LENGTH); if (retcode != 0) { @@ -307,6 +326,8 @@ void AlipayModel::AlipayUnbind(void) void AlipayModel::AlipayStopBindTimer(void) { + disconnectfalg=0; + if (bindTimerId == nullptr) { return; } diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c index a8171ed6e..032c645da 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c @@ -438,11 +438,7 @@ void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, gap_bl } } - else - { - - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "其他连接断开,不做多余处理 \r\n"); - } + //如果ble连接全部断连,则需要重新开启广播 //可能因ble连接不够稳定,快速断开ble连接,无法将连接判定为app连接导致断连的时候没有正确重新开启广播 if(!get_ble_connect()) @@ -464,7 +460,11 @@ void svr_ble_connstate_change_cb(unsigned short conn_id, bd_addr_t *addr, gap_bl //如果当前页面处于支付宝界面,则重新开广播 svr_ble_adv_start(); } - + + if(g_ble_Alipay_conn_id==conn_id) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "支付宝断开连接 \r\n"); + } } else @@ -1391,7 +1391,8 @@ static void svr_ble_bt_gatts_req_write_cb(uint8_t server_id, uint16_t conn_id, g } if(is_alipay_handle(write_cb_para->handle)) { - g_ble_Alipay_conn_id=conn_id; + g_ble_Alipay_conn_id=conn_id; + printf("g_ble_Alipay_conn_id\r\n"); } // else // {