From 3c39a9236955baeec02d9ea4d97b38282d0ea888 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 五月 2023 16:56:10 +0800
Subject: [PATCH] 温度类型

---
 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index c55d69b..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,
@@ -1035,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