2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

 HDL_ON/Entity/FunctionList.cs

@@ -185,6 +185,16 @@
        }

        /// <summary>
        /// 获取影音中控列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetVideoControlsList()
        {
            var spkList = SPK.GetVideoControlsSPKList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

        /// <summary>
        /// 新风列表
        /// </summary>
        /// <returns></returns>
@@ -218,7 +228,7 @@
        /// </summary>
        public List<Function> GetElectricals()
        {
            var spkList = SPK.ElectricalSpkList();
        var spkList = SPK.ElectricalSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
    
@@ -272,6 +282,8 @@
                SPK.SensorSmoke,
                SPK.SensorWater,
                SPK.SensorGas,
                SPK.SensorDryContact,
                SPK.SensorDryContact2,
            };

            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
@@ -586,14 +598,14 @@
        {
            if (lockReadFunctionStatus)
            {
                MainPage.Log($"多次进入--返回");
                MainPage.Log($"多次进入--返回1");
                return;
            }
            new Thread(() =>
            {
                if (lockReadFunctionStatus)
                {
                    MainPage.Log($"多次进入--返回");
                    MainPage.Log($"多次进入--返回2");
                    return;
                }
                MainPage.Log($"进入--读取");