From 2d6787d9dedca3553ccd9ae5eb1bc7e52d2608e2 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 16 三月 2021 16:44:33 +0800
Subject: [PATCH] 3.
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
index 8adce32..ae8c28d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
@@ -9,34 +9,36 @@
{
FrameLayout bodyView;
- FrameLayout contentView;
+ VerticalScrolViewLayout contentView;
+
+ List<IntegratedBrand> brandList;
public BrandListPage()
{
bodyView = this;
+ brandList = new List<IntegratedBrand>();
}
public void LoadPage()
{
Action<string,string> action = (s,a) => {
- var page = new AddThirdPartyBrandListpage();
+ var page = new AddThirdPartyBrandListpage(brandList);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- this.RemoveFromParent();
};
new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView_AddIcon("3ty",action);
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- contentView = new FrameLayout()
+ contentView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
Height = Application.GetRealHeight(603),
};
bodyView.AddChidren(contentView);
-
+ GetBindList();
}
/// <summary>
@@ -53,12 +55,12 @@
var pack = pm.Get3tyBrandList();
if (pack.Code == DAL.Server.StateCode.SUCCESS)
{
- var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrand>>(pack.Data.ToString());
- if (revData.Count > 0)
+ brandList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrand>>(pack.Data.ToString());
+ if (brandList.Count > 0)
{
Application.RunOnMainThread(() =>
{
- LoadRow(revData);
+ LoadRow();
});
}else
{
@@ -83,16 +85,17 @@
}
- void LoadRow(List<IntegratedBrand> brandList)
+ void LoadRow()
{
contentView.RemoveAll();
bool isFrist = true;
foreach (var brand in brandList)
{
- FrameLayout row = new FrameLayout()
+ var row = new RowLayout()
{
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
+ LineColor = 0x00000000,
};
contentView.AddChidren(row);
@@ -105,7 +108,6 @@
Button btnLine = new Button()
{
X = Application.GetRealWidth(56),
- Y = Application.GetRealHeight(49),
Width = Application.GetRealWidth(303),
Height = 1,
BackgroundColor = CSS_Color.DividingLineColor,
@@ -121,7 +123,6 @@
Height = Application.GetRealWidth(32),
Radius = (uint)Application.GetRealWidth(4),
BackgroundColor = CSS_Color.PromptingColor1
- //ImagePath = "tuya_logo.png"
};
row.AddChidren(btnIcon);
Button btnRight = new Button()
@@ -146,10 +147,16 @@
row.AddChidren(btnName);
//涓嬭浇绗笁鏂瑰搧鐗宨con
ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);
+
+ btnName.MouseUpEventHandler = (sender, e) => {
+ var page = new DeviceListPage(brand);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
}
}
-
void NotListTipView()
{
@@ -206,7 +213,7 @@
btnAdd.MouseUpEventHandler = (sender, e) => {
- var page = new AddThirdPartyBrandListpage();
+ var page = new AddThirdPartyBrandListpage(brandList);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0