From: hcj <1224667075@qq.com> Date: Sun, 29 Sep 2024 02:53:30 +0000 (+0800) Subject: 增加支付宝底层初始化判断 避免死机问题 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b38975ef381073615b60a3f72c58ec926ac6d215;p=mirrors%2FFD230.git 增加支付宝底层初始化判断 避免死机问题 --- diff --git a/code/sdk/application/wearable/alipay/service/alipay_feature.c b/code/sdk/application/wearable/alipay/service/alipay_feature.c index 70207684f..f44635ac4 100644 --- a/code/sdk/application/wearable/alipay/service/alipay_feature.c +++ b/code/sdk/application/wearable/alipay/service/alipay_feature.c @@ -613,6 +613,11 @@ errcode_t uapi_alipay_svr_init(void) return ERRCODE_SUCC; } +bool Alipay_is_init(void) +{ + return g_alipay_init_flag; +} + errcode_t uapi_alipay_svr_reset(void) { if (g_alipay_init_flag) { diff --git a/code/sdk/application/wearable/alipay/service/alipay_feature.h b/code/sdk/application/wearable/alipay/service/alipay_feature.h index 390cfc947..e3f28dae5 100755 --- a/code/sdk/application/wearable/alipay/service/alipay_feature.h +++ b/code/sdk/application/wearable/alipay/service/alipay_feature.h @@ -404,6 +404,9 @@ mc_alipay_trans_context_t * svr_alipay_get_trans_context(void); */ uint32_t svr_alipay_register_cb(alipay_msgf_event_callback_func callback); + +bool Alipay_is_init(void); + #ifdef __cplusplus #if __cplusplus } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp index 1c5a8c2f0..4c4d6fbec 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp @@ -17,6 +17,7 @@ #include #include "ConfigModel.h" #include "../../../../../../../drivers/peripheral/slip/cat1Service/cat1_ctl.h" +#include "alipay_feature.h" #include namespace OHOS { @@ -110,6 +111,10 @@ namespace OHOS else if (viewId == DROPDOWN_ALIPAY_TOGGLEBUTTON_VIEWID) // 支付宝 { #ifdef SUPPORT_ALIPAY_SEC + if(Alipay_is_init()==false) + { + return false; + } NativeAbility::GetInstance().EnterSlice(VIEW_MAIN_ALIPAY); #endif }