From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
index fb1b67c..13650f2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
@@ -104,7 +104,7 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
frameBack.Y = Application.GetRealHeight(706);
frameBack.Gravity = Gravity.CenterHorizontal;
- frameBack.Radius = 8;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
frameMain.AddChidren(frameBack);
//鏍囬
var btnTitle = new NormalViewControl(frameBack.Width, Application.GetRealHeight(65), false);
@@ -124,6 +124,10 @@
else if (msgType == ShowMsgType.Confirm)
{
btnTitle.TextID = R.MyInternationalizationString.NormalTip;
+ }
+ else if (msgType == ShowMsgType.Remind)
+ {
+ btnTitle.TextID = R.MyInternationalizationString.uRemind;
}
//娑堟伅
@@ -193,7 +197,7 @@
frameConfirm.Height = Application.GetRealHeight(127);
frameConfirm.Width = frameBack.Width;
frameConfirm.Gravity = Gravity.BottomCenter;
- frameConfirm.Radius = 8;
+ frameConfirm.RadiusEx = 17;
frameConfirm.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
frameBack.AddChidren(frameConfirm);
//鎶婁笂鍦嗚瑕嗙洊涓烘柟瑙�
--
Gitblit v1.8.0