From e8b9a8ec533094c6e3f262f64a73810f768a59ff Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 11 三月 2021 18:51:26 +0800
Subject: [PATCH] 2021-3-11-2
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs | 69 ++++++++++++++++++++--------------
1 files changed, 40 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 078249c..2f1cc37 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -1,29 +1,46 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.Entity;
+
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>
- /// 绾㈠瀹濊澶嘔d
- /// </summary>
- public string deviceId = "0";
- /// <summary>
- /// 绾㈠閬ユ帶鍣ㄥ悕绉�
- /// </summary>
- public string name = "0";
- /// <summary>
- /// 绾㈠閬ユ帶鍣╯pk
- /// </summary>
- public string spk = "ir.module";
+ ///// <summary>
+ ///// 绾㈠瀹濊澶嘔d
+ ///// </summary>
+ //public string deviceId = "";
+ ///// <summary>
+ ///// sid
+ ///// </summary>
+ //public string sid = "";
+ ///// <summary>
+ ///// 绾㈠閬ユ帶鍣ㄥ悕绉�
+ ///// </summary>
+ //public string name = "";
+ ///// <summary>
+ ///// 绾㈠閬ユ帶鍣╯pk
+ ///// </summary>
+ //public string spk = "ir.module";
/// <summary>
/// library=搴撶被鍨�, learn=涓嶉渶瑕侀澶栬拷鍔犲睘鎬�
/// </summary>
@@ -31,24 +48,18 @@
/// <summary>
/// 鐮佺粍鍙�
/// </summary>
- public string group_id = "12";
+ public string groupId = "";
/// <summary>
- /// 绾㈠鐮�
+ /// 绾㈠鐮佸簱
/// </summary>
public List<string> library = new List<string>();
/// <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>
@@ -60,6 +71,7 @@
/// </summary>
public string deviceType = string.Empty;
}
+ [System.Serializable]
public class Brand
{
/// <summary>
@@ -76,7 +88,6 @@
public string brandName = string.Empty;
}
-
public class Library
{
/// <summary>
@@ -93,5 +104,5 @@
public string irIndex = string.Empty;
}
-
+
}
--
Gitblit v1.8.0