From e1ac4ab0e68024e6289e0b11756962d662749b04 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:15:23 +0800
Subject: [PATCH] Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC"
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
index f73971c..c66cb3f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
@@ -10,11 +10,10 @@
{
FrameLayout bodyView;
VerticalRefreshLayout contentView;
- List<IntegratedBrand> brandList;
- public AddThirdPartyBrandListpage(List<IntegratedBrand> list)
+ List<IntegratedBrand> brandList = new List<IntegratedBrand>();
+ public AddThirdPartyBrandListpage()
{
bodyView = this;
- brandList = list;
}
public void LoadPage()
@@ -27,7 +26,6 @@
{
Y = Application.GetRealHeight(64),
Height = Application.GetRealHeight(667 - 64),
- VerticalScrollBarEnabled = false,
};
bodyView.AddChidren(contentView);
@@ -62,6 +60,7 @@
Button btnLine = new Button()
{
X = Application.GetRealWidth(56),
+ Y = Application.GetRealHeight(49),
Width = Application.GetRealWidth(303),
Height = 1,
BackgroundColor = CSS_Color.DividingLineColor,
@@ -102,13 +101,6 @@
row.AddChidren(btnName);
//涓嬭浇绗笁鏂瑰搧鐗宨con
ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);
-
- btnName.MouseUpEventHandler = (sender, e) => {
- var page = new AddDevciePage(brand);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
}
}
@@ -140,14 +132,6 @@
Application.RunOnMainThread(() => { waitPage.Hide(); });
}
}) { IsBackground = true }.Start();
- }
- /// <summary>
- /// 璺宠浆娣诲姞璁惧鐣岄潰
- /// </summary>
- /// <param name="bandType">鍝佺墝绫诲瀷</param>
- void SkipPage_AddDevice()
- {
-
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0