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/AddDevciePage.cs | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index 14acce9..bd57a2c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -55,13 +55,15 @@
public void LoadPage(VerticalRefreshLayout refreshView)
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice));
+ topView.maginY = 10;
+ topView.LoadTopView();
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);
@@ -178,8 +180,6 @@
Text = device.ProductShowName,
};
row.AddChidren(btnName);
-
-
btnName.MouseUpEventHandler = (sender, e) =>
{
@@ -403,12 +403,6 @@
};
break;
case SPK.Peephole:
- case SPK.VideoDoorLock:
- case SPK.Ev_Ipcam:
- {
- //璺宠浆鍒癮ndroid,ios閭ｈ竟鍘�
- HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(device.spk);
- }
break;
}
};
--
Gitblit v1.8.0