From 5da8b5819bebf4665b8dd715f8fc601913b3fe40 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 09 十月 2021 17:33:28 +0800
Subject: [PATCH] 2021-10-09 1.添加Multicast Networking权限，适配Xcode12.5之后编译在iOS14.5 +系统无法发送UDP广播包问题。
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index c60d77b..c35417a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -19,22 +19,50 @@
{
return;
}
- bodyView.btnTemp.Text = updateTemp.GetAttrState(FunctionAttributeKey.SetTemp);
- bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.IndoorTemp))) + "掳C";
- bodyView.btnMode.UnSelectedImagePath = bodyView.fhTemp.GetModeImage(updateTemp);
- bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.SetTemp)));
+ 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.SelectedImagePath = bodyView.fhTemp.GetModeIconPath(updateTemp.GetAttrState(FunctionAttributeKey.Mode));
+ bodyView.btnMode.UnSelectedImagePath = bodyView.fhTemp.GetModeIconPath(updateTemp.GetAttrState(FunctionAttributeKey.Mode),false);
+ 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.ThumbImagePath = "FunctionIcon/FloorHeating/DiyThumbIconOn.png";
- bodyView.btnSwitch.IsSelected = true;
+ bodyView.btnMode.IsSelected = true;
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.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
- bodyView.btnSwitch.IsBold = false;
+ bodyView.btnMode.IsSelected = false;
bodyView.arcBar.IsOffline = true;
+ bodyView.btnSwitch.IsSelected = false;
+ bodyView.arcBar.IsClickable = false;
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
}
+
+
});
}
catch (Exception ex)
@@ -82,7 +110,7 @@
}
var temp = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.SetTemp));
- if (temp < Convert.ToInt32(function.GetAttribute(FunctionAttributeKey.SetTemp).min))
+ if (temp <= Convert.ToInt32(function.GetAttribute(FunctionAttributeKey.SetTemp).min))
{
return;
}
@@ -100,8 +128,8 @@
{
return;
}
- var temp = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.SetTemp));
- if (temp > Convert.ToInt32(function.GetAttribute(FunctionAttributeKey.SetTemp).max))
+ var temp =(int) Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp));
+ if (temp >= Convert.ToDouble(function.GetAttribute(FunctionAttributeKey.SetTemp).max))
{
return;
}
@@ -124,7 +152,7 @@
arcBar.OnProgressChangedEvent = (sender, e) =>
{
function.SetAttrState(FunctionAttributeKey.SetTemp, e);
- btnTemp.Text = function.GetAttrState(FunctionAttributeKey.SetTemp);
+ btnTemp.Text = Convert.ToDouble( function.GetAttrState(FunctionAttributeKey.SetTemp)).ToString();
};
}
/// <summary>
--
Gitblit v1.8.0