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 | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
index f4f0ede..1dfa8c2 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,11 +109,13 @@
bool isFrist = true;
foreach (var brand in brandList)
{
- if(brand.productPlatform == "HaiLin")//瀛愭櫞闇�瑕侀殣钘忚繖涓叆鍙ｏ紝鐢辫皟璇曡蒋浠朵笂浼犳暟鎹� 2023-03-09 17:20:33
+ 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" &&
+ }
+ 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;
@@ -125,22 +129,16 @@
};
contentView.AddChidren(row);
- //if (isFrist)
- //{
- // isFrist = false;
- //}
- //else
+
+ Button btnLine = new Button()
{
- Button btnLine = new Button()
- {
- Y = Application.GetRealHeight(86),
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- 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()
{
@@ -175,8 +173,8 @@
//涓嬭浇绗笁鏂瑰搧鐗宨con
ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
-
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
var page = new DeviceListPage(brand);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
--
Gitblit v1.8.0