From 134811c790a982d505567e2ba69b5de566410367 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 三月 2021 10:20:06 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
index 078249c..e985b71 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -2,14 +2,27 @@
using System.Collections.Generic;
namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
{
- public class Pir
+ [System.Serializable]
+ public class Pir: Entity.Function
{
/// <summary>
/// 娣诲姞鎸夐敭鍒楄〃
/// </summary>
public static List<ButtonObj> BuottonList = new List<ButtonObj>();
+ public static List<Pir> pirDeviceList = new List<Pir>();
+ /// <summary>
+ /// 褰撳墠閫昏緫
+ /// </summary>
+ public static Pir currPir;
+ /// <summary>
+ /// 閬ユ帶鍣ㄥ垪琛�
+ /// </summary>
+ public List<Entity.Function> FunctioList = new List<Entity.Function>();
}
+
+
+ [System.Serializable]
public class Control
{
/// <summary>
@@ -41,6 +54,7 @@
/// </summary>
public List<ButtonObj> status = new List<ButtonObj>();
}
+ [System.Serializable]
public class ButtonObj
{
public string Key = string.Empty;
@@ -49,6 +63,7 @@
/// </summary>
public string value = string.Empty;
}
+ [System.Serializable]
public class DeviceType
{
/// <summary>
@@ -60,6 +75,7 @@
/// </summary>
public string deviceType = string.Empty;
}
+ [System.Serializable]
public class Brand
{
/// <summary>
@@ -93,5 +109,5 @@
public string irIndex = string.Empty;
}
-
+
}
--
Gitblit v1.8.0