状态属性更改，不要轻易合并

wei

2021-07-09 068c68295cad1967f7aafb4e5e951260ef03d4ce

 HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs

@@ -17,7 +17,7 @@
        {
            if(bodyDiv!= null)
            {
                Application.RunOnMainThread(() => {
                Application.RunOnMainThread((Action)(() => {
                    if(bodyDiv.Tag.ToString() == upfunc.sid)
                    {
                        for (var o = 0; o < bodyDiv.ChildrenCount; o++)
@@ -29,7 +29,7 @@
                                {
                                    if (btn.Tag.ToString() == upfunc.sid + "_Switch")// + "_DimmerBar")
                                    {
                                        btn.IsSelected = upfunc.trait_on_off.curValue.ToString() == "on";
                                        btn.IsSelected = upfunc.trait_on_off.state.ToString() == "on";
                                    }
                                }
                            }
@@ -47,7 +47,7 @@
                        }

                    }
                });
                }));
            }
        }
        /// <summary>
@@ -93,13 +93,13 @@

                new System.Threading.Thread(() =>
                {
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    function.trait_on_off.state = btnSwitch.IsSelected ? "on" : "off";
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                    d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.state.ToString());
                    if(fadeTime!= null)
                    {
                        int result = 0;
                        int.TryParse(fadeTime.curValue.ToString(), out result);
                        int.TryParse(fadeTime.state.ToString(), out result);
                        d.Add(FunctionAttributeKey.FadeTime, result.ToString());
                    }
                    Control.Ins.SendWriteCommand(function, d);
@@ -121,9 +121,9 @@
                {
                    if (function.Spk_Prefix == FunctionCategory.Light)
                    {
                        function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                        function.trait_on_off.state = btnSwitch.IsSelected ? "on" : "off";
                        Dictionary<string, string> d = new Dictionary<string, string>();
                        d.Add("on_off", function.trait_on_off.curValue.ToString());
                        d.Add("on_off", function.trait_on_off.state.ToString());
                        Control.Ins.SendWriteCommand(function, d);
                    }
                })
@@ -199,10 +199,10 @@
                btnClose.IsSelected = true;
                btnStop.IsSelected = false;
                btnOpen.IsSelected = false;
                curtain.trait_on_off.curValue = "off";
                curtain.trait_on_off.state = "off";
                curtain.SetAttrState(FunctionAttributeKey.Percent, 0);
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.state.ToString());
                Control.Ins.SendWriteCommand(curtain, d);
            };

@@ -211,9 +211,9 @@
                btnStop.IsSelected = true;
                btnClose.IsSelected = false;
                btnOpen.IsSelected = false;
                curtain.trait_on_off.curValue = "stop";
                curtain.trait_on_off.state = "stop";
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.state.ToString());
                Control.Ins.SendWriteCommand(curtain, d);
            };

@@ -222,10 +222,10 @@
                btnOpen.IsSelected = true;
                btnClose.IsSelected = false;
                btnStop.IsSelected = false;
                curtain.trait_on_off.curValue = "on";
                curtain.trait_on_off.state = "on";
                curtain.SetAttrState(FunctionAttributeKey.Percent, 100);
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.state.ToString());
                Control.Ins.SendWriteCommand(curtain, d);
            };
        }