数据结构优化修改

wei

2021-03-08 37c315988c2dc11e4f477233f7a9f87d57bb61aa

 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs

@@ -9,7 +9,7 @@
    public partial class FloorHeatingPage
    {

        public static void UpdataStates(FloorHeating uFh)
        public static void UpdataStates(Function updateTemp)
        {
            try
            {
@@ -19,11 +19,11 @@
                    {
                        return;
                    }
                    bodyView.btnTemp.Text = uFh.trait_temp.curValue.ToString();
                    bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(uFh.trait_IndoorTemp.curValue)) + "°C";
                    bodyView.btnMode.UnSelectedImagePath = uFh.curModeImage;
                    bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uFh.trait_temp.curValue));
                    if (uFh.trait_on_off.curValue.ToString() == "on")
                    bodyView.btnTemp.Text = updateTemp.GetAttrState(FunctionAttributeKey.SetTemp);
                    bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.IndoorTemp))) + "°C";
                    bodyView.btnMode.UnSelectedImagePath = bodyView.fhTemp.GetModeImage(updateTemp);
                    bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.SetTemp)));
                    if (updateTemp.trait_on_off.curValue.ToString() == "on")
                    {
                        bodyView.arcBar.ThumbImagePath = "FunctionIcon/FloorHeating/DiyThumbIconOn.png";
                        bodyView.btnSwitch.IsSelected = true;
@@ -51,9 +51,9 @@
            //回退刷新信息事件
            actionRefresh = () =>
            {
                btnFunctionName.Text = btnFunctionName_Out.Text = fh.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fh.GetRoomListName();
                //fh.SaveFunctionData(true);
                btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
                //function.SaveFunctionData(true);
            };
        }

@@ -64,8 +64,8 @@
        {
            btnCollection.MouseUpEventHandler += (sender, e) =>
            {
                btnCollection.IsSelected = fh.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                fh.CollectFunction();
                btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                function.CollectFunction();
            };
        }

@@ -76,57 +76,55 @@
        {
            btnMinus.MouseUpEventHandler = (sender, e) =>
            {
                if(fh.trait_on_off.curValue.ToString() == "off")
                if(function.trait_on_off.curValue.ToString() == "off")
                {
                    return;
                }

                var temp = Convert.ToInt32(fh.trait_temp.curValue);
                if (temp < Convert.ToInt32(fh.trait_temp.min))
                var temp = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.SetTemp));
                if (temp < Convert.ToInt32(function.GetAttribute(FunctionAttributeKey.SetTemp).min))
                {
                    return;
                }
                temp--;
                arcBar.Progress = temp;
                fh.trait_temp.curValue = temp.ToString();
                function.SetAttrState(FunctionAttributeKey.SetTemp, temp);
                btnTemp.Text = temp.ToString();
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
                Control.Ins.SendWriteCommand(fh, d);
                Control.Ins.SendWriteCommand(function, d);
            };
            btnPlus.MouseUpEventHandler = (sender, e) =>
            {
                if (fh.trait_on_off.curValue.ToString() == "off")
                if (function.trait_on_off.curValue.ToString() == "off")
                {
                    return;
                }
                var temp = Convert.ToInt32(fh.trait_temp.curValue);
                if (temp > Convert.ToInt32(fh.trait_temp.max))
                var temp = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.SetTemp));
                if (temp > Convert.ToInt32(function.GetAttribute(FunctionAttributeKey.SetTemp).max))
                {
                    return;
                }
                temp++;
                arcBar.Progress = temp;
                btnTemp.Text = temp.ToString();
                fh.trait_temp.curValue = temp.ToString();
                //Control.Send(CommandType_A.write, fh);
                function.SetAttrState(FunctionAttributeKey.SetTemp, temp);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
                Control.Ins.SendWriteCommand(fh, d);
                Control.Ins.SendWriteCommand(function, d);
            };
            arcBar.OnStopTrackingTouchEvent = (sender, e) =>
            {
                fh.trait_temp.curValue = arcBar.Progress.ToString();
                btnTemp.Text = fh.trait_temp.curValue.ToString();
                //Control.Send(CommandType_A.write, fh);
                function.SetAttrState(FunctionAttributeKey.SetTemp,arcBar.Progress);
                btnTemp.Text = arcBar.Progress.ToString();
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.SetTemp, fh.trait_temp.curValue.ToString());
                Control.Ins.SendWriteCommand(fh, d);
                d.Add(FunctionAttributeKey.SetTemp, arcBar.Progress.ToString());
                Control.Ins.SendWriteCommand(function, d);
            };
            arcBar.OnProgressChangedEvent = (sender, e) =>
            {
                fh.trait_temp.curValue = e.ToString();
                btnTemp.Text = fh.trait_temp.curValue.ToString();
                function.SetAttrState(FunctionAttributeKey.SetTemp, e);
                btnTemp.Text = function.GetAttrState(FunctionAttributeKey.SetTemp);
            };
        }
        /// <summary>
@@ -136,7 +134,7 @@
        {
            btnMode.MouseUpEventHandler = (sender, e) =>
            {
                if (fh.trait_on_off.curValue.ToString() == "off")
                if (function.trait_on_off.curValue.ToString() == "off")
                {
                    return;
                }
@@ -146,8 +144,8 @@
            btnSwitch.MouseUpEventHandler = (sender, e) =>
            {
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                fh.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                if (fh.trait_on_off.curValue.ToString() == "on")
                function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                if (function.trait_on_off.curValue.ToString() == "on")
                {
                    //arcBar.ProgressBarColor = CSS_Color.MainColor;
                    arcBar.ThumbImagePath = "FunctionIcon/FloorHeating/DiyThumbIconOn.png";
@@ -162,8 +160,8 @@
                    arcBar.IsOffline = true;
                }
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.OnOff, fh.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(fh, d);
                d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(function, d);
               
            };
        }
@@ -181,14 +179,14 @@
            EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
            {
                btn1.IsSelected = btn2.IsSelected = true;
                fh.trait_mode.curValue = curMode;
                function.SetAttrState(FunctionAttributeKey.Mode,curMode);
                btnMode.UnSelectedImagePath = btn1.SelectedImagePath;
                byte pro = 6;
                fh.modeTemp.TryGetValue(curMode, out pro);
                arcBar.Progress = pro;
                //byte pro = 6;//不处理温度显示，等待回复数据再处理
                //function.Fh_Mode_Temp.TryGetValue(curMode, out pro);
                //arcBar.Progress = pro;
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add(FunctionAttributeKey.Mode, fh.trait_mode.curValue.ToString());
                Control.Ins.SendWriteCommand(fh, d);
                d.Add(FunctionAttributeKey.Mode, function.GetAttrState(FunctionAttributeKey.Mode));
                Control.Ins.SendWriteCommand(function, d);
                dialog.Close();
            };
            btn1.MouseUpEventHandler = eventHandler1;