From 8e5ba5665861b29a4b8da0335c81d620aa891862 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 三月 2021 09:23:54 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 74 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
index 23d3c91..e985b71 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -2,22 +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>();
}
- public class ButtonObj
- {
- public string Key = string.Empty;
- /// <summary>
- /// #app 鏄剧ず鐨勬枃瀛�
- /// </summary>
- public string value = string.Empty;
- }
+
+
+ [System.Serializable]
public class Control
{
/// <summary>
@@ -44,5 +49,65 @@
/// 绾㈠鐮�
/// </summary>
public List<string> library = new List<string>();
+ /// <summary>
+ /// 绾㈠鐮�
+ /// </summary>
+ public List<ButtonObj> status = new List<ButtonObj>();
}
+ [System.Serializable]
+ public class ButtonObj
+ {
+ public string Key = string.Empty;
+ /// <summary>
+ /// #app 鏄剧ず鐨勬枃瀛�
+ /// </summary>
+ public string value = string.Empty;
+ }
+ [System.Serializable]
+ public class DeviceType
+ {
+ /// <summary>
+ /// 璁惧绫诲瀷涓婚敭Id
+ /// </summary>
+ public string id = string.Empty;
+ /// <summary>
+ /// 璁惧绫诲瀷(鎶曞奖浠�,椋庢墖,鏈洪《鐩�...)
+ /// </summary>
+ public string deviceType = string.Empty;
+ }
+ [System.Serializable]
+ public class Brand
+ {
+ /// <summary>
+ /// 鍝佺墝涓婚敭Id
+ /// </summary>
+ public string id = string.Empty;
+ /// <summary>
+ /// 璁惧绫诲瀷涓婚敭Id
+ /// </summary>
+ public string deviceTypeId = string.Empty;
+ /// <summary>
+ /// 鍝佺墝鍚嶇О
+ /// </summary>
+ public string brandName = string.Empty;
+
+ }
+
+ public class Library
+ {
+ /// <summary>
+ /// 绾㈠鐮�
+ /// </summary>
+ public string irCode = string.Empty;
+ /// <summary>
+ /// 鍝佺墝涓婚敭Id
+ /// </summary>
+ public string brandId = string.Empty;
+ /// <summary>
+ /// 绾㈠鐮佺储寮曞簭鍙�
+ /// </summary>
+ public string irIndex = string.Empty;
+
+ }
+
}
--
Gitblit v1.8.0