From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index 6708c7d..2bcf880 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -3,6 +3,7 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
#if __Android__
using Java.Interop;
using Android.Content;
@@ -11,7 +12,7 @@
using Shared;
namespace HDL_ON.UI
{
- public class DeviceListPage : FrameLayout
+ public class DeviceListPage : FrameLayout
{
FrameLayout bodyView;
VerticalRefreshLayout contentView;
@@ -33,13 +34,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);
@@ -59,7 +62,8 @@
{
var waitPage = new Loading();
waitPage.Start();
- new System.Threading.Thread(() => {
+ new System.Threading.Thread(() =>
+ {
try
{
var pm = new HttpServerRequest();
@@ -77,7 +81,7 @@
}
else
{
- var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices),160)
+ var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices), 160)
{
Gravity = Gravity.CenterHorizontal,
};
@@ -96,7 +100,8 @@
}
finally
{
- Application.RunOnMainThread(() => {
+ Application.RunOnMainThread(() =>
+ {
if (waitPage != null)
{
waitPage.RemoveFromParent();
@@ -113,6 +118,10 @@
bool isFrist = true;
foreach (var device in deviceList)
{
+ //if (!this.CheckSupportDevice(device))
+ //{
+ // continue;
+ //}
var row = new RowLayout()
{
Height = Application.GetRealHeight(50),
@@ -168,7 +177,8 @@
};
row.AddChidren(btnName);
- btnName.MouseUpEventHandler = (sender, e) => {
+ btnName.MouseUpEventHandler = (sender, e) =>
+ {
switch (device.spk)
{
case SPK.IrModule:
@@ -187,7 +197,8 @@
contentView.BeginHeaderRefreshing();
};
break;
- case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
+ case SPK.SensorEnvironment:
+ case SPK.SensorEnvironmentHailin:
case SPK.SensorEnvironment2:
case SPK.SensorEnvironment3:
var smPage1 = new SensorEnvironmentManagerPage();
@@ -196,6 +207,21 @@
{
contentView.BeginHeaderRefreshing();
};
+ break;
+ case SPK.VideoDoorLock:
+ {
+ CommonMethod.Current.MainThread(() =>
+ {
+ //钀ょ煶瑙嗛闂ㄩ攣
+ var form = new VideoDoorLockPage(device, btnName, new Button(), CommonMethod.Comerom.sanfan, () =>
+ {
+ row.RemoveFromParent();
+ });
+ MainPage.BasePageView.AddChidren(form);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ form.Show();
+ });
+ }
break;
}
};
@@ -267,7 +293,8 @@
Width = Application.GetRealWidth(150),
};
row.AddChidren(btnEdit);
- btnEdit.MouseUpEventHandler = (sender, e) =>{
+ btnEdit.MouseUpEventHandler = (sender, e) =>
+ {
Action<string> callBack = (str) =>
{
if (string.IsNullOrEmpty(str))
@@ -337,6 +364,23 @@
}
+ /// <summary>
+ /// 妫�鏌ユ槸鍚︽敮鎸�
+ /// </summary>
+ /// <param name="function"></param>
+ /// <returns></returns>
+ bool CheckSupportDevice(Function function)
+ {
+
+ if (function == null) return false;
+ if (function.spk == SPK.VideoDoorLock)
+ {
+ return false;
+ }
+ return true;
+
+ }
+
}
--
Gitblit v1.8.0