From 6ae83acae578c6746201fbd61074a7b93747ef4f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 08 三月 2021 17:47:52 +0800
Subject: [PATCH] 2021-3-8-4
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs | 60 ++++++++++++++++++++----------------------------------------
1 files changed, 20 insertions(+), 40 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..0c160ff 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -1,55 +1,40 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.Entity;
+
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<AttributesStatus> BuottonList = new List<AttributesStatus>();
public static List<Pir> pirDeviceList = new List<Pir>();
/// <summary>
/// 褰撳墠閫昏緫
/// </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
/// </summary>
public string deviceId = "0";
+ /// <summary>
+ /// sid
+ /// </summary>
+ public string sid = "0";
/// <summary>
/// 绾㈠閬ユ帶鍣ㄥ悕绉�
/// </summary>
@@ -65,7 +50,7 @@
/// <summary>
/// 鐮佺粍鍙�
/// </summary>
- public string group_id = "12";
+ public string groupId = "12";
/// <summary>
/// 绾㈠鐮�
/// </summary>
@@ -73,16 +58,10 @@
/// <summary>
/// 绾㈠鐮�
/// </summary>
- public List<ButtonObj> status = new List<ButtonObj>();
+ public List<AttributesStatus> status = new List<AttributesStatus>();
}
- public class ButtonObj
- {
- public string Key = string.Empty;
- /// <summary>
- /// #app 鏄剧ず鐨勬枃瀛�
- /// </summary>
- public string value = string.Empty;
- }
+
+ [System.Serializable]
public class DeviceType
{
/// <summary>
@@ -94,6 +73,7 @@
/// </summary>
public string deviceType = string.Empty;
}
+ [System.Serializable]
public class Brand
{
/// <summary>
@@ -127,5 +107,5 @@
public string irIndex = string.Empty;
}
-
+
}
--
Gitblit v1.8.0