From 418b0d0a4002bc06ba3a55d1809fe46043f06c09 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 26 九月 2022 14:07:58 +0800
Subject: [PATCH] 光伏更新，金茂科技系统更新
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index 9377363..4f31eee 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -49,7 +49,14 @@
public override void RemoveFromParent()
{
- actionRefresh?.Invoke();
+ new System.Threading.Thread(() =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ actionRefresh?.Invoke();
+ });
+ })
+ { IsBackground = true }.Start();
base.RemoveFromParent();
}
@@ -497,7 +504,7 @@
btnTempCcValue.MouseUpEventHandler = (sender, e) =>
{
- LoadEditDialog(-5, 5, Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.room_humidity_cc)), (reslut) =>
+ LoadEditDialog(-10, 10, Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.room_humidity_cc)), (reslut) =>
{
btnTempCcValue.Text = reslut + "掳C";
Dictionary<string, string> dic = new Dictionary<string, string>();
@@ -558,7 +565,7 @@
btnHumidityCcValue.MouseUpEventHandler = (sender, e) =>
{
- LoadEditDialog(-10, 10, Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.room_humidity_cc)), (reslut) =>
+ LoadEditDialog(-20, 20, Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.room_humidity_cc)), (reslut) =>
{
btnHumidityCcValue.Text = reslut + "%";
Dictionary<string, string> dic = new Dictionary<string, string>();
@@ -603,7 +610,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = function.GetAttrState(FunctionAttributeKey.cac_valve) + "掳C",
+ TextID = function.GetAttrState(FunctionAttributeKey.cac_valve) == "on"? StringId.On:StringId.OFF,
};
cacValveRow.AddChidren(btnCacValvaValue);
}
@@ -641,7 +648,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = function.GetAttrState(FunctionAttributeKey.fh_valve),
+ TextID = function.GetAttrState(FunctionAttributeKey.fh_valve) == "on"? StringId.On:StringId.OFF,
};
fhValveRow.AddChidren(btnFhValvaValue);
}
@@ -701,14 +708,7 @@
{
if (result != null && result.Code == StateCode.SUCCESS)
{
- if (result.Data.ToString() == "true")
- {
deviceMessageRules.push = push;
- }
- else
- {
- btnSwtichIcon0.IsSelected = deviceMessageRules.push;
- }
}
else
{
--
Gitblit v1.8.0