From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:19:13 +0800
Subject: [PATCH] 合并嘉乐lc代码
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 555 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 334 insertions(+), 221 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index e215bf9..ffff590 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -3,6 +3,7 @@
using System.Text.RegularExpressions;
using System.Threading;
using HDL_ON.Entity;
+using HDL_ON.Stan;
using HDL_ON.UI.CSS;
using Shared;
@@ -39,10 +40,6 @@
}
if (string.IsNullOrEmpty(text) || list.Contains(text))
{
- //if (titleId == StringId.ModifyMemberNickname)
- //{
- // return;
- //}
string tipMsgString = "";
if (string.IsNullOrEmpty(text))
{
@@ -77,7 +74,7 @@
/// 淇濆瓨鎸夐挳浜嬩欢闇�瑕佸皢
/// </summary>
/// <param name="callBackAction">鍥炶皟鍑芥暟</param>
- public void LoadDialog_EditParater(int titleId, string editParater, Action<string> callBackAction, int errorId_IsNullOrEmpty, int errorId_ContainsPar, List<string> baseList, bool encryption = false)
+ public void LoadDialog_EditParater(int titleId, string editParater, Action<string> callBackAction, int errorId_IsNullOrEmpty, int errorId_ContainsPar, List<string> baseList, bool encryption = false, string confirmText = "")
{
Dialog dialog = new Dialog()
{
@@ -128,10 +125,14 @@
Text = editParater,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- SecureTextEntry = encryption,
+ //SecureTextEntry = encryption,
//TextAlignment = TextAlignment.CenterLeft ,
};
editView.AddChidren(etParater);
+ if(encryption)
+ {
+ etParater.SecureTextEntry = encryption;
+ }
Button btnClear = new Button()
{
@@ -206,6 +207,13 @@
TextID = StringId.Confirm,
};
contentView.AddChidren(btnConfirm);
+
+ //鑷畾涔塨tnConfirm鏍囬
+ if (!string.IsNullOrEmpty(confirmText))
+ {
+ btnConfirm.Text = confirmText;
+ }
+
int mRectCornerID = HDLUtils.RectCornerBottomRight;
btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
@@ -565,227 +573,332 @@
/// 鍦烘櫙寤舵椂璁剧疆寮圭獥
/// </summary>
/// <param name="function"></param>
- public void SetSceneDelayDialog(Action<string> action,string changeDelay)
+ public void SetSceneDelayDialog(Action<string> action,string curItemKey)//Dictionary<string,string>items,
{
- Button lastButton = new Button();
- Dialog dialog = new Dialog();
- var pView = new FrameLayout()
+ List<int> mRange = new List<int>();
+ List<int> sRange = new List<int>();
+ for (int i = 0; i <= 59; i++)
{
- BackgroundColor = CSS_Color.DialogTransparentColor1,
- };
- dialog.AddChidren(pView);
-
- var optionBaseView = new FrameLayout()
+ mRange.Add(i);
+ sRange.Add(i);
+ }
+ sRange.Add(60);
+ BottomTimeSelectControl timeControl = new BottomTimeSelectControl(mRange, sRange, 5, Language.StringByID(StringId.SceneDelay));
+ timeControl.RowHeight = Application.GetRealHeight(50);
+ timeControl.InitControl(0, 0, 262, false);
+ //timeControl.ChangePickerEvent2();
+ timeControl.FinishEvent = (type, hours, min) =>
{
- Y = Application.GetRealHeight(439),
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(208),
- AnimateSpeed = 0.3f,
- Animate = Animate.DownToUp,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(12),
- };
- pView.AddChidren(optionBaseView);
-
- var topView = new FrameLayout()
- {
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(50),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(12),
- };
- optionBaseView.AddChidren(topView);
-
- var btnTitle = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- TextAlignment = TextAlignment.Center,
- Width = Application.GetRealWidth(100),
- TextID = StringId.SceneDelay,
- IsBold = true,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- };
- topView.AddChidren(btnTitle);
-
- var btnCancel = new Button()
- {
- X = Application.GetRealWidth(21),
- Width = Application.GetRealWidth(100),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.Cancel,
- };
- topView.AddChidren(btnCancel);
-
- var btnConfrim = new Button()
- {
- X = Application.GetRealWidth(160),
- Width = Application.GetRealWidth(160),
- TextAlignment = TextAlignment.CenterRight,
- TextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.Confirm,
- };
- topView.AddChidren(btnConfrim);
-
- Button btn1 = new Button()
- {
- Width = Application.GetRealWidth(128),
- Height = Application.GetRealWidth(44),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "30s",
- BorderColor = CSS_Color.PromptingColor1,
- BorderWidth = 1,
- Radius = (uint)Application.GetRealWidth(8),
- SelectedTextColor = CSS_Color.MainBackgroundColor,
- SelectedBackgroundColor = CSS_Color.MainColor,
- X = Application.GetRealWidth(20),
- Y = Application.GetRealHeight(80),
- IsSelected = changeDelay == "30"
- };
- optionBaseView.AddChidren(btn1);
-
-
- Button btn2 = new Button()
- {
- Width = Application.GetRealWidth(128),
- Height = Application.GetRealWidth(44),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "1min",
- BorderColor = CSS_Color.PromptingColor1,
- BorderWidth = 1,
- Radius = (uint)Application.GetRealWidth(8),
- SelectedTextColor = CSS_Color.MainBackgroundColor,
- SelectedBackgroundColor = CSS_Color.MainColor,
- X = Application.GetRealWidth(195),
- Y = Application.GetRealHeight(80),
- IsSelected = changeDelay == "60"
- };
- optionBaseView.AddChidren(btn2);
-
-
- Button btn3 = new Button()
- {
- Width = Application.GetRealWidth(128),
- Height = Application.GetRealWidth(44),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "2min",
- BorderColor = CSS_Color.PromptingColor1,
- BorderWidth = 1,
- Radius = (uint)Application.GetRealWidth(8),
- SelectedTextColor = CSS_Color.MainBackgroundColor,
- SelectedBackgroundColor = CSS_Color.MainColor,
- X = Application.GetRealWidth(20),
- Y = Application.GetRealHeight(140),
- IsSelected = changeDelay == "120"
- };
- optionBaseView.AddChidren(btn3);
-
-
- Button btn4 = new Button()
- {
- Width = Application.GetRealWidth(128),
- Height = Application.GetRealWidth(44),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "5min",
- BorderColor = CSS_Color.PromptingColor1,
- BorderWidth = 1,
- Radius = (uint)Application.GetRealWidth(8),
- SelectedTextColor = CSS_Color.MainBackgroundColor,
- SelectedBackgroundColor = CSS_Color.MainColor,
- X = Application.GetRealWidth(195),
- Y = Application.GetRealHeight(140),
- IsSelected = changeDelay == "300"
- };
- optionBaseView.AddChidren(btn4);
-
-
-
-
- dialog.Show();
-
- pView.MouseUpEventHandler = (sender, e) =>
- {
- dialog.Close();
- };
-
- btnCancel.MouseUpEventHandler = (sender, e) =>
- {
- dialog.Close();
- };
- btnConfrim.MouseUpEventHandler = (sender, e) =>
- {
- action(changeDelay);
- dialog.Close();
- };
- btn1.MouseUpEventHandler = (sender, e) => {
- btn1.IsSelected = !btn1.IsSelected;
- btn2.IsSelected = false;
- btn3.IsSelected = false;
- btn4.IsSelected = false;
- if(btn1.IsSelected)
+ if(type == 1)
{
- changeDelay = "30";
- }
- else
- {
- changeDelay = "0";
- }
- };
- btn2.MouseUpEventHandler = (sender, e) => {
- btn2.IsSelected = !btn2.IsSelected;
- btn1.IsSelected = false;
- btn3.IsSelected = false;
- btn4.IsSelected = false;
- if (btn2.IsSelected)
- {
- changeDelay = "60";
- }
- else
- {
- changeDelay = "0";
+ curItemKey = (hours * 60 + min).ToString();
+ action(curItemKey);
}
};
- btn3.MouseUpEventHandler = (sender, e) => {
- btn3.IsSelected = !btn3.IsSelected;
- btn2.IsSelected = false;
- btn1.IsSelected = false;
- btn4.IsSelected = false;
- if (btn3.IsSelected)
- {
- changeDelay = "120";
- }
- else
- {
- changeDelay = "0";
- }
- };
- btn4.MouseUpEventHandler = (sender, e) => {
- btn4.IsSelected = !btn4.IsSelected;
- btn2.IsSelected = false;
- btn3.IsSelected = false;
- btn1.IsSelected = false;
- if (btn4.IsSelected)
- {
- changeDelay = "300";
- }
- else
- {
- changeDelay = "0";
- }
- };
+
+
+
+ return;
+
+ // Button lastButton = new Button();
+ //Dialog dialog = new Dialog();
+ //var pView = new FrameLayout()
+ //{
+ // BackgroundColor = CSS_Color.DialogTransparentColor1,
+ //};
+ //dialog.AddChidren(pView);
+
+ //var itemCount = items.Count;
+ //var optionBaseViewHeight = ((itemCount > 3 ? itemCount : 3) + 1) * Application.GetRealHeight(50);
+ //var optionBaseView = new FrameLayout()
+ //{
+ // //Y = Application.GetRealHeight(439),
+ // Y = Application.GetRealHeight(647) - optionBaseViewHeight,
+ // Gravity = Gravity.CenterHorizontal,
+ // Width = Application.GetRealWidth(343),
+ // //Height = Application.GetRealHeight(208),
+ // Height = optionBaseViewHeight,
+ // //AnimateSpeed = 0.3f,
+ // //Animate = Animate.DownToUp,
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ // Radius = (uint)Application.GetRealWidth(12),
+ //};
+ //pView.AddChidren(optionBaseView);
+
+ //var topView = new FrameLayout()
+ //{
+ // Gravity = Gravity.CenterHorizontal,
+ // Width = Application.GetRealWidth(343),
+ // Height = Application.GetRealHeight(50),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ // Radius = (uint)Application.GetRealWidth(12),
+ //};
+ //optionBaseView.AddChidren(topView);
+
+ //var btnTitle = new Button()
+ //{
+ // Gravity = Gravity.CenterHorizontal,
+ // TextAlignment = TextAlignment.Center,
+ // Width = Application.GetRealWidth(100),
+ // TextID = StringId.SceneDelay,
+ // IsBold = true,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ //};
+ //topView.AddChidren(btnTitle);
+
+ //var btnCancel = new Button()
+ //{
+ // X = Application.GetRealWidth(21),
+ // Width = Application.GetRealWidth(100),
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.PromptingColor1,
+ // TextSize = CSS_FontSize.TextFontSize,
+ // TextID = StringId.Cancel,
+ //};
+ //topView.AddChidren(btnCancel);
+
+ //var btnConfrim = new Button()
+ //{
+ // X = Application.GetRealWidth(160),
+ // Width = Application.GetRealWidth(160),
+ // TextAlignment = TextAlignment.CenterRight,
+ // TextColor = CSS_Color.MainColor,
+ // TextSize = CSS_FontSize.TextFontSize,
+ // TextID = StringId.Confirm,
+ //};
+ //topView.AddChidren(btnConfrim);
+
+ //var itemsView = new VerticalScrolViewLayout()
+ //{
+ // Y = topView.Bottom,
+ // Height = optionBaseViewHeight - Application.GetRealHeight(50),
+ // ScrollEnabled = itemCount > 4,
+ //};
+ //optionBaseView.AddChidren(itemsView);
+
+ //bool isFrist = true;
+ //Button btnLastSelectedTip = null;
+
+ //foreach (var item in items)
+ //{
+ // if (isFrist)
+ // {
+ // isFrist = false;
+ // }
+ // else
+ // {
+ // itemsView.AddChidren(new Button() { Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
+ // }
+ // var row = new FrameLayout()
+ // {
+ // Height = Application.GetRealHeight(50),
+ // };
+ // itemsView.AddChidren(row);
+
+ // var btnTipSelected = new Button()
+ // {
+ // X = Application.GetRealWidth(303),
+ // Gravity = Gravity.CenterVertical,
+ // Width = Application.GetRealWidth(28),
+ // Height= Application.GetRealWidth(28),
+ // UnSelectedImagePath = "Public/ChooseIcon.png",
+ // SelectedImagePath = "Public/ChooseOnIcon.png",
+ // };
+ // row.AddChidren(btnTipSelected);
+ // if( item.Key == curItemKey)
+ // {
+ // btnTipSelected.IsSelected = true;
+ // btnLastSelectedTip = btnTipSelected;
+ // }
+
+
+ // var btnRowTitle = new Button()
+ // {
+ // X = Application.GetRealWidth(16),
+ // Text = item.Value,
+ // TextSize = CSS_FontSize.TextFontSize,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextAlignment = TextAlignment.CenterLeft,
+ // };
+ // row.AddChidren(btnRowTitle);
+
+ // btnRowTitle.MouseUpEventHandler = (sender, e) =>
+ // {
+ // if (btnTipSelected.IsSelected)
+ // {
+ // curItemKey = "0";
+ // btnTipSelected.IsSelected = false;
+ // btnLastSelectedTip = null;
+ // }
+ // else
+ // {
+ // curItemKey = item.Key;
+ // if (btnLastSelectedTip != null)
+ // {
+ // btnLastSelectedTip.IsSelected = false;
+ // }
+ // btnTipSelected.IsSelected = true;
+ // btnLastSelectedTip = btnTipSelected;
+ // }
+ // };
+
+ //}
+
+ //Button btn1 = new Button()
+ //{
+ // Width = Application.GetRealWidth(128),
+ // Height = Application.GetRealWidth(44),
+ // TextAlignment = TextAlignment.Center,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // Text = "30s",
+ // BorderColor = CSS_Color.PromptingColor1,
+ // BorderWidth = 1,
+ // Radius = (uint)Application.GetRealWidth(8),
+ // SelectedTextColor = CSS_Color.MainBackgroundColor,
+ // SelectedBackgroundColor = CSS_Color.MainColor,
+ // X = Application.GetRealWidth(20),
+ // Y = Application.GetRealHeight(80),
+ // IsSelected = curItemKey == "30"
+ //};
+ //optionBaseView.AddChidren(btn1);
+
+
+ //Button btn2 = new Button()
+ //{
+ // Width = Application.GetRealWidth(128),
+ // Height = Application.GetRealWidth(44),
+ // TextAlignment = TextAlignment.Center,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // Text = "1min",
+ // BorderColor = CSS_Color.PromptingColor1,
+ // BorderWidth = 1,
+ // Radius = (uint)Application.GetRealWidth(8),
+ // SelectedTextColor = CSS_Color.MainBackgroundColor,
+ // SelectedBackgroundColor = CSS_Color.MainColor,
+ // X = Application.GetRealWidth(195),
+ // Y = Application.GetRealHeight(80),
+ // IsSelected = curItemKey == "60"
+ //};
+ //optionBaseView.AddChidren(btn2);
+
+
+ //Button btn3 = new Button()
+ //{
+ // Width = Application.GetRealWidth(128),
+ // Height = Application.GetRealWidth(44),
+ // TextAlignment = TextAlignment.Center,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // Text = "2min",
+ // BorderColor = CSS_Color.PromptingColor1,
+ // BorderWidth = 1,
+ // Radius = (uint)Application.GetRealWidth(8),
+ // SelectedTextColor = CSS_Color.MainBackgroundColor,
+ // SelectedBackgroundColor = CSS_Color.MainColor,
+ // X = Application.GetRealWidth(20),
+ // Y = Application.GetRealHeight(140),
+ // IsSelected = curItemKey == "120"
+ //};
+ //optionBaseView.AddChidren(btn3);
+
+
+ //Button btn4 = new Button()
+ //{
+ // Width = Application.GetRealWidth(128),
+ // Height = Application.GetRealWidth(44),
+ // TextAlignment = TextAlignment.Center,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // Text = "5min",
+ // BorderColor = CSS_Color.PromptingColor1,
+ // BorderWidth = 1,
+ // Radius = (uint)Application.GetRealWidth(8),
+ // SelectedTextColor = CSS_Color.MainBackgroundColor,
+ // SelectedBackgroundColor = CSS_Color.MainColor,
+ // X = Application.GetRealWidth(195),
+ // Y = Application.GetRealHeight(140),
+ // IsSelected = curItemKey == "300"
+ //};
+ //optionBaseView.AddChidren(btn4);
+
+
+
+
+ //dialog.Show();
+
+ //pView.MouseUpEventHandler = (sender, e) =>
+ //{
+ // dialog.Close();
+ //};
+
+ //btnCancel.MouseUpEventHandler = (sender, e) =>
+ //{
+ // dialog.Close();
+ //};
+ //btnConfrim.MouseUpEventHandler = (sender, e) =>
+ //{
+ // action(curItemKey);
+ // dialog.Close();
+ //};
+ //btn1.MouseUpEventHandler = (sender, e) => {
+ // btn1.IsSelected = !btn1.IsSelected;
+ // btn2.IsSelected = false;
+ // btn3.IsSelected = false;
+ // btn4.IsSelected = false;
+ // if(btn1.IsSelected)
+ // {
+ // curItemKey = "30";
+ // }
+ // else
+ // {
+ // curItemKey = "0";
+ // }
+ //};
+ //btn2.MouseUpEventHandler = (sender, e) => {
+ // btn2.IsSelected = !btn2.IsSelected;
+ // btn1.IsSelected = false;
+ // btn3.IsSelected = false;
+ // btn4.IsSelected = false;
+ // if (btn2.IsSelected)
+ // {
+ // curItemKey = "60";
+ // }
+ // else
+ // {
+ // curItemKey = "0";
+ // }
+ //};
+ //btn3.MouseUpEventHandler = (sender, e) => {
+ // btn3.IsSelected = !btn3.IsSelected;
+ // btn2.IsSelected = false;
+ // btn1.IsSelected = false;
+ // btn4.IsSelected = false;
+ // if (btn3.IsSelected)
+ // {
+ // curItemKey = "120";
+ // }
+ // else
+ // {
+ // curItemKey = "0";
+ // }
+ //};
+ //btn4.MouseUpEventHandler = (sender, e) => {
+ // btn4.IsSelected = !btn4.IsSelected;
+ // btn2.IsSelected = false;
+ // btn3.IsSelected = false;
+ // btn1.IsSelected = false;
+ // if (btn4.IsSelected)
+ // {
+ // curItemKey = "300";
+ // }
+ // else
+ // {
+ // curItemKey = "0";
+ // }
+ //};
}
--
Gitblit v1.8.0