From f58a0928df594adb6c9bff6dbc4cb3c37babd104 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 12 四月 2023 10:01:27 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into wjc
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs | 40 ++++++----------------------------------
1 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
index 0a77c44..7fe2ade 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
@@ -59,13 +59,9 @@
TextSize = 21,
TextAlignment = TextAlignment.CenterLeft,
IsBold = true,
- Text = "鍏充簬璐﹀彿缁戝畾鐨勫０鏄�"
+ TextID = StringId.AboutBindAcountTip,
};
contentView.AddChidren(btnTipTitle);
- if (Language.CurrentLanguage != "Chinese")
- {
- btnTipTitle.Text = "Statement on account binding";
- }
var btnTipText = new Button()
{
@@ -142,15 +138,10 @@
BackgroundColor= CSS_Color.MainColor,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = "鍚屾剰鎺堟潈",
+ TextID = StringId.Agree,
Radius = (uint)Application.GetRealHeight(22)
};
optionView.AddChidren(btnComfirm);
- if (Language.CurrentLanguage != "Chinese")
- {
- btnComfirm.Text = "Consent authorization";
- }
-
if (!brand_Iot.hasAuthorization)
{
@@ -177,11 +168,7 @@
}
else
{
- btnComfirm.Text = "瑙ｉ櫎鎺堟潈";
- if (Language.CurrentLanguage != "Chinese")
- {
- btnComfirm.Text = "Cancel authorization";
- }
+ btnComfirm.TextID = StringId.Cancel;
btnComfirm.MouseUpEventHandler = (sender, e) =>
{
Dialog dialog = new Dialog()
@@ -210,14 +197,10 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
Padding = new Padding(0,Application.GetRealWidth(16),0,Application.GetRealWidth(16)),
- Text = "鎾ら攢鎺堟潈鍚庯紝璇ュ搧鐗屽叧鑱斿湪On Pro涓殑璁惧灏嗗叏閮ㄨ瑙ｇ粦锛岀浉鍏充娇鐢ㄤ俊鎭悎璁惧鍊间篃灏嗗け鏁�",
+ TextID = StringId.RevokeAuthorizationTip,
IsMoreLines = true,
};
contentView2.AddChidren(btnMsg);
- if (Language.CurrentLanguage != "Chinese")
- {
- btnMsg.Text = "After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid";
- }
Button btnLine = new Button()
{
@@ -236,12 +219,8 @@
TextSize = CSS_FontSize.SubheadingFontSize,
SelectedTextColor = CSS_Color.MainBackgroundColor,
SelectedBackgroundColor = CSS_Color.MainColor,
- Text = "纭畾鎾ゅ洖鎺堟潈",
+ TextID = StringId.ConfirmRevocationOfAuthorization,
};
- if (Language.CurrentLanguage != "Chinese")
- {
- btnConfirm.Text = "Confirm to withdraw authorization";
- }
btnConfirm.SetCornerWithSameRadius(Application.GetMinRealAverage(10), HDLUtils.RectCornerBottomLeft);
btnConfirm.SetCornerWithSameRadius(Application.GetMinRealAverage(10), HDLUtils.RectCornerBottomRight);
contentView2.AddChidren(btnConfirm);
@@ -280,14 +259,7 @@
}
else
{
- if (Language.CurrentLanguage != "Chinese")
- {
- new Alert("", "Operation failed", "").Show();
- }
- else
- {
- new Alert("", "鎿嶄綔澶辫触", "").Show();
- }
+ new Alert("", Language.StringByID(StringId.OperationFailed), "").Show();
}
}
catch { }
--
Gitblit v1.8.0