From 9c33e4ccb90fae87a614abd2ed1ab034d3b7a13d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 26 三月 2021 11:26:01 +0800
Subject: [PATCH] 2021-03-26 1.对接接口优化。
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs | 45 +++++++++++++++++----------------------------
1 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
index 8edcd3d..e985b71 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -3,41 +3,27 @@
namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
{
[System.Serializable]
- public class Pir
+ public class Pir: Entity.Function
{
/// <summary>
/// 娣诲姞鎸夐敭鍒楄〃
/// </summary>
public static List<ButtonObj> BuottonList = new List<ButtonObj>();
public static List<Pir> pirDeviceList = new List<Pir>();
- 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;
+ /// <summary>
+ /// 褰撳墠閫昏緫
+ /// </summary>
+ public static Pir currPir;
+ /// <summary>
+ /// 閬ユ帶鍣ㄥ垪琛�
+ /// </summary>
+ 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
@@ -68,6 +54,7 @@
/// </summary>
public List<ButtonObj> status = new List<ButtonObj>();
}
+ [System.Serializable]
public class ButtonObj
{
public string Key = string.Empty;
@@ -76,6 +63,7 @@
/// </summary>
public string value = string.Empty;
}
+ [System.Serializable]
public class DeviceType
{
/// <summary>
@@ -87,6 +75,7 @@
/// </summary>
public string deviceType = string.Empty;
}
+ [System.Serializable]
public class Brand
{
/// <summary>
@@ -120,5 +109,5 @@
public string irIndex = string.Empty;
}
-
+
}
--
Gitblit v1.8.0