From a9d1161b1df96e7ddad566335989a1444e433ef5 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 11:54:45 +0800
Subject: [PATCH] 2023年03月28日11:52:02
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs | 86 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 18 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 668e511..0a77c44 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
@@ -27,8 +27,7 @@
public void LoadPage(IntegratedBrand_Iot brand_Iot)
{
-
- new TopViewDiv(bodyView, Language.StringByID(StringId.Bind3thIotAccount)).LoadTopView(CSS_Color.MainBackgroundColor);
+ new TopViewDiv(bodyView, brand_Iot.brandName).LoadTopView(CSS_Color.MainBackgroundColor);
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
@@ -63,6 +62,10 @@
Text = "鍏充簬璐﹀彿缁戝畾鐨勫０鏄�"
};
contentView.AddChidren(btnTipTitle);
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ btnTipTitle.Text = "Statement on account binding";
+ }
var btnTipText = new Button()
{
@@ -87,6 +90,16 @@
"濡傞渶缁堟浠ヤ笂淇℃伅鐨勬敹闆嗕笌澶勭悊锛屾偍鍙互鍦ㄢ�滄垜鐨勨��> 鈥滅粦瀹氱涓夋柟璐︽埛鈥�>鈥滆В闄も��"
};
contentView.AddChidren(btnTipText);
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ btnTipText.Text = $"account binding brand: {brand_Iot.brandName} (hereinafter referred to as the third party brand)" + "\r\n" + "\r\n" +
+"After you bind the account of the third-party brand, you will authorize 'on Pro' to use your account of the third-party to jointly manage the device. On Pro will also automatically synchronize the device you added in the third-party brand." + "\r\n" + "\r\n" +
+"To realize the device control function, this application will obtain the following data from a third party:" + "\r\n" + "\r\n" +
+"1. List of some devices added on the third-party brand for intelligent control in on Pro;" + "\r\n" + "\r\n" +
+"2. Equipment and network information, including equipment identifier, MAC address and equipment serial number, is used to identify the currently working equipment and perform equipment control functions." + "\r\n" + "\r\n" +
+"If you do not agree with our collection of the above information, you will not be able to manage third-party branded devices." + "\r\n" + "\r\n" +
+"To terminate the collection and processing of the above information, you can click my > bind third party account > cancel";
+ }
var optionView = new FrameLayout()
@@ -110,7 +123,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = "杩斿洖",
+ TextID= StringId.fanhui,
Radius = (uint)Application.GetRealHeight(22)
};
optionView.AddChidren(btnCannel);
@@ -133,25 +146,42 @@
Radius = (uint)Application.GetRealHeight(22)
};
optionView.AddChidren(btnComfirm);
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ btnComfirm.Text = "Consent authorization";
+ }
if (!brand_Iot.hasAuthorization)
{
btnComfirm.MouseUpEventHandler = (sender, e) =>
{
- brand_Iot.hasAuthorization = true;
- boundAction?.Invoke();
- this.RemoveFromParent();
- var page = new Iot_BrandFunctionListPage(brand_Iot);
- page.unboundAction = unboundAction;
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+ Action action = () => {
+ brand_Iot.hasAuthorization = true;
+ boundAction?.Invoke();
+ this.RemoveFromParent();
+ var page = new Iot_BrandFunctionListPage(brand_Iot);
+ page.unboundAction = unboundAction;
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+
+ var page2 = new Iot_AuthorizedPage(brand_Iot,action);
+ page2.LoadView();
+
+
+
};
}
else
{
btnComfirm.Text = "瑙ｉ櫎鎺堟潈";
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ btnComfirm.Text = "Cancel authorization";
+ }
btnComfirm.MouseUpEventHandler = (sender, e) =>
{
Dialog dialog = new Dialog()
@@ -159,7 +189,7 @@
BackgroundColor = CSS_Color.DialogTransparentColor1,
};
- FrameLayout contentView = new FrameLayout()
+ FrameLayout contentView2 = new FrameLayout()
{
Gravity = Gravity.Center,
Width = Application.GetRealWidth(305),
@@ -169,7 +199,7 @@
BorderWidth = 0,
Radius = (uint)Application.GetMinRealAverage(10),
};
- dialog.AddChidren(contentView);
+ dialog.AddChidren(contentView2);
Button btnMsg = new Button()
{
@@ -183,7 +213,11 @@
Text = "鎾ら攢鎺堟潈鍚庯紝璇ュ搧鐗屽叧鑱斿湪On Pro涓殑璁惧灏嗗叏閮ㄨ瑙ｇ粦锛岀浉鍏充娇鐢ㄤ俊鎭悎璁惧鍊间篃灏嗗け鏁�",
IsMoreLines = true,
};
- contentView.AddChidren(btnMsg);
+ 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()
{
@@ -191,7 +225,7 @@
Height = Application.GetRealHeight(1),
BackgroundColor = CSS.CSS_Color.DividingLineColor,
};
- contentView.AddChidren(btnLine);
+ contentView2.AddChidren(btnLine);
Button btnConfirm = new Button()
{
@@ -204,21 +238,26 @@
SelectedBackgroundColor = CSS_Color.MainColor,
Text = "纭畾鎾ゅ洖鎺堟潈",
};
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ btnConfirm.Text = "Confirm to withdraw authorization";
+ }
btnConfirm.SetCornerWithSameRadius(Application.GetMinRealAverage(10), HDLUtils.RectCornerBottomLeft);
btnConfirm.SetCornerWithSameRadius(Application.GetMinRealAverage(10), HDLUtils.RectCornerBottomRight);
- contentView.AddChidren(btnConfirm);
+ contentView2.AddChidren(btnConfirm);
dialog.Show();
- btnConfirm.MouseDownEventHandler += (sender, e) =>
+ btnConfirm.MouseDownEventHandler += (sender2, e2) =>
{
btnConfirm.IsSelected = true;
};
- btnConfirm.MouseUpEventHandler += (sender, e) =>
+ btnConfirm.MouseUpEventHandler += (sender2, e2) =>
{
var http = new HttpServerRequest();
var waitPage = new Loading();
this.AddChidren(waitPage);
+ dialog.Close();
waitPage.Start("");
new System.Threading.Thread(() =>
{
@@ -239,6 +278,17 @@
});
}
}
+ else
+ {
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ new Alert("", "Operation failed", "").Show();
+ }
+ else
+ {
+ new Alert("", "鎿嶄綔澶辫触", "").Show();
+ }
+ }
}
catch { }
finally
--
Gitblit v1.8.0