Merge branch 'wjc' into dev--wxr

wxr

2022-12-01 132dc0402e0c5e22a7d54cdddc1700a1842304bd

 HDL_ON/UI/UI0-Public/TopViewDiv.cs

@@ -170,10 +170,10 @@
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337-37),
                Y = Application.GetRealHeight(10),
                Y = Application.GetRealHeight(20),
                Width = Application.GetMinRealAverage(28+37),
                Height = Application.GetMinRealAverage(28+19),
                Text = "组合调光",
                TextID = StringId.CombinedDimming,
                TextSize = CSS_FontSize.TextFontSize,
                TextColor = CSS_Color.MainColor,
                IsMoreLines = true