From 8df24b0a3dfd5b6f39c5393ef24eab25b70ab858 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 九月 2020 13:18:33 +0800
Subject: [PATCH] 202009111
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 340 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 293 insertions(+), 47 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index a358172..0b0a36d 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -11,7 +11,7 @@
{
void EditParaterEvent(Button btnConfirm, int errorId_IsNullOrEmpty, int errorId_ContainsPar, List<string> list, EditText editText, Action<string> callBackAction,
- FrameLayout contentView, Button btnLine, Button btnBottomLine, Button btnCancel, FrameLayout editView, Dialog dialog,int titleId)
+ FrameLayout contentView, Button btnLine, Button btnCancel, FrameLayout editView, Dialog dialog, int titleId)
{
var btnTip = new Button()
@@ -31,7 +31,7 @@
//btnConfirm.IsSelected = false;
if (string.IsNullOrEmpty(editText.Text.Trim()) || list.Contains(editText.Text.Trim()))
{
- if(titleId == StringId.ModifyMemberNickname)
+ if (titleId == StringId.ModifyMemberNickname)
{
return;
}
@@ -47,7 +47,6 @@
contentView.Height = Application.GetRealHeight(183);
btnLine.Y = Application.GetRealHeight(139);
- btnBottomLine.Y = btnLine.Bottom;
btnCancel.Y = btnLine.Bottom;
btnConfirm.Y = btnLine.Bottom;
@@ -70,7 +69,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)
{
Dialog dialog = new Dialog()
{
@@ -126,10 +125,15 @@
};
editView.AddChidren(etParater);
- etParater.TextChangeEventHandler = (sender, e) => {
- if(etParater.Text.Length > 20)
+ etParater.TextChangeEventHandler = (sender, e) =>
+ {
+ if (etParater.Text.Length > 20)
{
etParater.Text = etParater.Text.Remove(20);
+
+#if __ANDROID__
+ etParater.SetSelectionEnd();
+#endif
}
};
@@ -144,7 +148,7 @@
Button btnCancel = new Button()
{
Y = btnLine.Bottom,
- Width = Application.GetRealWidth(134),
+ Width = Application.GetRealWidth(135),
Height = Application.GetRealHeight(43),
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
@@ -155,37 +159,40 @@
};
contentView.AddChidren(btnCancel);
- Button btnBottomLine = new Button()
- {
- X = btnCancel.Right,
- Y = btnLine.Bottom,
- Height = Application.GetRealHeight(43),
- Width = Application.GetRealWidth(1),
- BackgroundColor = CSS_Color.DividingLineColor,
- };
+ //Button btnBottomLine = new Button()
+ //{
+ // X = btnCancel.Right,
+ // Y = btnLine.Bottom,
+ // Height = Application.GetRealHeight(43),
+ // Width = Application.GetRealWidth(1),
+ // BackgroundColor = CSS_Color.DividingLineColor,
+ //};
//contentView.AddChidren(btnBottomLine);
Button btnConfirm = new Button()
{
- X = btnBottomLine.Right,
+ X = btnCancel.Right,
Y = btnLine.Y,
Width = Application.GetRealWidth(135),
- Height = Application.GetRealHeight(43+1),
+ Height = Application.GetRealHeight(43 + 1),
TextAlignment = TextAlignment.Center,
//TextColor = CSS_Color.TextualColor,
- //TextSize = CSS_FontSize.SubheadingFontSize,
+ TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.MainBackgroundColor,
BackgroundColor = CSS_Color.MainColor,
TextID = StringId.Confirm,
};
contentView.AddChidren(btnConfirm);
+ int mRectCornerID = HDLUtils.RectCornerBottomRight;
+ btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
dialog.Show();
//btnCancel.MouseDownEventHandler += (sender, e) => {
// btnCancel.IsSelected = true;
//};
- btnCancel.MouseUpEventHandler += (sender, e) => {
+ btnCancel.MouseUpEventHandler += (sender, e) =>
+ {
//btnCancel.IsSelected = false;
dialog.Close();
};
@@ -193,7 +200,7 @@
// btnConfirm.IsSelected = true;
//};
EditParaterEvent(btnConfirm, errorId_IsNullOrEmpty, errorId_ContainsPar, baseList, etParater, callBackAction,
- contentView, btnLine, btnBottomLine, btnCancel, editView, dialog,titleId);
+ contentView, btnLine, btnCancel, editView, dialog, titleId);
}
/// <summary>
@@ -250,7 +257,7 @@
{
Y = Application.GetRealHeight(96),
Height = Application.GetRealHeight(1),
- Width = Application.GetRealWidth(270/2),
+ Width = Application.GetRealWidth(270 / 2),
BackgroundColor = CSS.CSS_Color.DividingLineColor,
};
contentView.AddChidren(btnLine);
@@ -258,7 +265,7 @@
Button btnCancel = new Button()
{
Y = btnLine.Bottom,
- Width = Application.GetRealWidth(134),
+ Width = Application.GetRealWidth(135),
Height = Application.GetRealHeight(43),
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
@@ -269,31 +276,23 @@
};
contentView.AddChidren(btnCancel);
- Button btnBottomLine = new Button()
- {
- X = btnCancel.Right,
- Y = btnLine.Bottom,
- Height = Application.GetRealHeight(43),
- Width = Application.GetRealWidth(1),
- BackgroundColor = CSS_Color.DividingLineColor,
- };
- //contentView.AddChidren(btnBottomLine);
-
Button btnConfirm = new Button()
{
- X = btnBottomLine.Right,
+ X = btnCancel.Right,
Y = btnLine.Y,
Width = Application.GetRealWidth(135),
- Height = Application.GetRealHeight(43+1),
+ Height = Application.GetRealHeight(45),
TextAlignment = TextAlignment.Center,
//TextColor = CSS_Color.TextualColor,
- //TextSize = CSS_FontSize.SubheadingFontSize,
+ TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.MainBackgroundColor,
BackgroundColor = CSS_Color.MainColor,
TextID = StringId.Confirm,
};
contentView.AddChidren(btnConfirm);
-
+ //渚嬶細鍙充笅鍦嗚 澶у皬涓�50
+ int mRectCornerID = HDLUtils.RectCornerBottomRight;
+ btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
dialog.Show();
//btnCancel.MouseDownEventHandler += (sender, e) =>
@@ -323,22 +322,33 @@
/// </summary>
/// <param name="msg"></param>
/// <param name="isWhite"></param>
- public void TipMsgAutoClose(string msg,bool isWhite,int closeTime = 1500)
+ public void TipMsgAutoClose(string msg, bool isWhite, int closeTime = 1500)
{
- Dialog dialog = new Dialog()
+ Dialog dialog = new Dialog();
+
+ FrameLayout dialogBody = new FrameLayout();
+ dialog.AddChidren(dialogBody);
+ dialogBody.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ dialog = null;
+ };
+
+ FrameLayout frame = new FrameLayout()
{
X = Application.GetRealWidth(89),
Y = Application.GetRealHeight(285),
Width = Application.GetRealWidth(198),
Height = Application.GetRealHeight(98),
- };
-
- FrameLayout frame = new FrameLayout()
- {
BackgroundColor = isWhite ? 0xE6FFFFFF : CSS_Color.DialogTransparentColor1,
Radius = (uint)Application.GetRealWidth(12),
};
dialog.AddChidren(frame);
+ frame.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ dialog = null;
+ };
Button btnTipIcon = new Button()
{
@@ -363,13 +373,18 @@
dialog.Show();
- new Thread(() => {
+ new Thread(() =>
+ {
Thread.Sleep(closeTime);
Application.RunOnMainThread(() =>
{
- dialog.Close();
+ if(dialog!=null)
+ {
+ dialog.Close();
+ }
});
- }) { IsBackground = true }.Start();
+ })
+ { IsBackground = true }.Start();
}
/// <summary>
@@ -520,10 +535,241 @@
frame.AddChidren(btnTipMsg);
dialog.Show();
- return new Action(() => {
+ return new Action(() =>
+ {
dialog.Close();
});
}
+ /// <summary>
+ /// 鍦烘櫙寤舵椂璁剧疆寮圭獥
+ /// </summary>
+ /// <param name="function"></param>
+ public void SetSceneDelayDialog(Function function,Button btn)
+ {
+ Button lastButton = new Button();
+ int changeDelay = 0;
+ Dialog dialog = new Dialog();
+
+ var pView = new FrameLayout()
+ {
+ BackgroundColor = CSS_Color.DialogTransparentColor1,
+ };
+ dialog.AddChidren(pView);
+
+ var optionBaseView = new FrameLayout()
+ {
+ 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()
+ {
+ Width = Application.GetRealWidth(320),
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextID = StringId.Complete,
+ };
+ 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 = function.delayText == "30s"
+ };
+ 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 = function.delayText == "1min"
+ };
+ 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 = function.delayText == "2min"
+ };
+ 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 = function.delayText == "5min"
+ };
+ optionBaseView.AddChidren(btn4);
+
+
+
+
+ dialog.Show();
+
+ pView.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ };
+
+ btnCancel.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ };
+ btnConfrim.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.Close();
+ function.delay = changeDelay;
+ btn.Text = function.delayText;
+ };
+ btn1.MouseUpEventHandler = (sender, e) => {
+ btn1.IsSelected = !btn1.IsSelected;
+ btn2.IsSelected = false;
+ btn3.IsSelected = false;
+ btn4.IsSelected = false;
+ if(btn1.IsSelected)
+ {
+ 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;
+ }
+ };
+ 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;
+ }
+ };
+
+ }
+
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0