Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google

wxr

2024-09-11 a3dfbcd5218270f9a75e6e32807b08215270b657

 HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs

@@ -492,6 +492,7 @@
                        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 = InpOrOutLogicMethod.Current.GetTemperatureUnit(device);
                        var setTempAttr = device.GetAttribute(FunctionAttributeKey.SetTemp);
                        ///温度点击事件
                        temperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
@@ -508,7 +509,7 @@
                                string set_temp_value = stateStr.Replace(unit, "");
                                //数据封装
                                AddDictionary(keyVlaue, set_temp_value);
                            }, min, max, unit);
                            }, min, max, unit, setTempAttr.step);

                        };
                        ///模式点击事件
@@ -562,7 +563,7 @@
                    }
                    break;
                case SPK.FloorHeatStandard:
                case SPK.HvacFloorHeat:
                case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                    {
                        #region 界面
                        ///开关
@@ -586,6 +587,7 @@
                        DelayView(fLayout, floorHeatingModehView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        var setTempAttr = device.GetAttribute(FunctionAttributeKey.SetTemp);
                        ///开关点击事件
                        floorHeatingSwitchVie.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
@@ -611,7 +613,7 @@
                                //数据封装
                                AddDictionary(keyVlaue, set_temp_value);

                            }, min, max, unit);
                            }, min, max, unit, setTempAttr.step);

                        };
                        ///模式点击事件
@@ -910,7 +912,7 @@
                        case SPK.AcIr:
                        case SPK.AcStandard:
                        case SPK.FloorHeatStandard:
                        case SPK.HvacFloorHeat:
                        case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                            {
                                //做了一个特殊处理；
                                bool _bool = false;