From e4ff4b4f64015836f109999b3421e7e6bd39982a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 31 七月 2023 14:19:26 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs | 70 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 24 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..7fe2ade 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;
@@ -60,7 +59,7 @@
TextSize = 21,
TextAlignment = TextAlignment.CenterLeft,
IsBold = true,
- Text = "鍏充簬璐﹀彿缁戝畾鐨勫０鏄�"
+ TextID = StringId.AboutBindAcountTip,
};
contentView.AddChidren(btnTipTitle);
@@ -87,6 +86,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 +119,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = "杩斿洖",
+ TextID= StringId.fanhui,
Radius = (uint)Application.GetRealHeight(22)
};
optionView.AddChidren(btnCannel);
@@ -129,29 +138,37 @@
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 (!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 = "瑙ｉ櫎鎺堟潈";
+ btnComfirm.TextID = StringId.Cancel;
btnComfirm.MouseUpEventHandler = (sender, e) =>
{
Dialog dialog = new Dialog()
@@ -159,7 +176,7 @@
BackgroundColor = CSS_Color.DialogTransparentColor1,
};
- FrameLayout contentView = new FrameLayout()
+ FrameLayout contentView2 = new FrameLayout()
{
Gravity = Gravity.Center,
Width = Application.GetRealWidth(305),
@@ -169,7 +186,7 @@
BorderWidth = 0,
Radius = (uint)Application.GetMinRealAverage(10),
};
- dialog.AddChidren(contentView);
+ dialog.AddChidren(contentView2);
Button btnMsg = new Button()
{
@@ -180,10 +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,
};
- contentView.AddChidren(btnMsg);
+ contentView2.AddChidren(btnMsg);
Button btnLine = new Button()
{
@@ -191,7 +208,7 @@
Height = Application.GetRealHeight(1),
BackgroundColor = CSS.CSS_Color.DividingLineColor,
};
- contentView.AddChidren(btnLine);
+ contentView2.AddChidren(btnLine);
Button btnConfirm = new Button()
{
@@ -202,23 +219,24 @@
TextSize = CSS_FontSize.SubheadingFontSize,
SelectedTextColor = CSS_Color.MainBackgroundColor,
SelectedBackgroundColor = CSS_Color.MainColor,
- Text = "纭畾鎾ゅ洖鎺堟潈",
+ TextID = StringId.ConfirmRevocationOfAuthorization,
};
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 +257,10 @@
});
}
}
+ else
+ {
+ new Alert("", Language.StringByID(StringId.OperationFailed), "").Show();
+ }
}
catch { }
finally
--
Gitblit v1.8.0