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/DeviceListPage.cs | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index efa787c..114ddb0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -23,7 +23,6 @@
brand = integratedBrand;
}
-
public void LoadPage()
{
Action<string, string> action = (s, a) =>
@@ -33,13 +32,15 @@
page.LoadPage(contentView);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Devices));
+ topView.maginY = 10;
+ topView.LoadTopView_AddIcon("3ty", action);
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
contentView = new VerticalRefreshLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667 - 64-10),
VerticalScrollBarEnabled = false,
};
bodyView.AddChidren(contentView);
@@ -65,7 +66,7 @@
{
var pm = new HttpServerRequest();
var pack = pm.Get3TyBrandBindDeviceList(brand.productPlatform, brand.productBrand);
- if (pack.Code == DAL.Server.StateCode.SUCCESS)
+ if (pack.Code == StateCode.SUCCESS)
{
var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<Function3tyBrandObj>(pack.Data.ToString());
@@ -115,10 +116,6 @@
bool isFrist = true;
foreach (var device in deviceList)
{
- if (!this.CheckSupportDevice(device))
- {
- continue;
- }
var row = new RowLayout()
{
Height = Application.GetRealHeight(50),
@@ -355,10 +352,6 @@
{
if (function == null) return false;
- if (function.spk == SPK.VideoDoorLock)
- {
- return false;
- }
return true;
}
--
Gitblit v1.8.0