From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 15:02:44 +0800
Subject: [PATCH] 2020-04-28-1

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 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..5f5a143 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
@@ -66,15 +66,18 @@
         /// </summary>
         public void Show()
         {
-            if (myTip != null)
+            try
             {
-                myTip.Show(Common.CommonPage.Instance);
-                myTip = null;
-                return;
+                if (myTip != null)
+                {
+                    myTip.Show(Common.CommonPage.Instance);
+                    myTip = null;
+                    return;
+                }
+                //鍒濆鍖栨帶浠�
+                this.InitMsgControl();
             }
-
-            //鍒濆鍖栨帶浠�
-            this.InitMsgControl();
+            catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
         }
 
         #endregion
@@ -86,16 +89,16 @@
         /// </summary>
         private void InitMsgControl()
         {
-            //娣诲姞鐣岄潰
-            var nowForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
-            if (nowForm == null || (nowForm is ViewGroup) == false)
-            {
-                return;
-            }
             //涓绘帶浠�
             var frameMain = new FrameLayout();
             frameMain.BackgroundColor = UserCenterColor.Current.DialogBackColor;
-            ((ViewGroup)nowForm).AddChidren(frameMain);
+            Common.CommonPage.Instance.AddChidren(frameMain);
+            frameMain.MouseUpEventHandler += (sender, e) =>
+            {
+                //绉婚櫎鐣岄潰
+                frameMain.RemoveFromParent();
+                this.ConfirmClickEvent = null;
+            };
 
             //鐧借壊鑳屾櫙妗�
             var frameBack = new FrameLayout();
@@ -104,7 +107,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 +127,10 @@
             else if (msgType == ShowMsgType.Confirm)
             {
                 btnTitle.TextID = R.MyInternationalizationString.NormalTip;
+            }
+            else if (msgType == ShowMsgType.Remind)
+            {
+                btnTitle.TextID = R.MyInternationalizationString.uRemind;
             }
 
             //娑堟伅
@@ -193,7 +200,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