From: Caisking <3449750381@qq.com> Date: Mon, 28 Oct 2024 08:07:11 +0000 (+0800) Subject: 表盘:增加支付宝点击判断 X-Git-Tag: fd230_release_V1.3.102~175^2~5 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=f52490c23f444662f0fdc1c1be93f65ed7aa3b65;p=mirrors%2FFD230.git 表盘:增加支付宝点击判断 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp index f0839bd46..5ca56335c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp @@ -11,6 +11,7 @@ #include "message/include/MessageControlView.h" #include "hal_tick.h" #include "common/image_cache_manager.h" +#include "alipay_feature.h" #ifdef SUPPORT_AT_OHOSFWK #include "ui_screennotify.h" #endif @@ -345,9 +346,15 @@ namespace OHOS DialClick dialClick = node->data_; if (dialClick.area.IsContains(point)) { - if (dialClick.isSliceType) + if (dialClick.isSliceType) { + //支付宝需要先判断 +#ifdef SUPPORT_ALIPAY_SEC + if(dialClick.sliceId == VIEW_MAIN_ALIPAY&&Alipay_is_init()==false) { - NativeAbility::GetInstance().ChangeSlice(dialClick.sliceId); + return false; + } +#endif + NativeAbility::GetInstance().ChangeSlice(dialClick.sliceId); } else { diff --git a/tools/dial_converter_tool/dial_lzma/113/golden_ball.lzma b/tools/dial_converter_tool/dial_lzma/113/golden_ball.lzma deleted file mode 100644 index f2c264ebd..000000000 Binary files a/tools/dial_converter_tool/dial_lzma/113/golden_ball.lzma and /dev/null differ diff --git a/tools/dial_converter_tool/dial_lzma/115/pointer.lzma b/tools/dial_converter_tool/dial_lzma/115/pointer.lzma deleted file mode 100644 index eed5bb1ca..000000000 Binary files a/tools/dial_converter_tool/dial_lzma/115/pointer.lzma and /dev/null differ