Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

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

@@ -161,7 +161,7 @@
                                case SPK.CurtainTrietex:
                                //空调
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                case SPK.HvacAC:case SPK.HvacAcPanel:
                                case SPK.AcIr:
                                //地热
                                case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
@@ -1259,7 +1259,7 @@
                                    }
                                    break;
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                case SPK.HvacAC:case SPK.HvacAcPanel:
                                case SPK.AcIr:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
@@ -1946,7 +1946,7 @@

                    }
                    break;
                case SPK.AcStandard:
                case SPK.AcStandard:case SPK.HvacAcPanel:
                case SPK.HvacAC:
                case SPK.AcIr:
                    {
@@ -2688,7 +2688,7 @@
                                        }
                                    }
                                    break;
                                case SPK.AcStandard:
                                case SPK.AcStandard:case SPK.HvacAcPanel:
                                case SPK.HvacAC:
                                case SPK.AcIr:
                                case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel: