From b1ced15165c0c120483f821079fc23c63d455e8e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 05 三月 2021 17:54:49 +0800
Subject: [PATCH] 2021-3-5-1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
index cc45c1f..e985b71 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -3,7 +3,7 @@
namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
{
[System.Serializable]
- public class Pir
+ public class Pir: Entity.Function
{
/// <summary>
/// 娣诲姞鎸夐敭鍒楄〃
@@ -15,36 +15,15 @@
/// </summary>
public static Pir currPir;
/// <summary>
- /// 璁惧ID
+ /// 閬ユ帶鍣ㄥ垪琛�
/// </summary>
- public string deviceId = string.Empty;
- public string homeId = string.Empty;
- public string gatewayId = string.Empty;
- public string name = string.Empty;
- public string sid = string.Empty;
- public string spk = string.Empty;
- public string oid = string.Empty;
- public string omodel = string.Empty;
- public bool collect =false;
- public bool online = false;
- public string controlCounter = string.Empty;
+ public List<Entity.Function> FunctioList = new List<Entity.Function>();
- public List<Attributes> attributes = new List<Attributes>();
+ }
+
-}
-[Serializable]
-public class Attributes
-{
- public string key = string.Empty;
- public string data_type = string.Empty;
- public int max = 0;
- public int min = 0;
- public int sort = 0;
- public List<string> value = new List<string>();
-}
-
-
-public class Control
+ [System.Serializable]
+ public class Control
{
/// <summary>
/// 绾㈠瀹濊澶嘔d
@@ -75,6 +54,7 @@
/// </summary>
public List<ButtonObj> status = new List<ButtonObj>();
}
+ [System.Serializable]
public class ButtonObj
{
public string Key = string.Empty;
@@ -83,6 +63,7 @@
/// </summary>
public string value = string.Empty;
}
+ [System.Serializable]
public class DeviceType
{
/// <summary>
@@ -94,6 +75,7 @@
/// </summary>
public string deviceType = string.Empty;
}
+ [System.Serializable]
public class Brand
{
/// <summary>
@@ -127,5 +109,5 @@
public string irIndex = string.Empty;
}
-
+
}
--
Gitblit v1.8.0