From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 33aae0b..6dcf3f6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/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);
}
});
}
@@ -47,6 +47,7 @@
{
btnFunctionName.Text = btnFunctionName_Out.Text = fh.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fh.GetRoomListName();
+ fh.SaveFunctionData();
};
}
@@ -69,22 +70,22 @@
{
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());
- Control.ins.SendWriteCommand(fh, d);
+ Control.Ins.SendWriteCommand(fh, d);
};
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,25 +93,25 @@
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());
- Control.ins.SendWriteCommand(fh, d);
+ Control.Ins.SendWriteCommand(fh, d);
};
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());
- Control.ins.SendWriteCommand(fh, d);
+ 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,11 +127,11 @@
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());
- Control.ins.SendWriteCommand(fh, d);
+ d.Add("on_off", fh.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(fh, d);
};
}
@@ -147,13 +148,13 @@
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;
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);
+ Control.Ins.SendWriteCommand(fh, d);
dialog.Close();
};
btn1.MouseUpEventHandler = eventHandler1;
--
Gitblit v1.8.0