From e4ff4b4f64015836f109999b3421e7e6bd39982a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 31 七月 2023 14:19:26 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs | 57 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
index 4d894c0..11bd0d2 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
@@ -22,13 +22,24 @@
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();//.LoadTopView_AddIcon("3ty",action);
+ Action<string,string> action = (str1,str2) => {
- bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+ };
+
+ new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView_Add3tyIot(action);
+
+ bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
+
+ bodyView.AddChidren(new Button
+ {
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(1),
+ BackgroundColor = CSS_Color.DividingLineColor,
+ });
contentView = new VerticalRefreshLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(65),
Height = Application.GetRealHeight(603),
};
bodyView.AddChidren(contentView);
@@ -96,24 +107,29 @@
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(50),
+ Height = Application.GetRealHeight(87),
BackgroundColor = CSS_Color.MainBackgroundColor,
LineColor = 0x00000000,
};
contentView.AddChidren(row);
- if (isFrist)
- {
- isFrist = false;
- }
- else
+ //if (isFrist)
+ //{
+ // isFrist = false;
+ //}
+ //else
{
Button btnLine = new Button()
{
- X = Application.GetRealWidth(56),
- Width = Application.GetRealWidth(303),
+ Y = Application.GetRealHeight(86),
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
Height = 1,
BackgroundColor = CSS_Color.DividingLineColor,
};
@@ -124,9 +140,9 @@
{
X = Application.GetRealWidth(12),
Gravity = Gravity.CenterVertical,
- Width = Application.GetRealWidth(32),
- Height = Application.GetRealWidth(32),
- Radius = (uint)Application.GetRealWidth(4),
+ Width = Application.GetRealWidth(47),
+ Height = Application.GetRealWidth(47),
+ Radius = (uint)Application.GetRealWidth(9),
BackgroundColor = CSS_Color.PromptingColor1
};
row.AddChidren(btnIcon);
@@ -142,23 +158,28 @@
Button btnName = new Button()
{
- X = Application.GetRealWidth(56),
- Width = Application.GetRealWidth(303),
+ X = Application.GetRealWidth(83),
+ Width = Application.GetRealWidth(310),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
+ TextSize = CSS_FontSize.SubheadingFontSize,
Text = brand.brandName,
};
row.AddChidren(btnName);
//涓嬭浇绗笁鏂瑰搧鐗宨con
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;
}
}
--
Gitblit v1.8.0