Merge branch 'Dev-Branch' into wjc

wjc

2023-03-30 cae4d4b5b508a666fbd0dff3c2a981fdff841bc8

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

@@ -107,6 +107,10 @@
            bool isFrist = true;
            foreach (var brand in brandList)
            {
                if(brand.productPlatform == "HaiLin")//子晴需要隐藏这个入口，由调试软件上传数据 2023-03-09 17:20:33
                {
                    continue;
                }
                var row = new RowLayout()
                {
                    Height = Application.GetRealHeight(87),
@@ -165,13 +169,17 @@
                //下载第三方品牌icon
                ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);

                btnName.MouseUpEventHandler = (sender, e) => {
                EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
                    
                    var page = new DeviceListPage(brand);
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };
                btnName.MouseUpEventHandler = eventHandler;
                btnIcon.MouseUpEventHandler = eventHandler;
                btnRight.MouseUpEventHandler = eventHandler;
                row.MouseUpEventHandler = eventHandler;
            }

        }