20201219-1

wei

2020-12-19 ecbf9d722cf59efe93cf60ee47e8782eca18eca6

 HDL_ON/Entity/Function/Function.cs

@@ -173,8 +173,8 @@
                            max = 1,
                            min = 0,
                        };
                        _trait_on_off.curValue = "on";
                    }
                    _trait_on_off.curValue = "on";
                }
                return _trait_on_off;
            }
@@ -235,7 +235,7 @@
            }
            if (roomNameList == "" && functionType == FunctionType.Scene)
            {
                roomNameList = Language.StringByID(StringId.WholeHouseScene);
                roomNameList = Language.StringByID(StringId.WholeZone);
            }
            return roomNameList;
        }
@@ -343,6 +343,7 @@
            ApiAlinkControlActionObj aaao = new ApiAlinkControlActionObj();
            aaao.deviceId = this.deviceId;
            aaao.spk = this.spk;
            aaao.bus = this.bus;
            foreach (var kv in keyValues)
            {
                aaao.attributes.Add(new AlinkControlAttributes()
@@ -643,15 +644,15 @@
        /// <summary>
        /// 家电、插座
        /// </summary>
        public const string ElectricSocket = "electric.socket ";

        public const string ElectricSocket = "electrical.socket";

        /// <summary>
        /// 家电、电视
        /// </summary>
        public const string ElectricTV = "electric.tv";

        public const string ElectricTV = "electrical.tv";

        /// <summary>
        /// 家电、风扇
        /// </summary>
        public const string ElectricFan = "electric.fan";
        public const string ElectricFan = "electrical.fan";
    }

}