From 9c4967cd8843ac7ed65ee64195bcf69c592c4a20 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 07 六月 2023 15:57:36 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' into Dev-Wxr-1.8.1 --- HDL_ON/Entity/Function/Scene.cs | 11 +- HDL_ON/Entity/Function/Function.cs | 33 ++++++ HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs | 10 +- HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 8 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 8 + HDL_ON/UI/UI1-Login/LoginPage.cs | 210 +++++++++++++++++++++--------------------- HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 15 ++- 7 files changed, 169 insertions(+), 126 deletions(-) diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index 66dce5d..8db999e 100644 --- a/HDL_ON/Entity/Function/Function.cs +++ b/HDL_ON/Entity/Function/Function.cs @@ -780,6 +780,31 @@ } } + string us = ""; + switch (attr.key) + { + case FunctionAttributeKey.SetTemp: + case FunctionAttributeKey.RoomTemp: + us = "掳C"; + var tempType = attributes.Find((obj) => obj.key == FunctionAttributeKey.TempType); + if (tempType != null) + { + us = tempType.curValue.ToString(); + } + break; + case FunctionAttributeKey.Percent: + case FunctionAttributeKey.Brightness: + us = "%"; + break; + case FunctionAttributeKey.CCT: + us = "K"; + break; + case FunctionAttributeKey.Angle: + us = "掳"; + break; + } + + switch (attr.key) { case FunctionAttributeKey.OnOff: @@ -834,11 +859,15 @@ { vv = 26; } - sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString(), max = attr.max, min = attr.min }); + sFunc.status.Add(new SceneFunctionStatus() { + UintString = us, + key = attr.key, value = Convert.ToInt32(vv).ToString(), max = attr.max, min = attr.min }) ; } else { - sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString(), max = attr.max, min = attr.min }); + sFunc.status.Add(new SceneFunctionStatus() { + UintString = us, + key = attr.key, value = attr.curValue.ToString(), max = attr.max, min = attr.min }); } break; diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs index 492def1..48fa113 100644 --- a/HDL_ON/Entity/Function/Scene.cs +++ b/HDL_ON/Entity/Function/Scene.cs @@ -699,18 +699,19 @@ return text; } + public string UintString = ""; /// <summary> /// 灞炴�у�煎崟浣� /// </summary> - public string GetUintString(string inputKey = "") + public string GetUintString() { + if (!string.IsNullOrEmpty(UintString)) + { + return UintString; + } var us = ""; var swithchString = key; - if (!string.IsNullOrEmpty(inputKey)) - { - swithchString = inputKey; - } switch (swithchString) { case FunctionAttributeKey.SetTemp: diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs index c5bdf9f..0eda5db 100644 --- a/HDL_ON/UI/UI1-Login/LoginPage.cs +++ b/HDL_ON/UI/UI1-Login/LoginPage.cs @@ -900,7 +900,7 @@ new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, curValue="day",state = "day" }, new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 35,min = 5 }, new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26" }, - new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳F", state = "掳F" }, + new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳C", state = "掳C" }, }, }; fh.SaveFunctionFile(); @@ -942,110 +942,110 @@ }; FunctionList.List.Functions.Add(lightRgbw1); - FunctionList.List.Functions.Add(new Function - { - name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶", - spk = SPK.AcstParent, - collect = true, - attributes = new List<FunctionAttributes>() - { - new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, - new FunctionAttributes(){ key = AcstParent_AttrEnum.mode.ToString(),curValue = AcstParent_Attr_ModeValueEnum.cool.ToString(),state = AcstParent_Attr_ModeValueEnum.cool.ToString(), - value = new List<string> - { - AcstParent_Attr_ModeValueEnum.cool.ToString(), - AcstParent_Attr_ModeValueEnum.dry.ToString(), - AcstParent_Attr_ModeValueEnum.fan.ToString(), - AcstParent_Attr_ModeValueEnum.heat.ToString(), - AcstParent_Attr_ModeValueEnum.humidity.ToString(), - AcstParent_Attr_ModeValueEnum.heat_humidity.ToString(), - } - }, - new FunctionAttributes(){ key = AcstParent_AttrEnum.scene.ToString(), curValue = AcstParent_Attr_SceneValueEnum.at_home.ToString(), state = AcstParent_Attr_SceneValueEnum.at_home.ToString(), - value = new List<string>() - { - AcstParent_Attr_SceneValueEnum.at_home.ToString(), - AcstParent_Attr_SceneValueEnum.leave_home.ToString(), - AcstParent_Attr_SceneValueEnum.sleep.ToString(), - } - }, - new FunctionAttributes(){ key = AcstParent_AttrEnum.day_electricity.ToString(),curValue = "99",state = "99"}, - new FunctionAttributes(){ key = AcstParent_AttrEnum.month_electricity.ToString(),curValue = "999",state = "999"}, - new FunctionAttributes(){ key = AcstParent_AttrEnum.total_electricity.ToString(),curValue = "9999",state = "9999"}, - new FunctionAttributes(){ key = AcstParent_AttrEnum.active_power.ToString(),curValue = "9999",state = "9999"}, - //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, - //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, - //new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"}, - //new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"}, - //new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"}, - } - }); + //FunctionList.List.Functions.Add(new Function + //{ + // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶", + // spk = SPK.AcstParent, + // collect = true, + // attributes = new List<FunctionAttributes>() + //{ + // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, + // new FunctionAttributes(){ key = AcstParent_AttrEnum.mode.ToString(),curValue = AcstParent_Attr_ModeValueEnum.cool.ToString(),state = AcstParent_Attr_ModeValueEnum.cool.ToString(), + // value = new List<string> + // { + // AcstParent_Attr_ModeValueEnum.cool.ToString(), + // AcstParent_Attr_ModeValueEnum.dry.ToString(), + // AcstParent_Attr_ModeValueEnum.fan.ToString(), + // AcstParent_Attr_ModeValueEnum.heat.ToString(), + // AcstParent_Attr_ModeValueEnum.humidity.ToString(), + // AcstParent_Attr_ModeValueEnum.heat_humidity.ToString(), + // } + // }, + // new FunctionAttributes(){ key = AcstParent_AttrEnum.scene.ToString(), curValue = AcstParent_Attr_SceneValueEnum.at_home.ToString(), state = AcstParent_Attr_SceneValueEnum.at_home.ToString(), + // value = new List<string>() + // { + // AcstParent_Attr_SceneValueEnum.at_home.ToString(), + // AcstParent_Attr_SceneValueEnum.leave_home.ToString(), + // AcstParent_Attr_SceneValueEnum.sleep.ToString(), + // } + // }, + // new FunctionAttributes(){ key = AcstParent_AttrEnum.day_electricity.ToString(),curValue = "99",state = "99"}, + // new FunctionAttributes(){ key = AcstParent_AttrEnum.month_electricity.ToString(),curValue = "999",state = "999"}, + // new FunctionAttributes(){ key = AcstParent_AttrEnum.total_electricity.ToString(),curValue = "9999",state = "9999"}, + // new FunctionAttributes(){ key = AcstParent_AttrEnum.active_power.ToString(),curValue = "9999",state = "9999"}, + // //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, + // //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, + // //new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"}, + // //new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"}, + // //new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"}, + //} + //}); - FunctionList.List.Functions.Add(new Function - { - name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1", - spk = SPK.AcstSub, - sid = "0000001", - attributes = new List<FunctionAttributes>() - { - new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, - new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"}, - new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, - new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, - } - }); - FunctionList.List.Functions.Add(new Function - { - name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2", - spk = SPK.AcstSub, - sid = "0000002", - attributes = new List<FunctionAttributes>() - { - new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, - new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"}, - new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, - new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, - } - }); - FunctionList.List.Functions.Add(new Function - { - name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3", - spk = SPK.AcstSub, - sid = "0000003", - attributes = new List<FunctionAttributes>() - { - new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, - new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"}, - new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, - new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, - } - }); - FunctionList.List.Functions.Add(new Function - { - name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4", - spk = SPK.AcstSub, - sid = "0000004", - attributes = new List<FunctionAttributes>() - { - new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, - new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"}, - new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, - new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, - } - }); - FunctionList.List.Functions.Add(new Function - { - name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5", - spk = SPK.AcstSub, - sid = "0000005", - attributes = new List<FunctionAttributes>() - { - new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, - new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"}, - new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, - new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, - } - }); + //FunctionList.List.Functions.Add(new Function + //{ + // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1", + // spk = SPK.AcstSub, + // sid = "0000001", + // attributes = new List<FunctionAttributes>() + //{ + // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"}, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, + //} + //}); + //FunctionList.List.Functions.Add(new Function + //{ + // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2", + // spk = SPK.AcstSub, + // sid = "0000002", + // attributes = new List<FunctionAttributes>() + //{ + // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"}, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, + //} + //}); + //FunctionList.List.Functions.Add(new Function + //{ + // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3", + // spk = SPK.AcstSub, + // sid = "0000003", + // attributes = new List<FunctionAttributes>() + //{ + // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"}, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, + //} + //}); + //FunctionList.List.Functions.Add(new Function + //{ + // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4", + // spk = SPK.AcstSub, + // sid = "0000004", + // attributes = new List<FunctionAttributes>() + //{ + // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"}, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, + //} + //}); + //FunctionList.List.Functions.Add(new Function + //{ + // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5", + // spk = SPK.AcstSub, + // sid = "0000005", + // attributes = new List<FunctionAttributes>() + //{ + // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" }, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"}, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"}, + // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"}, + //} + //}); @@ -1624,7 +1624,7 @@ new FunctionAttributes() { key = "set_temp",step = "0.5", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 }, new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" }, new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" }, - new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳F", state = "掳F" }, + new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳C", state = "掳C" }, } }; ac2.SaveFunctionFile(); diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs index 014f3bb..430bd42 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs @@ -1170,8 +1170,8 @@ if (set_temp != "") { - - stateStr += set_temp + "鈩�,"; + string unit = device.GetAttribute("temperature_type") == null ? "掳" : device.GetAttribute("temperature_type").state; + stateStr += set_temp + unit+","; } if (mode != "") @@ -1268,8 +1268,8 @@ } if (set_temp != "") { - - stateStr += set_temp + "鈩�,"; + string unit = device.GetAttribute("temperature_type") == null ? "掳" : device.GetAttribute("temperature_type").state; + stateStr += set_temp + unit + ","; } if (mode != "") { diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs index 5dad653..f8b7a85 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TemperatureView.cs @@ -11,7 +11,7 @@ /// <param name="frameLayout">寮圭獥鐖舵帶浠�</param> /// <param name="stateValue">涔嬪墠鐘舵�佸��</param> /// <param name="action">杩斿洖缁撴灉</param> - public void FLayoutView(FrameLayout frameLayout, string stateValue, Action<string> action) + public void FLayoutView(FrameLayout frameLayout, string stateValue, Action<string> action,int min,int max,string unit) { FrameLayout frame = new FrameLayout { @@ -28,18 +28,18 @@ }; //鍒濆鍖栧垪琛� var temperatureList = new List<string>(); - for (int i = 16; i < 32; i++) + for (int i = min; i < max; i++) { //娣诲姞鏁版嵁 - temperatureList.Add(i.ToString() + "鈩�"); - temperatureList.Add((i + 0.5).ToString() + "鈩�"); + temperatureList.Add(i.ToString() + unit); + temperatureList.Add((i + 0.5).ToString() + unit); } //鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩) view.mUIPickerView.setNPicker(temperatureList, null, null); //榛樿鍒濆閫変腑鐘舵�� view.mUIPickerView.setCurrentItems(9, 0, 0); //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏃堕棿 - string temperature = "25鈩�"; + string temperature = "25"+ unit; for (int i = 0; i < temperatureList.Count; i++) { if (temperatureList[i] == stateValue) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs index b1c6ab8..2104754 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs @@ -331,6 +331,9 @@ { SwitchViewMethod(device, acSwitchVie.btnState, 2); }; + int min = device.GetAttribute("set_temp") == null ? 16 : device.GetAttribute("set_temp").min; + int max = device.GetAttribute("set_temp") == null ? 32 : device.GetAttribute("set_temp").max; + string unit = device.GetAttribute("temperature_type") == null ? "掳" : device.GetAttribute("temperature_type").state; ///娓╁害鐐瑰嚮浜嬩欢 temperatureView.btnClick.MouseUpEventHandler += (sender, e) => { @@ -344,11 +347,10 @@ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�; string keyVlaue = "set_temp"; selectedState = device.spk + "_" + keyVlaue; - string set_temp_value = stateStr.Replace("鈩�", ""); + string set_temp_value = stateStr.Replace(unit, ""); //鏁版嵁灏佽 AddDictionary(keyVlaue, set_temp_value); - }); - + }, min,max, unit); }; ///妯″紡鐐瑰嚮浜嬩欢 @@ -435,6 +437,9 @@ ///娓╁害鐐瑰嚮浜嬩欢 temperatureView.btnClick.MouseUpEventHandler += (sender, e) => { + int min = device.GetAttribute("set_temp") == null ? 16 : device.GetAttribute("set_temp").min; + int max = device.GetAttribute("set_temp") == null ? 32 : device.GetAttribute("set_temp").max; + string unit = device.GetAttribute("temperature_type") == null ? "掳" : device.GetAttribute("temperature_type").state; string tempValue = temperatureView.btnState.Text; LogicView.TemperatureView tempView = new LogicView.TemperatureView(); tempView.FLayoutView(this, tempValue, (stateStr) => @@ -444,11 +449,11 @@ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�; string keyVlaue = "set_temp"; selectedState = device.spk + "_" + keyVlaue; - string set_temp_value = stateStr.Replace("鈩�", ""); + string set_temp_value = stateStr.Replace(unit, ""); //鏁版嵁灏佽 AddDictionary(keyVlaue, set_temp_value); - }); + }, min, max, unit); }; ///妯″紡鐐瑰嚮浜嬩欢 diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs index a7a9b3e..9543bc9 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs @@ -202,6 +202,14 @@ { function.SetAttrState(FunctionAttributeKey.SetTemp, e); btnTemp.Text = Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", ".")).ToString(); + if (btnTemp.Text.Length > 2) + { + btnTemp.TextSize = 44; + } + else + { + btnTemp.TextSize = 56; + } }; } /// <summary> -- Gitblit v1.8.0