From 7232642ff48a7fbde2018cde652f3e771fa58025 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 27 一月 2021 14:32:55 +0800
Subject: [PATCH] 20200127-英文版处理
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 113 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 77 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 5f8cf52..8a716e8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -18,14 +19,21 @@
{
return;
}
- bodyView.arcBar.ProgressBarColor = bodyView.fh.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
- bodyView.btnTemp.Text = uFh.curTemp.ToString();
- bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + uFh.indoorTemp + "掳C";
+ 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.btnSwitch.IsSelected = uFh.on_off == "on";
- if (uFh.refreshTime.AddMilliseconds(1000) < DateTime.Now)
+ bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uFh.trait_temp.curValue));
+ if (uFh.trait_on_off.curValue.ToString() == "on")
{
- bodyView.arcBar.Progress = uFh.curTemp;
+ 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.IsBold = false;
+ bodyView.arcBar.IsOffline = true;
}
});
}
@@ -45,6 +53,7 @@
{
btnFunctionName.Text = btnFunctionName_Out.Text = fh.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fh.GetRoomListName();
+ //fh.SaveFunctionData(true);
};
}
@@ -55,8 +64,8 @@
{
btnCollection.MouseUpEventHandler += (sender, e) =>
{
- btnCollection.IsSelected = fh.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = fh.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ fh.CollectFunction();
};
}
@@ -67,45 +76,57 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
- if (fh.curTemp < 6)
+ if(fh.trait_on_off.curValue.ToString() == "off")
{
return;
}
- fh.curTemp--;
- arcBar.Progress = fh.curTemp;
- btnTemp.Text = fh.curTemp.ToString();
- //Control.Send(CommandType_A.write, fh);
+
+ var temp = Convert.ToInt32(fh.trait_temp.curValue);
+ if (temp < Convert.ToInt32(fh.trait_temp.min))
+ {
+ return;
+ }
+ temp--;
+ arcBar.Progress = temp;
+ fh.trait_temp.curValue = temp.ToString();
+ btnTemp.Text = temp.ToString();
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("temp", fh.curTemp.ToString());
- Control.SendWriteCommand(fh, d);
+ d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
+ Control.Ins.SendWriteCommand(fh, d);
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
- if (fh.curTemp > 34)
+ if (fh.trait_on_off.curValue.ToString() == "off")
{
return;
}
- fh.curTemp++;
- arcBar.Progress = fh.curTemp;
- btnTemp.Text = fh.curTemp.ToString();
+ var temp = Convert.ToInt32(fh.trait_temp.curValue);
+ if (temp > Convert.ToInt32(fh.trait_temp.max))
+ {
+ return;
+ }
+ temp++;
+ arcBar.Progress = temp;
+ btnTemp.Text = temp.ToString();
+ fh.trait_temp.curValue = temp.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.curTemp.ToString());
- Control.SendWriteCommand(fh, d);
+ d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
+ Control.Ins.SendWriteCommand(fh, d);
};
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- fh.curTemp = arcBar.Progress;
- btnTemp.Text = fh.curTemp.ToString();
+ fh.trait_temp.curValue = arcBar.Progress.ToString();
+ 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.curTemp.ToString());
- Control.SendWriteCommand(fh, d);
+ d.Add(FunctionAttributeKey.SetTemp, fh.trait_temp.curValue.ToString());
+ Control.Ins.SendWriteCommand(fh, d);
};
arcBar.OnProgressChangedEvent = (sender, e) =>
{
- fh.curTemp = e;
- btnTemp.Text = fh.curTemp.ToString();
+ fh.trait_temp.curValue = e.ToString();
+ btnTemp.Text = fh.trait_temp.curValue.ToString();
};
}
/// <summary>
@@ -115,17 +136,35 @@
{
btnMode.MouseUpEventHandler = (sender, e) =>
{
+ if (fh.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
LoadDiv_ChangeModeView();
};
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
- fh.on_off = btnSwitch.IsSelected ? "on" : "off";
- //Control.Send(CommandType_A.write, fh);
+ fh.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+ if (fh.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.on_off.ToString());
- Control.SendWriteCommand(fh, d);
+ d.Add(FunctionAttributeKey.OnOff, fh.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(fh, d);
+
};
}
@@ -142,17 +181,19 @@
EventHandler<MouseEventArgs> eventHandler1 = (sender, e) =>
{
btn1.IsSelected = btn2.IsSelected = true;
- fh.curMode = curMode;
- //Control.Send(CommandType_A.write, fh);
+ fh.trait_mode.curValue = curMode;
+ btnMode.UnSelectedImagePath = btn1.SelectedImagePath;
+ 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.SendWriteCommand(fh, d);
+ d.Add(FunctionAttributeKey.Mode, fh.trait_mode.curValue.ToString());
+ Control.Ins.SendWriteCommand(fh, d);
dialog.Close();
};
btn1.MouseUpEventHandler = eventHandler1;
btn2.MouseUpEventHandler = eventHandler1;
dialogView.MouseUpEventHandler = eventHandler;
}
-
}
}
--
Gitblit v1.8.0