From ecbf9d722cf59efe93cf60ee47e8782eca18eca6 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 19 十二月 2020 13:22:55 +0800
Subject: [PATCH] 20201219-1
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 75d8f71..091d098 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -22,12 +22,20 @@
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.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(uFh.trait_IndoorTemp.curValue)) + "掳C";
bodyView.btnMode.UnSelectedImagePath = uFh.curModeImage;
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.curValue);
+ bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uFh.trait_temp.curValue));
+ }
+ if(uFh.trait_on_off.curValue.ToString() == "on")
+ {
+ bodyView.arcBar.Enable = true;
+ }
+ else
+ {
+ bodyView.arcBar.Enable = false;
}
});
}
@@ -47,7 +55,7 @@
{
btnFunctionName.Text = btnFunctionName_Out.Text = fh.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fh.GetRoomListName();
- fh.SaveFunctionData(true);
+ //fh.SaveFunctionData(true);
};
}
@@ -80,7 +88,7 @@
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());
+ d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
Control.Ins.SendWriteCommand(fh, d);
};
btnPlus.MouseUpEventHandler = (sender, e) =>
@@ -96,7 +104,7 @@
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());
+ d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
Control.Ins.SendWriteCommand(fh, d);
};
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
@@ -105,7 +113,7 @@
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.curValue.ToString());
+ d.Add(FunctionAttributeKey.SetTemp, fh.trait_temp.curValue.ToString());
Control.Ins.SendWriteCommand(fh, d);
};
arcBar.OnProgressChangedEvent = (sender, e) =>
@@ -130,7 +138,7 @@
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.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, fh.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(fh, d);
};
}
@@ -153,7 +161,7 @@
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());
+ d.Add(FunctionAttributeKey.Mode, fh.trait_mode.curValue.ToString());
Control.Ins.SendWriteCommand(fh, d);
dialog.Close();
};
--
Gitblit v1.8.0