From 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 19 十一月 2020 10:23:45 +0800
Subject: [PATCH] Evoyo.Home1.1.0120111601_Release

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
index e5428f4..97758ed 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
@@ -7,7 +7,7 @@
     /// <summary>
     /// 瀹夐槻绠＄悊涓婚〉鐨勬帶浠�
     /// </summary>
-    public class SafetyMasterControl : FrameLayout
+    public class SafetyMasterControl : NormalFrameLayout
     {
         #region 鈻� 鍙橀噺澹版槑___________________________
 
@@ -138,11 +138,11 @@
 
         #endregion
 
-        #region 鈻� 甯冮槻鎾ら槻___________________________
+        #region 鈻� 甯冮槻鎾ら槻___________________________
 
         /// <summary>
         /// 鍦ㄥ甯冮槻
-        /// </summary>
+        /// </summary>
         private async void SetSafetyGarrisonModeInAtHome()
         {
             //鎵撳紑杩涘害鏉�
@@ -156,7 +156,7 @@
                 return;
             }
 
-            Application.RunOnMainThread(() =>
+            HdlThreadLogic.Current.RunMain(() =>
             {
                 //鏍规嵁甯冮槻妯″紡锛岃缃浘鏍囩殑閫夋嫨鐘舵��
                 this.SetIconStatuByGarrisonMode(mode);
@@ -180,11 +180,11 @@
                 var control = new ShowMsgControl(ShowMsgType.Tip, msg);
                 control.Show();
             });
-        }
-
+        }
+
         /// <summary>
         /// 绂诲甯冮槻
-        /// </summary>
+        /// </summary>
         private async void SetSafetyGarrisonModeInRemoveHome()
         {
             //鎵撳紑杩涘害鏉�
@@ -199,7 +199,7 @@
                 return;
             }
 
-            Application.RunOnMainThread(() =>
+            HdlThreadLogic.Current.RunMain(() =>
             {
                 //鏍规嵁甯冮槻妯″紡锛岃缃浘鏍囩殑閫夋嫨鐘舵��
                 this.SetIconStatuByGarrisonMode(mode);
@@ -212,11 +212,11 @@
                 var control = new ShowMsgControl(ShowMsgType.Tip, msg);
                 control.Show();
             });
-        }
-
+        }
+
         /// <summary>
         /// 鎾ら槻
-        /// </summary>
+        /// </summary>
         private async void RemoveSafetyGarrisonMode()
         {
             //鎵撳紑杩涘害鏉�
@@ -230,7 +230,7 @@
             {
                 return;
             }
-            Application.RunOnMainThread(() =>
+            HdlThreadLogic.Current.RunMain(() =>
             {
                 //鏍规嵁甯冮槻妯″紡锛岃缃浘鏍囩殑閫夋嫨鐘舵��
                 this.SetIconStatuByGarrisonMode(GarrisonMode.RemoveGarrison);
@@ -240,12 +240,12 @@
                 var control = new ShowMsgControl(ShowMsgType.Tip, msg);
                 control.Show();
             });
-        }
-
+        }
+
         /// <summary>
         /// 鏍规嵁甯冮槻妯″紡锛岃缃浘鏍囩殑閫夋嫨鐘舵��
         /// </summary>
-        /// <param name="mode"></param>
+        /// <param name="mode"></param>
         public void SetIconStatuByGarrisonMode(GarrisonMode mode)
         {
             //鍦ㄥ甯冮槻
@@ -277,7 +277,7 @@
 
         /// <summary>
         /// 璁剧疆甯冮槻鎸夐挳鐨勫彲瑙嗙姸鎬�
-        /// </summary>
+        /// </summary>
         public void SetButtonVisible()
         {
             //璁剧疆鏈夊唴閮ㄩ槻鍖�
@@ -287,7 +287,7 @@
                 //娌″繀瑕佸啀鍒濆鍖栫晫闈�
                 return;
             }
-            Application.RunOnMainThread(() =>
+            HdlThreadLogic.Current.RunMain(() =>
             {
                 //娓呯┖鍏ㄩ儴鎺т欢
                 this.RemoveAll();
@@ -303,7 +303,7 @@
         /// <summary>
         /// 灏佽鐨勫竷闃叉帶浠�
         /// </summary>
-        private class GarrisonControl : FrameLayoutControl
+        private class GarrisonControl : FrameLayoutStatuControl
         {
             #region 鈻� 鍙橀噺澹版槑___________________________
 
@@ -350,18 +350,18 @@
                 this.RemoveBaseClickEvent();
 
                 //鑳屾櫙
-                int backHeight = Application.GetMinRealAverage(132);
+                int backHeight = this.GetPictrueRealSize(132);
                 btnBack = new NormalViewControl(backHeight, backHeight, false);
                 btnBack.Gravity = Gravity.CenterHorizontal;
                 btnBack.Radius = (uint)backHeight / 2;
                 btnBack.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
-                this.AddChidren(btnBack, ChidrenBindMode.BindEventOnly);
+                this.AddChidren(btnBack, ChidrenBindMode.BindEvent);
 
                 //鍥炬爣
                 btnIcon = new IconViewControl(81);
                 btnIcon.Y = Application.GetRealHeight(26);
                 btnIcon.Gravity = Gravity.CenterHorizontal;
-                this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
+                this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
 
                 //鏂囨湰
                 btnText = new NormalViewControl(this.Width, Application.GetRealHeight(58), false);

--
Gitblit v1.8.0