From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
index 373ca78..484e815 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
@@ -37,7 +37,7 @@
/// <summary>
/// 榛樿鐨勯偅涓彍鍗�
/// </summary>
- private FrameLayoutControl frameDefult = null;
+ private FrameLayoutStatuControl frameDefult = null;
#endregion
@@ -81,7 +81,7 @@
private int InitTitleTextControl(int i_index, string titleText, int realWidth, int XX)
{
//鍦烘櫙妗�(鐐瑰嚮鑼冨洿鏈夌偣灏忥紝闇�瑕佹墿澶у畠鐨勭偣鍑昏寖鍥�)
- var frameBack = new FrameLayoutControl();
+ var frameBack = new FrameLayoutStatuControl();
frameBack.UseClickStatu = false;
frameBack.Height = Application.GetRealHeight(90);
frameBack.Width = realWidth;
--
Gitblit v1.8.0