更新spk

wei

2021-09-24 4820da229822687e472b9d5abb2a09093a877a3a

 HDL_ON/Entity/Function/Function.cs

@@ -146,7 +146,48 @@
        {
            get
            {
                return spk.Replace(".","");
                string iconPath = spk.Replace(".", "");
                switch (spk)
                {
                    case SPK.PanelSocket:
                        iconPath = "electricalsocket";
                        break;
                    case SPK.SenesorMegahealth2:
                        iconPath = "sensormegahealth";
                        break;
                    case SPK.SensorEnvironmentHailin:
                        iconPath = "sensorenvironment";
                        break;
                    case SPK.HvacAirFresh:
                        iconPath = "airFreshstandard";
                        break;
                    case SPK.HvacAirFreshJinmao:
                        iconPath = "airFreshjinmao";
                        break;
                    case SPK.HvacAC:
                        iconPath = "acstandard";
                        break;
                    case SPK.HvacFan:
                        iconPath = "electricalfan";
                        break;
                    case SPK.ElectricTuyaFan2:
                        iconPath = "electricaltyqborgovyzytytz";
                        break;
                    case SPK.ElectricTuyaAirCleaner2:
                        iconPath = "electricalQ1RsefNf91tIXyyQ";
                        break;
                    case SPK.ElectricTuyaWaterValve2:
                        iconPath = "electricalkoiGhMKwLf2ZP81g";
                        break;
                    case SPK.ElectricTuyaWeepRobot2:
                        iconPath = "electricalai6HtccKFIw3dxo3";
                        break;
                    case SPK.AvMusic:
                        iconPath = "musicstandard";
                        break;

                }
                return iconPath;
            }
        }

@@ -188,24 +229,87 @@
        /// </summary>
        public string spk = "";

        string spk_Prefix;
        private string _SpkCategory = string.Empty;
        /// <summary>
        /// spk前缀
        /// 大类
        /// 功能类别
        /// 如：空调类、灯光类、窗帘类
        /// spk  产品的品类
        /// </summary>
        public string Spk_Prefix
        public string SpkCategory
        {
            get
            {
                if (string.IsNullOrEmpty(spk_Prefix))
                if (string.IsNullOrEmpty(_SpkCategory))
                {
                    spk_Prefix = spk.Split(".")[0];
                    var arr = spk.Split(".");
                    if (arr.Length > 0)
                    {
                        _SpkCategory = arr[0];
                    }
                }
                return spk_Prefix;
                return _SpkCategory;
            }
        }

        private string _SpkClassification = string.Empty;
        /// <summary>
        /// spk 产品品类下的分类
        /// </summary>
        public string SpkClassification
        {
            get
            {
                if (string.IsNullOrEmpty(_SpkClassification))
                {
                    var arr = spk.Split(".");
                    if (arr.Length > 1)
                    {
                        _SpkClassification = arr[1];
                    }
                }
                return _SpkClassification;
            }
        }

        string _SpkManufacturer = string.Empty;
        /// <summary>
        /// spk 产品的厂商
        /// </summary>
        public string SpkManufacturer
        {
            get
            {
                if (string.IsNullOrEmpty(_SpkManufacturer))
                {
                    var arr = spk.Split(".");
                    if (arr.Length > 2)
                    {
                        _SpkManufacturer = arr[2];
                    }
                }
                return _SpkManufacturer;
            }
        }


        //string spk_Prefix;
        ///// <summary>
        ///// spk前缀
        ///// 大类
        ///// 功能类别
        ///// 如：空调类、灯光类、窗帘类
        ///// </summary>
        //public string Spk_Prefix
        //{
        //    get
        //    {
        //        if (string.IsNullOrEmpty(spk_Prefix))
        //        {
        //            spk_Prefix = spk.Split(".")[0];
        //        }
        //        return spk_Prefix;
        //    }
        //}


        /// <summary>
        /// A协议功能的特性
        /// 如：是AC功能：特性：on_off,mode,fan,temperature
@@ -1075,6 +1179,10 @@
        /// （红外空调）
        /// </summary>
        public const string AcIr= "ir.ac";
        /// <summary>
        /// 空调
        /// </summary>
        public const string HvacAC = "hvac.ac";

        /// <summary>
        /// 空调spk列表
@@ -1084,6 +1192,7 @@
        {
            var spkList = new List<string>();
            spkList.Add(AcStandard);
            spkList.Add(HvacAC);
            spkList.Add(AcIr);
            return spkList;
        }
@@ -1094,6 +1203,10 @@
        /// （地热）
        /// </summary>
        public const string FloorHeatStandard = "floorHeat.standard";
        /// <summary>
        /// 地暖
        /// </summary>
        public const string HvacFloorHeat = "hvac.floorHeat";

        /// <summary>
        /// 地热spk列表
@@ -1103,6 +1216,7 @@
        {
            var spkList = new List<string>();
            spkList.Add(FloorHeatStandard);
            spkList.Add(HvacFloorHeat);
            return spkList;
        }
        #endregion
@@ -1113,9 +1227,17 @@
        /// </summary>
        public const string AirFreshStandard = "airFresh.standard";
        /// <summary>
        /// 新风
        /// </summary>
        public const string HvacAirFresh = "hvac.airFresh";
        /// <summary>
        /// 新风 ——金茂定制
        /// </summary>
        public const string AirFreshJinmao = "airFresh.jinmao";
        /// <summary>
        /// 新风 ——金茂定制
        /// </summary>
        public const string HvacAirFreshJinmao = "hvac.airFresh.jinmao";

        /// <summary>
        /// 新风spk列表
@@ -1126,6 +1248,8 @@
            var spkList = new List<string>();
            spkList.Add(AirFreshStandard);
            spkList.Add(AirFreshJinmao);
            spkList.Add(HvacAirFresh);
            spkList.Add(HvacAirFreshJinmao);
            return spkList;
        }
        #endregion
@@ -1157,6 +1281,10 @@
        /// （音乐）
        /// </summary>
        public const string MusicStandard = "music.standard";
        /// <summary>
        /// 音乐
        /// </summary>
        public const string AvMusic = "av.music";

        /// <summary>
        /// 音乐spk列表
@@ -1166,6 +1294,7 @@
        {
            var spkList = new List<string>();
            spkList.Add(MusicStandard);
            spkList.Add(AvMusic);
            return spkList;
        }
        #endregion
@@ -1216,6 +1345,7 @@
        /// 毫米波传感器
        /// </summary>
        public const string SenesorMegahealth = "sensor.megahealth";
        public const string SenesorMegahealth2 = "sensor.megahealth.zg";
        /// <summary>
        /// 安防传感器spk列表
        /// </summary>
@@ -1234,6 +1364,7 @@
            //spkList.Add(SensoruUtrasonic);
            spkList.Add(SensorDryContact);
            spkList.Add(SenesorMegahealth);
            spkList.Add(SenesorMegahealth2);
            return spkList;
        }
        #endregion
@@ -1274,6 +1405,7 @@
        /// 青萍环境传感器
        /// </summary>
        public const string SensorEnvironment3 = "sensor.environment3";
        public const string SensorEnvironmentHailin = "sensor.environment.hailin";
        /// <summary>
        /// 甲醛
        /// </summary>
@@ -1335,6 +1467,10 @@
        /// </summary>
        public const string ElectricSocket = "electrical.socket";
        /// <summary>
        /// 面板、插座、面板
        /// </summary>
        public const string PanelSocket = "panel.socket";
        /// <summary>
        /// 家电、电视
        /// </summary>
        public const string ElectricTV = "electrical.tv";
@@ -1350,6 +1486,7 @@
        /// 家电、风扇
        /// </summary>
        public const string ElectricFan = "electrical.fan";
        public const string HvacFan = "hvac.fan";
        /// <summary>
        /// 凉霸
        /// </summary>
@@ -1392,18 +1529,22 @@
        /// 家电、涂鸦空气净化器
        /// </summary>
        public const string ElectricTuyaAirCleaner = "electrical.Q1RsefNf91tIXyyQ";
        public const string ElectricTuyaAirCleaner2 = "hvac.air.tuya_epi345";
        /// <summary>
        /// 家电、涂鸦电风扇
        /// </summary>
        public const string ElectricTuyaFan = "electrical.tyqborgovyzytytz";
        public const string ElectricTuyaFan2 = "hvac.fan.tuya_ef101";
        /// <summary>
        /// 家电、涂鸦扫地机器人
        /// </summary>
        public const string ElectricTuyaWeepRobot = "electrical.ai6HtccKFIw3dxo3";
        public const string ElectricTuyaWeepRobot2 = "electrical.sweep.tuya";
        /// <summary>
        /// 家电、涂鸦水阀
        /// </summary>
        public const string ElectricTuyaWaterValve = "electrical.koiGhMKwLf2ZP81g";
        public const string ElectricTuyaWaterValve2 = "electrical.watervalve.tuya_aw713";
        #endregion


@@ -1415,19 +1556,25 @@
        {
            var spkList = new List<string>();
            spkList.Add(ElectricSocket);
            spkList.Add(PanelSocket);
            spkList.Add(ElectricTV);
            spkList.Add(TvIr);
            spkList.Add(TvXmIr);
            spkList.Add(ElectricFan);
            spkList.Add(HvacFan);
            spkList.Add(FanIr);
            spkList.Add(ClothesHanger);
            spkList.Add(IrLearn);
            spkList.Add(PjtIr);
            spkList.Add(StbIr);
            spkList.Add(ElectricTuyaAirCleaner);
            spkList.Add(ElectricTuyaAirCleaner2);
            spkList.Add(ElectricTuyaFan);
            spkList.Add(ElectricTuyaFan2);
            spkList.Add(ElectricTuyaWeepRobot);
            spkList.Add(ElectricTuyaWeepRobot2);
            spkList.Add(ElectricTuyaWaterValve);
            spkList.Add(ElectricTuyaWaterValve2);
            spkList.Add(AirSwitch);
            return spkList;
        }
@@ -1462,10 +1609,15 @@
        {
            var spkList = new List<string>();
            spkList.Add(ElectricTuyaAirCleaner);
            spkList.Add(ElectricTuyaAirCleaner2);
            spkList.Add(ElectricTuyaFan);
            spkList.Add(ElectricTuyaFan2);
            spkList.Add(ElectricTuyaWaterValve);
            spkList.Add(ElectricTuyaWaterValve2);
            spkList.Add(ElectricTuyaWeepRobot);
            spkList.Add(ElectricTuyaWeepRobot2);
            spkList.Add(SenesorMegahealth);
            spkList.Add(SenesorMegahealth2);
            return spkList;
        }
        /// <summary>
@@ -1483,6 +1635,10 @@
                    list.Add(ElectricTuyaFan);
                    list.Add(ElectricTuyaWaterValve);
                    list.Add(ElectricTuyaWeepRobot);
                    list.Add(ElectricTuyaAirCleaner2);
                    list.Add(ElectricTuyaFan2);
                    list.Add(ElectricTuyaWaterValve2);
                    list.Add(ElectricTuyaWeepRobot2);
                    break;
                case BrandType.All3tyBrand:
                    list.Add(SenesorMegahealth);//兆观
@@ -1520,56 +1676,56 @@
    }


    /// <summary>
    /// 功能类别
    /// </summary>
    public static class FunctionCategory
    {
        /// <summary>
        ///（灯）
        /// </summary>
        public const string Light = "light";
        /// <summary>
        /// （窗帘）
        /// </summary>
        public const string Curtain = "curtain";
        /// <summary>
        /// （空调）
        /// </summary>
        public const string AC = "ac";
        /// <summary>
        /// （地热）
        /// </summary>
        public const string FloorHeat = "floorHeat";
        /// <summary>
        /// （新风）
        /// </summary>
        public const string AirFresh = "airFresh";
        /// <summary>
        /// （音乐）
        /// </summary>
        public const string Music = "music";
        /// <summary>
        /// （传感器）
        /// </summary>
        public const string Sensor = "sensor";
        /// <summary>
        /// （干接点）
        /// </summary>
        public const string DryContact = "dryContact";
        /// <summary>
        /// 家电
        /// </summary>
        public const string Electric = "electrical";
        /// <summary>
        /// 红外设备
        /// </summary>
        public const string IR = "ir";
    ///// <summary>
    ///// 功能类别
    ///// </summary>
    //public static class FunctionCategory
    //{
    //    /// <summary>
    //    ///（灯）
    //    /// </summary>
    //    public const string Light = "light";
    //    /// <summary>
    //    /// （窗帘）
    //    /// </summary>
    //    public const string Curtain = "curtain";
    //    /// <summary>
    //    /// （空调）
    //    /// </summary>
    //    public const string AC = "ac";
    //    /// <summary>
    //    /// （地热）
    //    /// </summary>
    //    public const string FloorHeat = "floorHeat";
    //    /// <summary>
    //    /// （新风）
    //    /// </summary>
    //    public const string AirFresh = "airFresh";
    //    /// <summary>
    //    /// （音乐）
    //    /// </summary>
    //    public const string Music = "music";
    //    /// <summary>
    //    /// （传感器）
    //    /// </summary>
    //    public const string Sensor = "sensor";
    //    /// <summary>
    //    /// （干接点）
    //    /// </summary>
    //    public const string DryContact = "dryContact";
    //    /// <summary>
    //    /// 家电
    //    /// </summary>
    //    public const string Electric = "electrical";
    //    /// <summary>
    //    /// 红外设备
    //    /// </summary>
    //    public const string IR = "ir";




    }
    //}


public class VersionInfo