From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
index 6010e81..b081b6c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
@@ -121,7 +121,7 @@
{
btnName.TextColor = UserCenterColor.Current.TextGrayColor3;
}
- frameBack.AddChidren(btnName, ChidrenBindMode.BindEventOnly);
+ frameBack.AddChidren(btnName, ChidrenBindMode.BindEvent);
//娣诲姞缂撳瓨
this.listNameControl.Add(btnName);
@@ -131,7 +131,7 @@
btnLine.X = btnName.X + btnName.Width / 2 - Application.GetRealWidth(40) / 2;
btnLine.Radius = (uint)Application.GetRealHeight(10) / 2;
btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- frameBack.AddChidren(btnLine, ChidrenBindMode.BindEventOnly);
+ frameBack.AddChidren(btnLine, ChidrenBindMode.BindEvent);
if (m_nowSelectIndex != i_index)
{
btnLine.Visible = false;
@@ -181,8 +181,21 @@
public override void RemoveFromParent()
{
this.SelectTabEvent = null;
+ if (this.Parent != null)
+ {
+ base.RemoveFromParent();
+ }
+ }
- base.RemoveFromParent();
+ /// <summary>
+ /// 鈽嗏槅绉婚櫎鍏ㄩ儴鎺т欢鈽嗏槅
+ /// </summary>
+ public override void RemoveAll()
+ {
+ if (this.Parent != null)
+ {
+ base.RemoveAll();
+ }
}
#endregion
--
Gitblit v1.8.0