202009101

wxr

2020-09-10 af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b

 HDL_ON/Entity/Function/Light.cs

@@ -21,7 +21,7 @@
        }

        [Newtonsoft.Json.JsonIgnore]
        public Trait trait_brightness;
        Trait trait_brightness;
        /// <summary>
        /// 亮度值
        /// </summary>
@@ -32,21 +32,21 @@
            {
                if (trait_brightness == null)
                {
                    trait_brightness = propertList.Find((obj) => obj.attri == "brightness");
                    trait_brightness = function.Find((obj) => obj.name == "brightness");
                    //找不到属性需要声明一个，防止报错闪退
                    if (trait_brightness == null)
                    {
                        trait_brightness = new Trait()
                        {
                            attri = "brightness",
                            value = new List<string> { "up", "down" },
                            name = "brightness",
                            value_key = new List<string> { "up", "down" },
                            max = 100,
                            min = 0,
                        };
                    }
                    trait_brightness.curValues = trait_brightness.min;
                    trait_brightness.value = trait_brightness.min;
                }
                return Convert.ToInt32(trait_brightness.curValues);
                return Convert.ToInt32(trait_brightness.value);
            }
            set
            {
@@ -54,21 +54,21 @@
                {
                    if (trait_brightness == null)
                    {
                        trait_brightness = propertList.Find((obj) => obj.attri == "brightness");
                        trait_brightness = function.Find((obj) => obj.name == "brightness");
                        //找不到属性需要声明一个，防止报错闪退
                        if (trait_brightness == null)
                        {
                            trait_brightness = new Trait()
                            {
                                attri = "brightness",
                                value = new List<string> { "up", "down" },
                                name = "brightness",
                                value_key = new List<string> { "up", "down" },
                                max = 100,
                                min = 0,
                            };
                        }
                        trait_brightness.curValues = trait_brightness.min;
                        trait_brightness.value = trait_brightness.min;
                    }
                    trait_brightness.curValues = value;
                    trait_brightness.value = value;
                    MainPage.Log($"brightness 数据刷新{value}.");
                }
                catch
@@ -91,27 +91,27 @@
            {
                if (trait_color == null)
                {
                    trait_color = propertList.Find((obj) => obj.attri == "color");
                    trait_color = function.Find((obj) => obj.name == "color");
                    //找不到属性需要声明一个，防止报错闪退
                    if (trait_color == null)
                    {
                        trait_color = new Trait()
                        {
                            attri = "color",
                            value = new List<string> { "FFFFFF" },
                            name = "color",
                            value_key = new List<string> { "FFFFFF" },
                            max = 0xFFFFFF,
                            min = 0x000000,
                        };
                    }
                    trait_color.curValues = trait_color.min;
                    trait_color.value = trait_color.min;
                }
                return Convert.ToInt32(trait_color.curValues);
                return Convert.ToInt32(trait_color.value);
            }
            set
            {
                try
                {
                    trait_color.curValues = value;
                    trait_color.value = value;
                }
                catch
                {
@@ -200,41 +200,6 @@
                    MainPage.Log($"set blue color error : {ex.Message}");
                }
            }
        }


        /// <summary>
        /// 拼接、获取A协议操作数据
        /// </summary>
        public override JObject GetSendJObject(CommandType_A command )
        {
            var sendJob = new JObject();
            if (command == CommandType_A.write)
            {

                sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command.ToString() }, { "Type", "device" } };
                JObject data = null;
                switch (functionType)
                {
                    case FunctionType.Relay:
                        data = new JObject { { "sid", sid }, { "switch", on_off } };
                        break;
                    case FunctionType.Dimmer:
                        data = new JObject { { "sid", sid }, { "brightness", brightness } };
                        break;
                    case FunctionType.RGB:
                        data = new JObject { { "sid", sid }, { "brightness", brightness }, { "color", color } };
                        break;
                }
                sendJob.Add("objects", data);
            }
            else if (command == CommandType_A.read)
            {
                sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command.ToString() }, { "Type", "device" } };
                var data = new JObject {{ "sid", sid } };
                sendJob.Add("objects", data);
            }
            return sendJob;
        }
    }
}