From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 141 +++++++++++++++++++++++++++++++++--------------
1 files changed, 99 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 75d8f71..950bbd0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/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,16 +19,47 @@
{
return;
}
- 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.curValue.ToString() == "on";
- if (uFh.refreshTime.AddMilliseconds(1000) < DateTime.Now)
+ var outinTemp = Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.SetTemp)));
+ bodyView.btnTemp.Text = outinTemp.ToString();
+ bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.RoomTemp))) + "掳C";
+ bodyView.btnMode.UnSelectedImagePath = bodyView.fhTemp.GetModeIconPath(updateTemp.GetAttrState(FunctionAttributeKey.Mode));
+ bodyView.arcBar.Progress = outinTemp;
+ //if (updateTemp.trait_on_off.curValue.ToString() == "on")
+ //{
+ // bodyView.arcBar.ThumbImagePath = "FunctionIcon/FloorHeating/DiyThumbIconOn.png";
+ // bodyView.btnSwitch.IsSelected = true;
+ // bodyView.arcBar.IsOffline = false;
+ //}
+ //else
+ //{
+ // bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
+ // bodyView.btnSwitch.IsSelected = false;
+ // bodyView.arcBar.IsOffline = true;
+ //}
+
+ if (updateTemp.trait_on_off.curValue.ToString() == "on")
{
- bodyView.arcBar.Progress = Convert.ToInt32(uFh.trait_temp.curValue);
+ bodyView.arcBar.IsOffline = false;
+ bodyView.btnSwitch.IsSelected = true;
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
+ if (updateTemp.GetAttrState(FunctionAttributeKey.Mode) == "fan")
+ {
+ bodyView.arcBar.IsClickable = false;
+ }
+ else
+ {
+ bodyView.arcBar.IsClickable = true;
+ }
}
+ else
+ {
+ bodyView.arcBar.IsOffline = true;
+ bodyView.btnSwitch.IsSelected = false;
+ bodyView.arcBar.IsClickable = false;
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
+ }
+
+
});
}
catch (Exception ex)
@@ -45,9 +76,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);
};
}
@@ -58,8 +89,8 @@
{
btnCollection.MouseUpEventHandler += (sender, e) =>
{
- btnCollection.IsSelected = fh.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- fh.SaveFunctionData(true);
+ btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ function.CollectFunction();
};
}
@@ -70,48 +101,55 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
- var temp = Convert.ToInt32(fh.trait_temp.curValue);
- if (temp < Convert.ToInt32(fh.trait_temp.min))
+ if(function.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
+
+ 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;
+ 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("temp", temp.ToString());
- Control.Ins.SendWriteCommand(fh, d);
+ d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
- var temp = Convert.ToInt32(fh.trait_temp.curValue);
- if (temp > Convert.ToInt32(fh.trait_temp.max))
+ if (function.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
+ var temp =(int) Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp));
+ if (temp > Convert.ToDouble(function.GetAttribute(FunctionAttributeKey.SetTemp).max))
{
return;
}
temp++;
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- fh.trait_temp.curValue = temp;
- //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("temp", temp.ToString());
- Control.Ins.SendWriteCommand(fh, d);
+ d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
+ Control.Ins.SendWriteCommand(function, d);
};
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- fh.trait_temp.curValue = arcBar.Progress;
- 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("temp", 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;
- btnTemp.Text = fh.trait_temp.curValue.ToString();
+ function.SetAttrState(FunctionAttributeKey.SetTemp, e);
+ btnTemp.Text = Convert.ToDouble( function.GetAttrState(FunctionAttributeKey.SetTemp)).ToString();
};
}
/// <summary>
@@ -121,17 +159,35 @@
{
btnMode.MouseUpEventHandler = (sender, e) =>
{
+ if (function.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
LoadDiv_ChangeModeView();
};
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
- fh.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
- //Control.Send(CommandType_A.write, fh);
+ 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";
+ btnSwitch.IsSelected = true;
+ arcBar.IsOffline = false;
+ }
+ else
+ {
+ //arcBar.ProgressBarColor = CSS_Color.PromptingColor2;
+ arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
+ btnSwitch.IsBold = false;
+ arcBar.IsOffline = true;
+ }
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", 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);
+
};
}
@@ -148,13 +204,14 @@
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
btn1.IsSelected = btn2.IsSelected = true;
- fh.trait_mode.curValue = curMode;
- byte pro = 6;
- fh.modeTemp.TryGetValue(curMode, out pro);
- arcBar.Progress = pro;
+ function.SetAttrState(FunctionAttributeKey.Mode,curMode);
+ btnMode.UnSelectedImagePath = btn1.SelectedImagePath;
+ //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("mode", fh.curModeIndex.ToString());
- Control.Ins.SendWriteCommand(fh, d);
+ d.Add(FunctionAttributeKey.Mode, function.GetAttrState(FunctionAttributeKey.Mode));
+ Control.Ins.SendWriteCommand(function, d);
dialog.Close();
};
btn1.MouseUpEventHandler = eventHandler1;
--
Gitblit v1.8.0