Merge branch 'WJC' into wxr6

wxr

2021-11-05 f6c4e9886b924d8f5271e8b58378d7a07269dcb8

 HDL_ON/UI/MainPage.cs

@@ -25,7 +25,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "1.2.1013";
        public static string VersionString = "1.3.1104";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>
@@ -109,6 +109,7 @@
            SPK.FloorHeatStandard,SPK.HvacFloorHeat,
            SPK.AirFreshStandard,SPK.HvacAirFresh,
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,
        };


@@ -133,8 +134,6 @@
                return _RoomNotSupportFunctionList;
            }
        }



        public static void Show()
        {
@@ -382,6 +381,7 @@
                    });
                }
            }).Start();

        }

        /// <summary>