From 8407d6631ac8f5b65c4a14fa27babaa48026d4ca Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 三月 2023 16:13:40 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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..efa787c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -11,7 +11,7 @@
using Shared;
namespace HDL_ON.UI
{
- public class DeviceListPage : FrameLayout
+ public class DeviceListPage : FrameLayout
{
FrameLayout bodyView;
VerticalRefreshLayout contentView;
@@ -59,7 +59,8 @@
{
var waitPage = new Loading();
waitPage.Start();
- new System.Threading.Thread(() => {
+ new System.Threading.Thread(() =>
+ {
try
{
var pm = new HttpServerRequest();
@@ -77,7 +78,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 +97,8 @@
}
finally
{
- Application.RunOnMainThread(() => {
+ Application.RunOnMainThread(() =>
+ {
if (waitPage != null)
{
waitPage.RemoveFromParent();
@@ -113,6 +115,10 @@
bool isFrist = true;
foreach (var device in deviceList)
{
+ if (!this.CheckSupportDevice(device))
+ {
+ continue;
+ }
var row = new RowLayout()
{
Height = Application.GetRealHeight(50),
@@ -168,7 +174,8 @@
};
row.AddChidren(btnName);
- btnName.MouseUpEventHandler = (sender, e) => {
+ btnName.MouseUpEventHandler = (sender, e) =>
+ {
switch (device.spk)
{
case SPK.IrModule:
@@ -187,7 +194,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();
@@ -267,7 +275,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 +346,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