上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

 ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs

old mode 100644
new mode 100755
@@ -90,9 +90,9 @@
            };



            //获取楼层

            if (this.curFloorId == string.Empty)
            {
                this.curFloorId = Config.Instance.Home.CurrentFloorId;
            if (this.curFloorId == string.Empty)

            {

                this.curFloorId = Config.Instance.Home.CurrentFloorId;

            }

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            if (dicFloor.Count == 0)

@@ -239,7 +239,7 @@
        private void InitRoomCardControl(int XX, int YY)

        {

            //桌布控件

            var frameBack = new FrameLayoutControl();

            var frameBack = new FrameLayoutStatuControl();

            frameBack.X = XX;

            frameBack.Y = YY;

            frameBack.Width = this.GetPictrueRealSize(495);