合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

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

@@ -23,6 +23,10 @@
        /// 功能

        /// </summary>

        public NormalViewControl btnFunction = null;

        /// <summary>

        /// 住宅名称

        /// </summary>

        public NormalViewControl btnHouse = null;



        #endregion



@@ -33,6 +37,8 @@
        /// </summary>

        public virtual void ShowFrom()

        {

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



            UserView.UserPage.Instance.AddChidren(this);

            this.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;



@@ -49,7 +55,7 @@
            btnMsg.UnSelectedImagePath = "Item/Message.png";

            this.AddChidren(btnMsg);

            //住宅名字

            var btnHouse = new NormalViewControl(300, 95, true);

            this.btnHouse = new NormalViewControl(300, 95, true);

            btnHouse.TextSize = 24;

            btnHouse.X = ControlCommonResourse.XXLeft;

            btnHouse.Y = Application.GetRealHeight(161);

@@ -88,6 +94,8 @@
            roomPageView.AddChidren(roomView3);

            roomView3.Init(room3);



            roomPageView.PageIndex = 1;



            //场景和功能的控件

            this.contrSwitch = new FrameLayout();

            contrSwitch.Y = roomPageView.Bottom + Application.GetRealHeight(52);