From e89eff06b335a16eaaa043b18f35f5463e1bc203 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 18 四月 2023 17:53:49 +0800
Subject: [PATCH] 群控编辑问题修复
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
index e35b1c0..7c88b59 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
@@ -169,7 +169,7 @@
};
dialog.AddChidren(contentView);
- Button btnTitle = new Button()
+ Button btnTitle2 = new Button()
{
Y = Application.GetRealHeight(16),
Height = Application.GetRealHeight(30),
@@ -179,18 +179,18 @@
IsBold = true,
TextID = StringId.FaceProtocolPrompt,
};
- contentView.AddChidren(btnTitle);
+ contentView.AddChidren(btnTitle2);
Button btnMsg = new Button()
{
Gravity = Gravity.CenterHorizontal,
Height = Application.GetRealHeight(35),
- Y = btnTitle.Bottom,
+ Y = btnTitle2.Bottom,
Width = Application.GetRealHeight(200),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = " 涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�",
+ TextID =StringId.FaceProTipText1,
IsMoreLines = true,
};
contentView.AddChidren(btnMsg);
@@ -204,9 +204,10 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = " 銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�",
+ TextID = StringId.FaceProTipText2,
IsMoreLines = true,
};
+
contentView.AddChidren(btnMsg1);
Button btnMsg2 = new Button()
@@ -218,23 +219,23 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = " 鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙ｅ苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�",
+ TextID = StringId.FaceProTipText3,
IsMoreLines = true,
};
contentView.AddChidren(btnMsg2);
- Button btnLine = new Button()
+ Button btnLine2 = new Button()
{
Y = Application.GetRealHeight(149),
Height = Application.GetRealHeight(1),
Width = Application.GetRealWidth(270 / 2),
BackgroundColor = CSS.CSS_Color.DividingLineColor,
};
- contentView.AddChidren(btnLine);
+ contentView.AddChidren(btnLine2);
Button btnCancel = new Button()
{
- Y = btnLine.Bottom,
+ Y = btnLine2.Bottom,
Width = Application.GetRealWidth(135),
Height = Application.GetRealHeight(43),
TextAlignment = TextAlignment.Center,
@@ -249,7 +250,7 @@
Button btnConfirm = new Button()
{
X = btnCancel.Right,
- Y = btnLine.Y,
+ Y = btnLine2.Y,
Width = Application.GetRealWidth(135),
Height = Application.GetRealHeight(45),
TextAlignment = TextAlignment.Center,
@@ -265,22 +266,22 @@
btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
dialog.Show();
- btnCancel.MouseUpEventHandler += (sender, e) =>
+ btnCancel.MouseUpEventHandler += (sender2, e2) =>
{
dialog.Close();
};
- btnMsg1.MouseUpEventHandler += (sender, e) =>
+ btnMsg1.MouseUpEventHandler += (sender2, e2) =>
{
string url = "https://developer.hdlcontrol.com/浜鸿劯淇℃伅閲囬泦鍗忚.html";
if (Language.CurrentLanguage != "Chinese")
{
url = "https://developer.hdlcontrol.com/Face information collection protocol.html";
}
- new WebViewDialog().LoadPage("浜鸿劯淇℃伅閲囬泦鍗忚", url);
+ new WebViewDialog().LoadPage(Language.StringByID(StringId.GetFaceProtocol), url);
dialog.Close();
};
- btnConfirm.MouseUpEventHandler = (sender, e) => {
+ btnConfirm.MouseUpEventHandler = (sender2, e2) => {
dialog.Close();
OnAppConfig.Instance.FaceManagementTip = true;
OnAppConfig.Instance.SaveConfig();
@@ -324,7 +325,7 @@
}
else
{
- var btnTitle = new Button()
+ var btnTitle2 = new Button()
{
Y = Application.GetRealHeight(70),
X = Application.GetRealWidth(16),
@@ -334,11 +335,11 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = StringId.NewMemberAccount,
};
- bodyView.AddChidren(btnTitle);
+ bodyView.AddChidren(btnTitle2);
etMemberAccount = new EditText()
{
- Y = btnTitle.Bottom,
+ Y = btnTitle2.Bottom,
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(356),
Height = Application.GetRealHeight(40),
--
Gitblit v1.8.0