合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

 ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs

@@ -22,7 +22,7 @@
        /// <summary>

        /// 桌布控件

        /// </summary>

        private FrameLayout frameTable = null;

        private NormalFrameLayout frameTable = null;

        /// <summary>

        /// 房间对象

        /// </summary>

@@ -68,7 +68,7 @@
            bodyFrameLayout.AddChidren(frameBack);



            //桌布控件

            this.frameTable = new FrameLayout();

            this.frameTable = new NormalFrameLayout();

            frameTable.Y = frameBack.Bottom;

            frameTable.Height = bodyFrameLayout.Height - frameBack.Height;

            bodyFrameLayout.AddChidren(frameTable);

@@ -85,9 +85,9 @@
                }

                //这个手机弄弄,那个手机弄弄的情况下,

                //采用后备操作 -> 新建一个临时房间对象出来

                if (Common.Room.CurrentRoom.GetRoomByDevice(device) == null)

                if (HdlRoomLogic.Current.GetRoomByDevice(device) == null)

                {

                    tempRoom.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(device));

                    tempRoom.ListDevice.Add(Common.LocalDevice.Current.GetDeviceMainKeys(device));

                }

            }



@@ -98,7 +98,7 @@
                    //初始化房间控件

                    var listRoom = new List<Common.Room>();

                    listRoom.AddRange(dicRoom[nowSelectFloorId]);

                    if (tempRoom.DeviceUIList.Count > 0)

                    if (tempRoom.ListDevice.Count > 0)

                    {

                        //显示新建的临时房间对象

                        listRoom.Add(tempRoom);

@@ -123,6 +123,11 @@
                        //界面关闭

                        this.CloseForm();

                    };

                    //查看模板时,不允许编辑

                    if (Common.Config.Instance.Home.IsShowTemplate == true)

                    {

                        btnOk.CanClick = false;

                    }

                }

                else

                {

@@ -142,7 +147,8 @@
        private void InitTopRightMenuControl()

        {

            //房间分组

            foreach (var room in Common.Room.Lists)

            var listRoom = HdlRoomLogic.Current.GetAllListRooms();

            foreach (var room in listRoom)

            {

                //检测该房间能否显示

                if (this.CheckCanShowRow(room) == false)

@@ -162,7 +168,7 @@
            }



            //获取楼层

            var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            if (dicFloor.Count == 0)

            {

                return;

@@ -239,9 +245,9 @@
            frameTable.AddChidren(listView);



            var listDevice = new List<ZigBee.Device.CommonDevice>();

            foreach (var deviceUi in room.DeviceUIList)

            foreach (var deviceKeys in room.ListDevice)

            {

                var device = deviceUi.CommonDevice;

                var device = Common.LocalDevice.Current.GetDevice(deviceKeys);

                //检测设备

                if (this.CheckCanShowDevice(device) == true)

                {

@@ -287,6 +293,11 @@
                        listEsixtDevice.Remove(mainKey);

                    }

                };

                //查看模板时,不允许编辑

                if (Common.Config.Instance.Home.IsShowTemplate == true)

                {

                    rowDevice.CanClick = false;

                }

            }

            listDevice = null;

            //调整控件真实高度

@@ -314,7 +325,7 @@
        /// <returns></returns>

        private bool CheckCanShowRow(Common.Room room)

        {

            if (room.DeviceUIList.Count == 0)

            if (room.ListDevice.Count == 0)

            {

                return false;

            }

@@ -322,10 +333,11 @@
            {

                return false;

            }

            foreach (var deviceUi in room.DeviceUIList)

            foreach (var deviceKeys in room.ListDevice)

            {

                //检测该设备能否显示

                if (this.CheckCanShowDevice(deviceUi.CommonDevice) == false)

                var device = Common.LocalDevice.Current.GetDevice(deviceKeys);

                if (this.CheckCanShowDevice(device) == false)

                {

                    continue;

                }