From 1a0ddfcd1a24ed0a14d76362802c974e3d4c86c8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 31 一月 2023 17:53:29 +0800
Subject: [PATCH] 空调进度控制问题修复
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index 3b3a26d..ef87fa0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -123,15 +123,25 @@
Text = "---",
IsBold = true,
};
- if(setTempAttr.step == "0.5")
+ if (setTempAttr.step == "0.5")
{
btnTemp.Text = Convert.ToDouble(setTempAttr.curValue).ToString("0.0");
}
else
{
- btnTemp.Text = setTempAttr.curValue.ToString();
+ if (setTempAttr.curValue.ToString().Contains("."))
+ {
+ btnTemp.Text = setTempAttr.curValue.ToString().Split(".")[0];
+ }else
+ {
+ btnTemp.Text = setTempAttr.curValue.ToString();
+ }
}
- btnTemp.Width = btnTemp.GetTextWidth();
+#if __IOS__
+ btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(10);
+#else
+ btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
+#endif
FrameWhiteCentet1.AddChidren(btnTemp);
@@ -171,12 +181,11 @@
var btnMinTemp = new Button()
{
- X = Application.GetRealWidth(26),
- Width = Application.GetRealWidth(18),
+ X = Application.GetRealWidth(22),
+ Width = Application.GetRealWidth(22),
TextAlignment = TextAlignment.Center,
Text = setTempAttr.min.ToString(),
TextSize = 12,
- TextColor = 0xFFC0C7D4,
};
setTempView.AddChidren(btnMinTemp);
@@ -217,7 +226,7 @@
var btnMaxTemp = new Button()
{
X = setTempBar.Right,
- Width = Application.GetRealWidth(18),
+ Width = Application.GetRealWidth(24),
TextAlignment = TextAlignment.Center,
Text = setTempAttr.max.ToString(),
TextSize = 12,
@@ -284,6 +293,13 @@
{
btnTemp.Text = (setTempAttr.min + e).ToString();
}
+
+#if __IOS__
+ btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(10);
+#else
+ btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
+#endif
+ btnTempUint.X = btnTemp.Right;
};
setTempBar.OnStopTrackingTouchEvent = (sender,e) =>{
temp = e;
@@ -296,9 +312,16 @@
{
btnTemp.Text = (setTempAttr.min + e).ToString();
}
+
+#if __IOS__
+ btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(10);
+#else
+ btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
+#endif
+ btnTempUint.X = btnTemp.Right;
controlTime = DateTime.Now;
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add(FunctionAttributeKey.SetTemp, e.ToString());
+ d.Add(FunctionAttributeKey.SetTemp, (setTempAttr.min + e).ToString());
Control.Ins.SendWriteCommand(device, d);
};
@@ -970,12 +993,16 @@
if (device.trait_on_off.curValue.ToString() == "on")
{
btnSwitch.IsSelected = true;
- setTempBar.IsOffline = false;
+ //setTempBar.IsOffline = false;
+ //setTempBar.Enable = true;
+ //setTempBar.ProgressBarColor = CSS_Color.MainColor;
}
else
{
btnSwitch.IsBold = false;
- setTempBar.IsOffline = true;
+ //setTempBar.IsOffline = true;
+ //setTempBar.Enable = false;
+ //setTempBar.ProgressBarColor = CSS_Color.DividingLineColor;
}
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, device.trait_on_off.curValue.ToString());
@@ -1025,13 +1052,19 @@
btnTemp.Text = temp.ToString();
}
- //btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
- //btnTempUint.X = btnTemp.Right;
+#if __IOS__
+ btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(10);
+#else
+ btnTemp.Width = btnTemp.GetTextWidth() + Application.GetRealWidth(5);
+#endif
+ btnTempUint.X = btnTemp.Right;
if (device.trait_on_off.curValue.ToString() == "on")
{
btnMode.IsSelected = btnSwing.IsSelected = btnWindSpeed.IsSelected = true;
- setTempBar.IsOffline = false;
+ setTempBar.Enable = true;
+ setTempBar.ProgressBarColor = CSS_Color.MainColor;
+
btnSwitch.IsSelected = true;
if (device.GetAttrState(FunctionAttributeKey.Mode) == "fan")
{
@@ -1045,7 +1078,9 @@
else
{
btnMode.IsSelected = btnSwing.IsSelected = btnWindSpeed.IsSelected = false;
- setTempBar.IsOffline = true;
+ setTempBar.Enable = false;
+ setTempBar.ProgressBarColor = CSS_Color.DividingLineColor;
+
btnSwitch.IsSelected = false;
setTempBar.IsClickable = false;
}
--
Gitblit v1.8.0