From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs | 77 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 26 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..1dfa8c2 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
@@ -22,14 +22,27 @@
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;
+ };
+
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand));
+ topView.maginY = 10;
+ topView.LoadTopView_Add3tyIot(action);
+
+ bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
+
+ bodyView.AddChidren(new Button
+ {
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(1),
+ BackgroundColor = CSS_Color.DividingLineColor,
+ });
contentView = new VerticalRefreshLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(603),
+ Y = Application.GetRealHeight(65+10),
+ Height = Application.GetRealHeight(603-10),
};
bodyView.AddChidren(contentView);
@@ -96,37 +109,44 @@
bool isFrist = true;
foreach (var brand in brandList)
{
+ if (brand.productPlatform == "HaiLin")//瀛愭櫞闇�瑕侀殣钘忚繖涓叆鍙ｏ紝鐢辫皟璇曡蒋浠朵笂浼犳暟鎹� 2023-03-09 17:20:33
+ {
+ continue;
+ }
+ else if (brand.productPlatform == "TUYA")
+ {
+ if (DB_ResidenceData.Instance.CurrentRegion.regionUrl != "https://test-gz.hdlcontrol.com" &&
+ DB_ResidenceData.Instance.CurrentRegion.regionUrl != "https://china-gateway.hdlcontrol.com")
+ {
+ continue;
+ }
+ }
var row = new RowLayout()
{
- Height = Application.GetRealHeight(50),
+ Height = Application.GetRealHeight(87),
BackgroundColor = CSS_Color.MainBackgroundColor,
LineColor = 0x00000000,
};
contentView.AddChidren(row);
- if (isFrist)
+
+ Button btnLine = new Button()
{
- isFrist = false;
- }
- else
- {
- Button btnLine = new Button()
- {
- X = Application.GetRealWidth(56),
- Width = Application.GetRealWidth(303),
- Height = 1,
- BackgroundColor = CSS_Color.DividingLineColor,
- };
- row.AddChidren(btnLine);
- }
+ Y = Application.GetRealHeight(86),
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = 1,
+ BackgroundColor = CSS_Color.DividingLineColor,
+ };
+ row.AddChidren(btnLine);
ImageView btnIcon = new ImageView()
{
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 +162,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