From dbc23459fdf4e8b74a5f955fbb9fc631b4babc70 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 17 三月 2021 11:56:16 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into WJC

---
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs |   58 +++++++++++++++++++++++++---------------------------------
 1 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
index ae8c28d..b8f0a39 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
@@ -21,13 +21,7 @@
 
         public void LoadPage()
         {
-            Action<string,string> action = (s,a) => {
-                var page = new AddThirdPartyBrandListpage(brandList);
-                MainPage.BasePageView.AddChidren(page);
-                page.LoadPage();
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-            };
-            new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView_AddIcon("3ty",action);
+            new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();//.LoadTopView_AddIcon("3ty",action);
 
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
 
@@ -193,32 +187,30 @@
             };
             contentView.AddChidren(btnTipText1);
 
-            var btnAdd = new Button()
-            {
-                Y = Application.GetRealHeight(500),
-                Gravity = Gravity.CenterHorizontal,
-                Width = Application.GetRealWidth(220),
-                Height = Application.GetRealWidth(44),
-                BackgroundColor = CSS_Color.MainColor,
-                TextAlignment = TextAlignment.Center,
-                TextColor = CSS_Color.MainBackgroundColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                IsBold = true,
-                Radius = (uint)Application.GetRealWidth(22),
-                BorderColor = 0x00000000,
-                BorderWidth = 0,
-                TextID = StringId.Add,
-            };
-            contentView.AddChidren(btnAdd);
-
-
-            btnAdd.MouseUpEventHandler = (sender, e) => {
-                var page = new AddThirdPartyBrandListpage(brandList);
-                MainPage.BasePageView.AddChidren(page);
-                page.LoadPage();
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                this.RemoveFromParent();
-            };
+            //var btnAdd = new Button()
+            //{
+            //    Y = Application.GetRealHeight(500),
+            //    Gravity = Gravity.CenterHorizontal,
+            //    Width = Application.GetRealWidth(220),
+            //    Height = Application.GetRealWidth(44),
+            //    BackgroundColor = CSS_Color.MainColor,
+            //    TextAlignment = TextAlignment.Center,
+            //    TextColor = CSS_Color.MainBackgroundColor,
+            //    TextSize = CSS_FontSize.SubheadingFontSize,
+            //    IsBold = true,
+            //    Radius = (uint)Application.GetRealWidth(22),
+            //    BorderColor = 0x00000000,
+            //    BorderWidth = 0,
+            //    TextID = StringId.Add,
+            //};
+            //contentView.AddChidren(btnAdd);
+            //btnAdd.MouseUpEventHandler = (sender, e) => {
+            //    var page = new AddThirdPartyBrandListpage(brandList);
+            //    MainPage.BasePageView.AddChidren(page);
+            //    page.LoadPage();
+            //    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+            //    this.RemoveFromParent();
+            //};
 
 
 

--
Gitblit v1.8.0