From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 618425a..b070e69 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -243,7 +243,7 @@
/// <param name="titleId"></param>
/// <param name="msgId"></param>
/// <param name="callBackAction"></param>
- public void TipOptionMsg(int titleId, string msg, Action callBackAction)
+ public void TipOptionMsg(int titleId, string msg, Action callBackAction,int extraHeight = 0)
{
Dialog dialog = new Dialog()
{
@@ -253,8 +253,8 @@
FrameLayout contentView = new FrameLayout()
{
Gravity = Gravity.Center,
- Width = Application.GetRealWidth(270),
- Height = Application.GetRealHeight(140),
+ Width = Application.GetRealWidth(270 ),
+ Height = Application.GetRealHeight(140 + extraHeight),
BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
BorderColor = 0x00000000,
BorderWidth = 0,
@@ -277,7 +277,7 @@
Button btnMsg = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Height = Application.GetRealHeight(25),
+ Height = Application.GetRealHeight(35 + extraHeight),
Y = btnTitle.Bottom,
Width = Application.GetRealHeight(200),
TextAlignment = TextAlignment.Center,
@@ -290,7 +290,7 @@
Button btnLine = new Button()
{
- Y = Application.GetRealHeight(96),
+ Y = Application.GetRealHeight(96 + extraHeight),
Height = Application.GetRealHeight(1),
Width = Application.GetRealWidth(270 / 2),
BackgroundColor = CSS.CSS_Color.DividingLineColor,
@@ -463,7 +463,7 @@
Button btnMsg = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Height = Application.GetRealHeight(25),
+ Height = Application.GetRealHeight(35),
Y = btnTitle.Bottom,
Width = Application.GetRealHeight(200),
TextAlignment = TextAlignment.Center,
--
Gitblit v1.8.0