合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

 ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideRoomForm.cs

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideMainForm.cs
@@ -5,9 +5,9 @@
namespace Shared.Phone.UserCenter.Guide

{

    /// <summary>

    /// 引导界面的主界面

    /// 房间引导界面

    /// </summary>

    public class GuideMainForm : GuideCommonForm

    public class GuideRoomForm : GuideCommonForm

    {

        #region ■ 变量声明___________________________



@@ -21,8 +21,6 @@
        public override void ShowFrom()

        {

            base.ShowFrom();



            Phone.Device.Room.RoomManagement.Instance.CanClick = false;



            var frameTop = new FrameLayout();

            frameTop.Height = Application.GetRealHeight(279);