From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
index c4d31b4..af99766 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
@@ -19,6 +19,10 @@
/// </summary>
public Action CancelClickEvent = null;
/// <summary>
+ /// 鐐瑰嚮鑳屾櫙鏄惁鍏抽棴寮圭獥
+ /// </summary>
+ public bool CloseByClickBack = true;
+ /// <summary>
/// 淇℃伅绫诲瀷
/// </summary>
private ShowMsgType msgType = ShowMsgType.Confirm;
@@ -100,14 +104,18 @@
private void InitMsgControl()
{
//涓绘帶浠�
- var frameMain = new FrameLayout();
+ var frameMain = new NormalFrameLayout();
+ frameMain.MainKey = "ShowMsg";
frameMain.BackgroundColor = UserCenterColor.Current.DialogBackColor;
Common.CommonPage.Instance.AddChidren(frameMain);
frameMain.MouseUpEventHandler += (sender, e) =>
{
- //绉婚櫎鐣岄潰
- frameMain.RemoveFromParent();
- this.ConfirmClickEvent = null;
+ if (this.CloseByClickBack == true)
+ {
+ //绉婚櫎鐣岄潰
+ frameMain.RemoveFromParent();
+ this.ConfirmClickEvent = null;
+ }
};
//鐧借壊鑳屾櫙妗�
@@ -170,7 +178,7 @@
/// </summary>
/// <param name="frameMain"></param>
/// <param name="frameBack"></param>
- private void InitBottomConfirmButton(FrameLayout frameMain, FrameLayout frameBack)
+ private void InitBottomConfirmButton(NormalFrameLayout frameMain, FrameLayout frameBack)
{
//鍙栨秷鎸夐挳
var btnCancel = new BottomLeftClickButton(Application.GetRealWidth(396), Application.GetRealHeight(127));
@@ -206,7 +214,7 @@
/// </summary>
/// <param name="frameMain"></param>
/// <param name="frameBack"></param>
- private void InitBottomNormalButton(FrameLayout frameMain, FrameLayout frameBack)
+ private void InitBottomNormalButton(NormalFrameLayout frameMain, FrameLayout frameBack)
{
#if Android
//纭
@@ -275,5 +283,32 @@
}
#endregion
+
+ #region 鈻� 鍏抽棴寮圭獥(澶栭儴璋冪敤)_________________
+
+ /// <summary>
+ /// 鍏抽棴鍏ㄩ儴鐨勫脊绐�
+ /// </summary>
+ public static void CloseAllMsgDialog()
+ {
+ while (true)
+ {
+ var myView = Common.CommonPage.Instance.GetChildren(Common.CommonPage.Instance.ChildrenCount - 1);
+ if (myView == null) { return; }
+ if (myView is NormalFrameLayout)
+ {
+ if (((NormalFrameLayout)myView).MainKey != "ShowMsg")
+ {
+ return;
+ }
+ //绉婚櫎
+ myView.RemoveFromParent();
+ continue;
+ }
+ return;
+ }
+ }
+
+ #endregion
}
}
--
Gitblit v1.8.0