From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index 5df9ec0..1b55639 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -104,7 +104,7 @@
var temp = (int)Convert.ToDouble(setTempTemp);
if (temp <= 0)
{
- //榛樿鍊兼敼鎴�16,2022骞�06鏈�10鏃�10:03:19 鎴愮敨瑕佹眰鐨�
+ //榛樿鍊兼敼鎴�16
temp = 16;
device.SetAttrState(FunctionAttributeKey.SetTemp, temp.ToString());
}
@@ -156,7 +156,7 @@
TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
IsBold = true,
TextAlignment = TextAlignment.CenterLeft,
- Text = "掳C",
+ Text = acFunction.GetTempUnitString(device),
};
FrameWhiteCentet1.AddChidren(btnTempUint);
@@ -166,7 +166,7 @@
Y = btnTemp.Bottom,
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(30),
- Text = Language.StringByID(StringId.Indoor) + " 20掳C",
+ Text = Language.StringByID(StringId.Indoor) + " 20" + acFunction.GetTempUnitString(device),
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.TopCenter,
@@ -305,15 +305,18 @@
};
setTempBar.OnStopTrackingTouchEvent = (sender, e) => {
temp = e;
+ Dictionary<string, string> d = new Dictionary<string, string>();
device.SetAttrState(FunctionAttributeKey.SetTemp, e.ToString());
if (setTempAttr.step == "0.5")
{
- e = e / 2;
- btnTemp.Text = (setTempAttr.min + ((double)e)).ToString("0.0");
+ double ex = (double)e / 2;
+ btnTemp.Text = (setTempAttr.min + ((double)ex)).ToString("0.0");
+ d.Add(FunctionAttributeKey.SetTemp, (setTempAttr.min + ex).ToString());
}
else
{
btnTemp.Text = (setTempAttr.min + e).ToString();
+ d.Add(FunctionAttributeKey.SetTemp, (setTempAttr.min + e).ToString());
}
#if __IOS__
@@ -323,8 +326,6 @@
#endif
btnTempUint.X = btnTemp.Right;
controlTime = DateTime.Now;
- Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add(FunctionAttributeKey.SetTemp, (setTempAttr.min + e).ToString());
Control.Ins.SendWriteCommand(device, d);
};
@@ -1034,7 +1035,9 @@
{
//device = FunctionList.List.Functions.Find((obj) => obj.sid == device.sid);
- btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " " + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "掳C";
+ btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " "
+ + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", ".")))
+ + acFunction.GetTempUnitString(device);
btnMode.SelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
btnSwing.SelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing));
btnWindSpeed.SelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed));
--
Gitblit v1.8.0