From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs | 98 +++++++++++++++++++++++++++----------------------
1 files changed, 54 insertions(+), 44 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..4d894c0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -9,34 +10,36 @@
{
FrameLayout bodyView;
- FrameLayout contentView;
+ VerticalRefreshLayout 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();
- 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);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();//.LoadTopView_AddIcon("3ty",action);
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- contentView = new FrameLayout()
+ contentView = new VerticalRefreshLayout()
{
Y = Application.GetRealHeight(64),
Height = Application.GetRealHeight(603),
};
bodyView.AddChidren(contentView);
+ GetBindList();
+ contentView.BeginHeaderRefreshingAction = () =>
+ {
+ contentView.EndHeaderRefreshing();
+ GetBindList();
+ };
}
/// <summary>
@@ -53,12 +56,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
{
@@ -68,6 +71,10 @@
});
}
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
}
}
catch (Exception ex)
@@ -83,16 +90,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 +113,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 +128,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 +152,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()
{
@@ -186,32 +198,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();
- 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