Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-07-22 98c51b309741620d7a9d6bf6260327a6041b8f12

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

@@ -148,6 +148,8 @@
        public List<HDL_ON.Entity.Room> GetGatewayRoomList()
        {
            return HDL_ON.Entity.SpatialInfo.CurrentSpatial.RoomList;

            
        }
        /// <summary>
        /// 获取网关房间列表
@@ -180,7 +182,9 @@
        /// <returns></returns>
        public List<HDL_ON.Entity.Function> GetGatewayDeviceList()
        {
            return Entity.FunctionList.List.GetDeviceFunctionList();
            var list = Entity.FunctionList.List.GetDeviceFunctionList();
            //return GetTestDevice(list, true);
            return list;
        }
        /// <summary>
        /// 获取场景列表
@@ -590,6 +594,7 @@
            }
            else
            {
                //全部区域
                functionTypeList.Add(SPK.LightSwitch);
                functionTypeList.Add(SPK.LightDimming);
                functionTypeList.Add(SPK.LightRGB);
@@ -1013,6 +1018,27 @@
        /// 推送列表<这里数据已经推送过>
        /// </summary>
        private static List<Push> pushList = new List<Push>();
        /// <summary>
        /// 获取模拟的设备列表
        /// </summary>
        /// <param name="isBool">是否开启</param>
        /// <returns></returns>
        private List<Entity.Function> GetTestDevice(List<HDL_ON.Entity.Function> list, bool isBool)
        {
            if (isBool)
            {
                Entity.Function function = new Entity.Function { sid = "0123456789", name = "超声波传感器", spk = Entity.SPK.SensorUtrasonic };
                var device = list.Find((o) => { return o.sid == function.sid; });
                if (device == null)
                {
                    list.Add(function);
                }

            }
            return list;


        }

    }
    public class Push