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/MainPage/UnallocatedRoomForm.cs | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs index 74c5755..81d6f2a 100755 --- a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs +++ b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs @@ -1,7 +1,6 @@ 锘縰sing System; using System.Collections.Generic; using Shared.Common; -using Shared.Phone.Device.Category; using Shared.Phone.Device.CommonForm; using Shared.Phone.UserCenter; using Shared.Phone.UserView; @@ -19,7 +18,7 @@ /// <summary> /// 娣诲姞鍒� 鐨勮儗鏅浘鎺т欢 /// </summary> - private FrameLayoutControl frameAddBackGroud = null; + private FrameLayoutStatuControl frameAddBackGroud = null; /// <summary> /// 鍔熻兘鐨勬甯冩帶浠� /// </summary> @@ -511,7 +510,7 @@ private void InitAddToControl() { //娣诲姞鍒� 鐨勮儗鏅浘鎺т欢 - this.frameAddBackGroud = new FrameLayoutControl(); + this.frameAddBackGroud = new FrameLayoutStatuControl(); frameAddBackGroud.UseClickStatu = false; frameAddBackGroud.Height = Application.GetRealHeight(202); frameAddBackGroud.Gravity = Gravity.BottomCenter; -- Gitblit v1.8.0