Merge branch 'Dev-Branch' into wjc

mac

2023-11-07 efd01cddef2e9d29907592cbed154fba548d7ede

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs

@@ -26,22 +26,24 @@

        public void LoadPage()
        {
           

            new TopViewDiv(bodyView, Language.StringByID(StringId.Bind3thIotAccount)).LoadTopView(CSS_Color.MainBackgroundColor);

            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Bind3thIotAccount));
            topView.maginY = 10;
            topView.LoadTopView(CSS_Color.MainBackgroundColor);

            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;

            bodyView.AddChidren(new Button
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(1),
                BackgroundColor = CSS_Color.DividingLineColor,
            });

            Button btnTipText = new Button()
            {
                Y = Application.GetRealHeight(80),
                Y = Application.GetRealHeight(80+10),
                Width = Application.GetRealWidth(347),
                Height = Application.GetRealHeight(65),
                Gravity = Gravity.CenterHorizontal,
@@ -63,8 +65,8 @@

            contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(150),
                Height = Application.GetRealHeight(573),
                Y = Application.GetRealHeight(150+10),
                Height = Application.GetRealHeight(573-10),
            };
            bodyView.AddChidren(contentView);