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

wei

2021-07-09 068c68295cad1967f7aafb4e5e951260ef03d4ce

 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs

@@ -27,7 +27,7 @@
        /// </summary>
        public static void LoadEvent_RefreshEnvirIndoorHumi()
        {
            Application.RunOnMainThread(() =>
            Application.RunOnMainThread((Action)(() =>
            {
                if (bodyView != null)
                {
@@ -43,7 +43,7 @@
                                name = enviTemp.name,
                                sid = enviTemp.sid,
                                deviceId = enviTemp.deviceId,
                                attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
                                attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state } },
                            };
                            humiSensorList.Add(newTemp);
                        }
@@ -61,15 +61,15 @@
                    }
                    bodyView.btnIndoorHumiValues.Width = bodyView.btnIndoorHumiValues.GetTextWidth();
                }
            });
            }));
        }

        /// <summary>
        /// 更新室内传感器数据-晚点
        /// </summary>
        public static void LoadEvent_RefreshEnvirIndoorTemp()
        { 
            Application.RunOnMainThread(() =>
        {
            Application.RunOnMainThread((Action)(() =>
            {
                if (bodyView != null)
                {
@@ -85,7 +85,7 @@
                                name = enviTemp.name,
                                sid = enviTemp.sid,
                                deviceId = enviTemp.deviceId,
                                attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
                                attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state } },
                            };
                            tempSensorList.Add(newTemp);
                        }
@@ -103,7 +103,7 @@
                    }
                    bodyView.btnIndoorTempValues.Width = bodyView.btnIndoorTempValues.GetTextWidth();
                }
            });
            }));
        }

        /// <summary>
@@ -265,7 +265,7 @@
        /// </summary>
        public static void UpdataFunctionStates(Function function)
        {
            Application.RunOnMainThread(() =>
            Application.RunOnMainThread((Action)(() =>
            {
                try
                {
@@ -283,7 +283,7 @@
                                }
                                else
                                {
                                    state = function.trait_on_off.curValue.ToString() == "on";
                                    state = function.trait_on_off.state.ToString() == "on";
                                }
                                for (int i = 0; i < view.ChildrenCount; i++)
                                {
@@ -315,7 +315,7 @@
                {
                    MainPage.Log($"HomePage updata funciton states error {ex.Message}");
                }
            });
            }));
        }

        /// <summary>
@@ -398,11 +398,11 @@
                            btnSwitch.IsSelected = !btnSwitch.IsSelected;
                        });
                    }
                    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>();
                    if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
                    {
                        d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                        d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.state.ToString());
                        if (btnSwitch.IsSelected)
                        {
                            d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
@@ -416,7 +416,7 @@
                    }
                    else
                    {
                        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);
                    }
                })
@@ -468,20 +468,20 @@
            btnClose.MouseUpEventHandler = (sender, e) =>
            {
                btnClose.IsSelected = true;
                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);
            };

            btnOpen.MouseUpEventHandler = (sender, e) =>
            {
                btnOpen.IsSelected = true;
                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);
            };
        }