2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

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

@@ -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);

@@ -142,7 +142,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 +163,7 @@
            }



            //获取楼层

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

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            if (dicFloor.Count == 0)

            {

                return;

@@ -200,7 +201,7 @@
            btnIconContr.ButtonClickEvent += (sender, e) =>

            {

                //楼层菜单

                var contr = new TopRightMenuControl(dicFloor.Count, 449, Language.StringByID(R.MyInternationalizationString.SelectFloor));

                var contr = new TopRightMenuControl(dicFloor.Count, 2, Language.StringByID(R.MyInternationalizationString.SelectFloor));

                foreach (var floorId in dicFloor.Keys)

                {

                    contr.AddRowMenu(dicFloor[floorId], "Floor/Floor.png", "Floor/FloorSelected.png", () =>

@@ -239,9 +240,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)

                {

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

        private bool CheckCanShowRow(Common.Room room)

        {

            if (room.DeviceUIList.Count == 0)

            if (room.ListDevice.Count == 0)

            {

                return false;

            }

@@ -322,10 +323,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;

                }