Merge #1038 into sdk602patch0626 from refs/changes/1038/head

增加支付宝无法显示字符 方框替换

* refs/changes/1038/head: (1 commits squashed)

  - 增加支付宝无法显示字符 方框替换

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1038

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 c889eff..fc707ed 100644 (file)
--- 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"\r
 #include "AlipaySetting.h"\r
 #include "AlipayModel.h"\r
-\r
+#include "common/typed_text.h"\r
+#include "font/ui_font.h"\r
+#include "uicomponents/UIComponents.h"\r
 namespace OHOS {\r
 static const char *SETTING_TITLE = (char *)"设置";\r
 static const char *SETTING_BUTTON = (char *)"解除绑定";\r
@@ -111,8 +113,10 @@ bool AlipaySetting::AlipayInitLabel(void)
     }\r
     uint8_t str[ALIPAY_GET_NICKNAME_MAX_LENGTH] = {0};\r
     presenter_->AlipayGetNickName(str);\r
-    labelName->SetText((const char *)str);\r
-    labelName->SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTING_NAME_FONT);\r
+    uint8_t str_[ALIPAY_GET_NICKNAME_MAX_LENGTH] = {0};\r
+    updata_char((char *)str_,(char *)str,ALIPAY_GET_NICKNAME_MAX_LENGTH);\r
+    labelName->SetText((const char *)str_);\r
+    labelName->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, SETTING_NAME_FONT);\r
     labelName->SetPosition(SETTING_NAME_X, SETTING_NAME_Y, SETTING_NAME_WIDTH, SETTING_NAME_HEIGHT);\r
     labelName->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
     labelName->SetStyle(STYLE_TEXT_FONT, SETTING_NAME_FONT);\r