金茂科技系统更新

wxr

2022-11-15 02498f7744e6fdc413e518f96b25f3635540dc6b

 HDL_ON/Entity/FunctionList.cs

@@ -39,6 +39,14 @@
        /// 功能列表
        /// </summary>
        public List<Function> Functions = new List<Function>();
        /// <summary>
        /// 机械臂列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetMechanicalArmList()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.MechanicalArm);
        }

        /// <summary>
        /// 绿建科技系统
@@ -126,16 +134,17 @@
        /// <summary>
        /// 光伏列表
        /// </summary>
        public List<InverterInfo> InverterList
        public List<Function> InverterList()
        {
            get
            {
                return _inverterList;
            }
            set
            {
                _inverterList = value;
            }
            //get
            //{
            //    return _inverterList;
            //}
            //set
            //{
            //    _inverterList = value;
            //}
            return Functions.FindAll((obj) => obj.spk == SPK.Inverter);
        }
        #region 家电列表 electricals
        /// <summary>
@@ -351,25 +360,33 @@
                switch (brandType)
                {
                    case SPK.BrandType.Hdl:
                        foreach (var function in Functions)
                        try
                        {
                            if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(function.spk))
                            foreach (var function in Functions)
                            {
                                resultFunctions.Add(function);
                                if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(function.spk))
                                {
                                    resultFunctions.Add(function);
                                }
                            }
                        }
                        catch { }
                        break;

                    case SPK.BrandType.Tuya:
                        lock (Functions)
                        {
                            foreach (var function in Functions)
                            try
                            {
                                if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(function.spk))
                                foreach (var function in Functions)
                                {
                                    resultFunctions.Add(function);
                                    if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(function.spk))
                                    {
                                        resultFunctions.Add(function);
                                    }
                                }
                            }
                            catch { }
                        }
                        break;
                }