1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

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

@@ -19,15 +19,15 @@
                    {
                        return;
                    }
                    bodyView.arcBar.ProgressBarColor = uFh.trait_on_off.value.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
                    bodyView.arcBar.ThumbImagePath = uFh.trait_on_off.value.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
                    bodyView.btnTemp.Text = uFh.trait_temp.value.ToString();
                    bodyView.arcBar.ProgressBarColor = uFh.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
                    bodyView.arcBar.ThumbImagePath = uFh.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
                    bodyView.btnTemp.Text = uFh.trait_temp.curValue.ToString();
                    bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + uFh.indoorTemp + "°C";
                    bodyView.btnMode.UnSelectedImagePath = uFh.curModeImage;
                    bodyView.btnSwitch.IsSelected = uFh.trait_on_off.value.ToString() == "on";
                    bodyView.btnSwitch.IsSelected = uFh.trait_on_off.curValue.ToString() == "on";
                    if (uFh.refreshTime.AddMilliseconds(1000) < DateTime.Now)
                    {
                        bodyView.arcBar.Progress =  Convert.ToInt32(uFh.trait_temp.value);
                        bodyView.arcBar.Progress =  Convert.ToInt32(uFh.trait_temp.curValue);
                    }
                });
            }
@@ -69,14 +69,14 @@
        {
            btnMinus.MouseUpEventHandler = (sender, e) =>
            {
                var temp = Convert.ToInt32(fh.trait_temp.value);
                var temp = Convert.ToInt32(fh.trait_temp.curValue);
                if (temp < Convert.ToInt32(fh.trait_temp.min))
                {
                    return;
                }
                temp--;
                arcBar.Progress = temp;
                fh.trait_temp.value = temp;
                fh.trait_temp.curValue = temp;
                btnTemp.Text = temp.ToString();
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("temp", temp.ToString());
@@ -84,7 +84,7 @@
            };
            btnPlus.MouseUpEventHandler = (sender, e) =>
            {
                var temp = Convert.ToInt32(fh.trait_temp.value);
                var temp = Convert.ToInt32(fh.trait_temp.curValue);
                if (temp > Convert.ToInt32(fh.trait_temp.max))
                {
                    return;
@@ -92,7 +92,7 @@
                temp++;
                arcBar.Progress = temp;
                btnTemp.Text = temp.ToString();
                fh.trait_temp.value = temp;
                fh.trait_temp.curValue = temp;
                //Control.Send(CommandType_A.write, fh);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("temp", temp.ToString());
@@ -100,17 +100,17 @@
            };
            arcBar.OnStopTrackingTouchEvent = (sender, e) =>
            {
                fh.trait_temp.value = arcBar.Progress;
                btnTemp.Text = fh.trait_temp.value.ToString();
                fh.trait_temp.curValue = arcBar.Progress;
                btnTemp.Text = fh.trait_temp.curValue.ToString();
                //Control.Send(CommandType_A.write, fh);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("temp", fh.trait_temp.value.ToString());
                d.Add("temp", fh.trait_temp.curValue.ToString());
                Control.Ins.SendWriteCommand(fh, d);
            };
            arcBar.OnProgressChangedEvent = (sender, e) =>
            {
                fh.trait_temp.value = e;
                btnTemp.Text = fh.trait_temp.value.ToString();
                fh.trait_temp.curValue = e;
                btnTemp.Text = fh.trait_temp.curValue.ToString();
            };
        }
        /// <summary>
@@ -126,10 +126,10 @@
            btnSwitch.MouseUpEventHandler = (sender, e) =>
            {
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                fh.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
                fh.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                //Control.Send(CommandType_A.write, fh);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("on_off", fh.trait_on_off.value.ToString());
                d.Add("on_off", fh.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(fh, d);
            };
        }
@@ -147,7 +147,7 @@
            EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
            {
                btn1.IsSelected = btn2.IsSelected = true;
                fh.trait_mode.value = curMode;
                fh.trait_mode.curValue = curMode;
                byte pro = 6;
                fh.modeTemp.TryGetValue(curMode, out pro);
                arcBar.Progress = pro;