From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index a358172..7d49bd1 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()
@@ -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;
@@ -144,7 +143,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,19 +154,19 @@
};
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),
@@ -179,6 +178,8 @@
TextID = StringId.Confirm,
};
contentView.AddChidren(btnConfirm);
+ int mRectCornerID = HDLUtils.RectCornerBottomRight;
+ btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
dialog.Show();
@@ -193,7 +194,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>
@@ -258,7 +259,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 +270,33 @@
};
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),
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) =>
--
Gitblit v1.8.0