From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs | 118 +++++++++++++++-------------------------------------------
1 files changed, 31 insertions(+), 87 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
index 377f528..f1d9bc5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
@@ -155,105 +155,28 @@
/// <param name="frameBack"></param>
private void InitBottomConfirmButton(FrameLayout frameMain, FrameLayout frameBack)
{
- //鍙栨秷
- var frameCancel = new FrameLayoutControl();
- frameCancel.Height = Application.GetRealHeight(127);
- frameCancel.Width = Application.GetRealWidth(396);
- frameCancel.Gravity = Gravity.BottomLeft;
- frameCancel.Radius = 8;
- frameCancel.BackgroundColor = 0xfff5f6fa;
- frameBack.AddChidren(frameCancel);
- //鎶婁笂鍦嗚瑕嗙洊涓烘柟瑙�
- var btnTopTemp1 = new NormalViewControl(frameCancel.Width, Application.GetRealHeight(40), false);
- btnTopTemp1.BackgroundColor = 0xfff5f6fa;
- frameCancel.AddChidren(btnTopTemp1, ChidrenBindMode.BindEventOnly);
- //鎶婂彸涓嬪渾瑙掕鐩栦负鏂硅
- var btnBomTemp1 = new NormalViewControl(frameCancel.Width / 2, Application.GetRealHeight(40), false);
- btnBomTemp1.BackgroundColor = 0xfff5f6fa;
- btnBomTemp1.Gravity = Gravity.BottomRight;
- frameCancel.AddChidren(btnBomTemp1, ChidrenBindMode.BindEventOnly);
//鍙栨秷鎸夐挳
- var btnCancel = new NormalViewControl(frameCancel.Width - Application.GetRealWidth(10), Application.GetRealHeight(60), false);
- btnCancel.Gravity = Gravity.Center;
- btnCancel.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnCancel.TextID = R.MyInternationalizationString.uCancel;
- btnCancel.TextAlignment = TextAlignment.Center;
- btnCancel.BackgroundColor = 0xfff5f6fa;
- frameCancel.AddChidren(btnCancel, ChidrenBindMode.BindEventOnly);
- frameCancel.ButtonClickEvent += (sender, e) =>
+ var btnCancel = new BottomLeftClickButton(Application.GetRealWidth(396), Application.GetRealHeight(127));
+ frameBack.AddChidren(btnCancel);
+ btnCancel.InitControl(Language.StringByID(R.MyInternationalizationString.uCancel));
+ btnCancel.ButtonClickEvent += (sender, e) =>
{
//绉婚櫎鐣岄潰
frameMain.RemoveFromParent();
this.ConfirmClickEvent = null;
};
- //閲嶅啓鎺т欢鐐瑰嚮鐘舵��
- frameCancel.SelectStatuEvent += (statu) =>
- {
- if (statu == true)
- {
- frameCancel.BackgroundColor = UserCenterColor.Current.ButtonClickStatuColor;
- btnTopTemp1.BackgroundColor = UserCenterColor.Current.ButtonClickStatuColor;
- btnBomTemp1.BackgroundColor = UserCenterColor.Current.ButtonClickStatuColor;
- btnCancel.BackgroundColor = UserCenterColor.Current.ButtonClickStatuColor;
- }
- else
- {
- frameCancel.BackgroundColor = 0xfff5f6fa;
- btnTopTemp1.BackgroundColor = 0xfff5f6fa;
- btnBomTemp1.BackgroundColor = 0xfff5f6fa;
- btnCancel.BackgroundColor = 0xfff5f6fa;
- }
- };
- //纭
- var frameConfirm = new FrameLayoutControl();
- frameConfirm.Height = Application.GetRealHeight(127);
- frameConfirm.Width = Application.GetRealWidth(396);
- frameConfirm.Gravity = Gravity.BottomRight;
- frameConfirm.Radius = 8;
- frameConfirm.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
- frameBack.AddChidren(frameConfirm);
- //鎶婁笂鍦嗚瑕嗙洊涓烘柟瑙�
- var btnTopTemp2 = new NormalViewControl(frameConfirm.Width, Application.GetRealHeight(40), false);
- btnTopTemp2.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
- frameConfirm.AddChidren(btnTopTemp2, ChidrenBindMode.BindEventOnly);
- //鎶婂乏涓嬪渾瑙掕鐩栦负鏂硅
- var btnBomTemp2 = new NormalViewControl(frameConfirm.Width / 2, Application.GetRealHeight(40), false);
- btnBomTemp2.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
- btnBomTemp2.Gravity = Gravity.BottomLeft;
- frameConfirm.AddChidren(btnBomTemp2, ChidrenBindMode.BindEventOnly);
- //纭鎸夐挳
- var btnConfirm = new NormalViewControl(frameConfirm.Width - Application.GetRealWidth(10), Application.GetRealHeight(60), false);
- btnConfirm.Gravity = Gravity.Center;
- btnConfirm.TextColor = UserCenterColor.Current.White;
- btnConfirm.Text = buttonOkText;
- btnConfirm.TextAlignment = TextAlignment.Center;
- frameConfirm.AddChidren(btnConfirm, ChidrenBindMode.BindEventOnly);
- frameConfirm.ButtonClickEvent += (sender, e) =>
+ //纭畾鎸夐挳
+ var btnConfirm = new BottomRightClickButton(frameBack.Width - btnCancel.Width, btnCancel.Height);
+ frameBack.AddChidren(btnConfirm);
+ btnConfirm.InitControl(buttonOkText);
+ btnConfirm.ButtonClickEvent += (sender, e) =>
{
//绉婚櫎鐣岄潰
frameMain.RemoveFromParent();
//鍥炶皟鍑芥暟
this.ConfirmClickEvent?.Invoke();
this.ConfirmClickEvent = null;
- };
- //閲嶅啓鎺т欢鐐瑰嚮鐘舵��
- frameConfirm.SelectStatuEvent += (statu) =>
- {
- if (statu == true)
- {
- frameConfirm.BackgroundColor = UserCenterColor.Current.ButtonClickStatuColor;
- btnTopTemp2.BackgroundColor = UserCenterColor.Current.ButtonClickStatuColor;
- btnBomTemp2.BackgroundColor = UserCenterColor.Current.ButtonClickStatuColor;
- btnConfirm.BackgroundColor = UserCenterColor.Current.ButtonClickStatuColor;
- }
- else
- {
- frameConfirm.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
- btnTopTemp2.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
- btnBomTemp2.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
- btnConfirm.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
- }
};
}
@@ -264,11 +187,12 @@
/// <param name="frameBack"></param>
private void InitBottomNormalButton(FrameLayout frameMain, FrameLayout frameBack)
{
+#if Android
//纭
var frameConfirm = new FrameLayoutControl();
frameConfirm.Height = Application.GetRealHeight(127);
frameConfirm.Width = frameBack.Width;
- frameConfirm.Y = Application.GetRealHeight(351);
+ frameConfirm.Gravity = Gravity.BottomCenter;
frameConfirm.Radius = 8;
frameConfirm.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
frameBack.AddChidren(frameConfirm);
@@ -307,6 +231,26 @@
btnConfirm.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
}
};
+#endif
+#if iOS
+ //纭鎸夐挳
+ var btnConfirm = new NormalClickButton(frameBack.Width, Application.GetRealHeight(127), false);
+ btnConfirm.Gravity = Gravity.BottomCenter;
+ btnConfirm.TextColor = UserCenterColor.Current.White;
+ btnConfirm.Text = buttonOkText;
+ btnConfirm.TextAlignment = TextAlignment.Center;
+ btnConfirm.BackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
+ btnConfirm.oldBackgroundColor = UserCenterColor.Current.ClickButtonDefultColor;
+ frameBack.AddChidren(btnConfirm);
+ btnConfirm.ButtonClickEvent += (sender, e) =>
+ {
+ //绉婚櫎鐣岄潰
+ frameMain.RemoveFromParent();
+ //鍥炶皟鍑芥暟
+ this.ConfirmClickEvent?.Invoke();
+ this.ConfirmClickEvent = null;
+ };
+#endif
}
#endregion
--
Gitblit v1.8.0