Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-24 8413f493d6e527c3f71cf704c6b22212e94a6c60

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs

old mode 100755
new mode 100644
@@ -104,7 +104,6 @@
            }
            return logicId;
        }

        /// <summary>
        /// 封装Dictionary对象
        /// </summary>
@@ -137,8 +136,8 @@
        {
            List<Entity.Room> roomList = new List<Entity.Room>();
            Entity.Room room1 = new Entity.Room();
            room1.roomName = name;//默认一个房间名为:全部区域
            room1.uid = "全部区域";//默认sid用识别该房间
            room1.roomName = name;//自定义默认一个房间名为:6688
            room1.roomId = "6688";//自定义默认id用识别该房间
            roomList.Add(room1);//默认添加到房间列表里
            var roomLists = GetGatewayRoomList();
            for (int i = 0; i < roomLists.Count; i++)
@@ -179,18 +178,24 @@
        {
            List<HDL_ON.Entity.Function> deviceLists = new List<Entity.Function>();
            List<HDL_ON.Entity.Function> lists = GetGatewayDeviceList();
            foreach (var dev in lists)
            if (room.roomId == "6688")
            {
                if (dev.roomIds.Find((id) => id == room.uid) != null)
                {
                    deviceLists.Add(dev);
                }
                if (room.uid == "全部区域")
                {
                    //房间名为全部区域时，显示网关全部设备
                //默认一个房间名：6688
                //显示网关全部设备
                    deviceLists = lists;
                }
            else
            {
                for (int i = 0; i < lists.Count; i++)
                {
                    var dev = lists[i];
                    if (dev.roomIds.Find((id) => id == room.roomId) != null)
                    {
                        //添加属于这个房间的设备;
                        deviceLists.Add(dev);
                    }

                }
            }
            return deviceLists;
        }
@@ -244,12 +249,10 @@
        {
            string roomName = "";
            List<HDL_ON.Entity.Room> roomLists = GetGatewayRoomList();


            for (int i = 0; i < device.roomIds.Count; i++)
            {
                var dev = device.roomIds[i];
                var room = roomLists.Find((c) => c.uid == dev);
                var room = roomLists.Find((c) => c.roomId == dev);
                if (room != null)
                {
                    roomName += room.floorName + "." + room.roomName + ",";