From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
index 55b8dc9..f54199f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
@@ -26,21 +26,23 @@
};
- new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView_Add3tyIot(action);
+ 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),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(1),
BackgroundColor = CSS_Color.DividingLineColor,
});
contentView = new VerticalRefreshLayout()
{
- Y = Application.GetRealHeight(65),
- Height = Application.GetRealHeight(603),
+ Y = Application.GetRealHeight(65+10),
+ Height = Application.GetRealHeight(603-10),
};
bodyView.AddChidren(contentView);
@@ -107,6 +109,16 @@
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(87),
@@ -155,7 +167,7 @@
Button btnName = new Button()
{
X = Application.GetRealWidth(83),
- Width = Application.GetRealWidth(210),
+ Width = Application.GetRealWidth(310),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -165,13 +177,17 @@
//涓嬭浇绗笁鏂瑰搧鐗宨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