From: CCC <2393524978@qq.com>
Date: Mon, 22 May 2023 03:38:50 +0000 (+0800)
Subject: str
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9c28f312a1a4e1bd2b94361aca3b1bbddf609a0e;p=mirrors%2FASR3603_Z5.git

str
---

diff --git a/2.sdk/gui/lv_watch/framework/language/lang_ch.c b/2.sdk/gui/lv_watch/framework/language/lang_ch.c
index 751be7c8..06917693 100644
--- a/2.sdk/gui/lv_watch/framework/language/lang_ch.c
+++ b/2.sdk/gui/lv_watch/framework/language/lang_ch.c
@@ -848,6 +848,10 @@ const void * lang_text_ch[] = {
     "App正在寻找此设备\n点击屏幕关闭提醒", // WATCH_TEXT_ID_SERVER_SEARCH_PROMPT
     "设备二维码", // WATCH_TEXT_ID_DEVICE_QRCODE
     "未设置号码", // WATCH_TEXT_ID_NO_NUM
+    "手机支付宝扫一扫", // WATCH_TEXT_ID_ZFB_BIND_PROMPT
+    "收银员扫一扫完成付款", // WATCH_TEXT_ID_ZFB_PAY_PROMPT
+    "请对方使用支付宝扫码", // WATCH_TEXT_ID_ZFB_COLLECT_PROMPT,
+    "完成", // WATCH_TEXT_ID_ZFB_FINISH
 
     //CHENG_MODIFY
 
diff --git a/2.sdk/gui/lv_watch/framework/language/lang_en.c b/2.sdk/gui/lv_watch/framework/language/lang_en.c
index 818e59a4..e27d74e5 100644
--- a/2.sdk/gui/lv_watch/framework/language/lang_en.c
+++ b/2.sdk/gui/lv_watch/framework/language/lang_en.c
@@ -844,10 +844,14 @@ const void * lang_text_en[] = {
     "Wrist temperature",
     "SPO2",
     "Temperature",
-    "℃", // WATCH_TEXT_ID_TEMPERATURE_UNIT ℃
+    "C", // WATCH_TEXT_ID_TEMPERATURE_UNIT ℃
     "App is looking for this device\ntap the screen to turn off the reminder", // WATCH_TEXT_ID_SERVER_SEARCH_PROMPT
     "Device qrcode", // WATCH_TEXT_ID_DEVICE_QRCODE
     "No number", // WATCH_TEXT_ID_NO_NUM
+    "Scan with mobile Alipay", // WATCH_TEXT_ID_ZFB_BIND_PROMPT,
+    "Cashier scans to complete payment", // WATCH_TEXT_ID_ZFB_PAY_PROMPT, 
+    "Please use Alipay to scan the code", // WATCH_TEXT_ID_ZFB_COLLECT_PROMPT,
+    "Finish", // WATCH_TEXT_ID_ZFB_FINISH
 
     //CHENG_MODIFY
 
diff --git a/2.sdk/gui/lv_watch/include/ui_textid.h b/2.sdk/gui/lv_watch/include/ui_textid.h
index 2ca1f5ab..d6d2787e 100644
--- a/2.sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/gui/lv_watch/include/ui_textid.h
@@ -855,6 +855,10 @@ enum
     WATCH_TEXT_ID_SERVER_SEARCH_PROMPT,                 /* "App正在寻找此设备，点击屏幕关闭提醒"       "App is looking for this device, tap the screen to turn off the reminder" */
     WATCH_TEXT_ID_DEVICE_QRCODE,                        /* "设备二维码"       "Device qrcode" */
     WATCH_TEXT_ID_NO_NUM,                               /* "未设置号码"       "No number" */
+    WATCH_TEXT_ID_ZFB_BIND_PROMPT,                        /* "手机支付宝扫一扫"       "Scan with mobile Alipay" */
+    WATCH_TEXT_ID_ZFB_PAY_PROMPT,                         /* "收银员扫一扫完成付款"       "Cashier scans to complete payment" */
+    WATCH_TEXT_ID_ZFB_COLLECT_PROMPT,                     /* "请对方使用支付宝扫码"       "Please use Alipay to scan the code" */
+    WATCH_TEXT_ID_ZFB_FINISH,                             /* "完成"                  "Finish"*/
 
     //CHENG_MODIFY