From 2bbb1b72dbce5cf9bd4ac4a5b7488e3f18eaf929 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 19 十二月 2020 18:37:38 +0800
Subject: [PATCH] 2020-12-19 1.IOS和Android网络切换，远程和本地控制切换优化。 2.IOS和Android后台回到前台，搜索网关，远程和本地控制切换优化.
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 994fd7e..2bef172 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -19,15 +19,29 @@
{
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.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.btnSwitch.IsSelected = uFh.trait_on_off.curValue.ToString() == "on";
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.trait_on_off.curValue.ToString() == "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.ProgressBarColor = CSS_Color.MainColor;
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
+ bodyView.btnSwitch.IsSelected = true;
+ bodyView.arcBar.Enable = true;
+ }
+ else
+ {
+ bodyView.arcBar.ProgressBarColor = CSS_Color.PromptingColor2;
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
+ bodyView.btnSwitch.IsBold = false;
+ bodyView.arcBar.Enable = false;
}
});
}
@@ -132,6 +146,20 @@
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, fh.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(fh, d);
+ if (fh.trait_on_off.curValue.ToString() == "on")
+ {
+ arcBar.ProgressBarColor = CSS_Color.MainColor;
+ arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
+ btnSwitch.IsSelected = true;
+ arcBar.Enable = true;
+ }
+ else
+ {
+ arcBar.ProgressBarColor = CSS_Color.PromptingColor2;
+ arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
+ btnSwitch.IsBold = false;
+ arcBar.Enable = false;
+ }
};
}
--
Gitblit v1.8.0