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

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

 HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs

@@ -119,7 +119,7 @@
            var tempValuesView = new FrameLayout()
            {
                X = Application.GetRealWidth(21),
                Y = Application.GetRealWidth(17),
                Y = Application.GetRealWidth(22),
                Width = Application.GetRealWidth(130),
                Height = Application.GetRealWidth(132),
            };
@@ -159,7 +159,7 @@
            var humiValuesView = new FrameLayout()
            {
                X = Application.GetRealWidth(130+21),
                Y = Application.GetRealWidth(17),
                Y = Application.GetRealWidth(22),
                Width = Application.GetRealWidth(130),
                Height = Application.GetRealWidth(132),
            };
@@ -174,7 +174,12 @@
                Text = function.GetAttrState(AcstSub_AttrEnum.room_humidity.ToString(),"---"),
                TextAlignment = TextAlignment.TopRight,
            };

#if __IOS__
            btnHumiValues.Width = btnTempValues.GetTextWidth() + Application.GetRealWidth(10);
#else
            btnHumiValues.Width = btnTempValues.GetTextWidth();
#endif
            btnHumiValues.Gravity = Gravity.CenterHorizontal;
            humiValuesView.AddChidren(btnHumiValues);
            var btnHumiValuesUint = new Button()
@@ -226,6 +231,8 @@
            contentView.AddChidren(btnSetTempValues);
#if __IOS__
            bodyView.btnSetTempValues.Width = bodyView.btnSetTempValues.GetTextWidth() + Application.GetRealWidth(10);
#else
            bodyView.btnSetTempValues.Width = bodyView.btnSetTempValues.GetTextWidth() + Application.GetRealWidth(5);
#endif