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

wxr

2024-09-11 a3dfbcd5218270f9a75e6e32807b08215270b657

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

@@ -164,7 +164,7 @@
                                case SPK.HvacAC:
                                case SPK.AcIr:
                                //地热
                                case SPK.HvacFloorHeat:
                                case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                                case SPK.FloorHeatStandard:
                                //新风
                                case SPK.AirFreshStandard:
@@ -1360,7 +1360,7 @@
                                    }
                                    break;
                                case SPK.FloorHeatStandard:
                                case SPK.HvacFloorHeat:
                                case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string set_temp = GetKeyValue("set_temp", dicList);
@@ -2059,7 +2059,7 @@

                    }
                    break;
                case SPK.FloorHeatStandard:
                case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
                case SPK.HvacFloorHeat:
                    {

@@ -2691,7 +2691,7 @@
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                case SPK.AcIr:
                                case SPK.FloorHeatStandard:
                                case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
                                case SPK.HvacFloorHeat:
                                    {
                                        string value = this.GetValue(dicList);