From ae01eae8a2ea4d0858899d44931a312a466e9765 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Fri, 27 Sep 2024 10:48:08 +0000 Subject: [PATCH] Merge #1038 into sdk602patch0626 from refs/changes/1038/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 增加支付宝无法显示字符 方框替换 * refs/changes/1038/head: (1 commits squashed) - 增加支付宝无法显示字符 方框替换 Signed-off-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1038 --- .../nativeapp/nativeui/alipay/src/AlipaySetting.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alipay/src/AlipaySetting.cpp b/code/sdk/application/wearable/nativeapp/nativeui/alipay/src/AlipaySetting.cpp index c889eff58..fc707edda 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/alipay/src/AlipaySetting.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/alipay/src/AlipaySetting.cpp @@ -10,7 +10,9 @@ #include "cmsis_os.h" #include "AlipaySetting.h" #include "AlipayModel.h" - +#include "common/typed_text.h" +#include "font/ui_font.h" +#include "uicomponents/UIComponents.h" namespace OHOS { static const char *SETTING_TITLE = (char *)"设置"; static const char *SETTING_BUTTON = (char *)"解除绑定"; @@ -111,8 +113,10 @@ bool AlipaySetting::AlipayInitLabel(void) } uint8_t str[ALIPAY_GET_NICKNAME_MAX_LENGTH] = {0}; presenter_->AlipayGetNickName(str); - labelName->SetText((const char *)str); - labelName->SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTING_NAME_FONT); + uint8_t str_[ALIPAY_GET_NICKNAME_MAX_LENGTH] = {0}; + updata_char((char *)str_,(char *)str,ALIPAY_GET_NICKNAME_MAX_LENGTH); + labelName->SetText((const char *)str_); + labelName->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, SETTING_NAME_FONT); labelName->SetPosition(SETTING_NAME_X, SETTING_NAME_Y, SETTING_NAME_WIDTH, SETTING_NAME_HEIGHT); labelName->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); labelName->SetStyle(STYLE_TEXT_FONT, SETTING_NAME_FONT); -- 2.17.1