From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:19:13 +0800
Subject: [PATCH] 合并嘉乐lc代码

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs |   90 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 75 insertions(+), 15 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..ebc2d6a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -1,33 +1,42 @@
 锘縰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>();
 
     }
-    public class ButtonObj
-    {
-        public string Key = string.Empty;
-        /// <summary>
-        /// #app 鏄剧ず鐨勬枃瀛�
-        /// </summary>
-        public string value = string.Empty;
-    }
+
+    [System.Serializable]
     public class Control
     {
         /// <summary>
         /// 绾㈠瀹濊澶嘔d
         /// </summary>
-        public string deviceId = "0";
+        public string deviceId = "";
+        /// <summary>
+        /// sid
+        /// </summary>
+        public string sid = "";
         /// <summary>
         /// 绾㈠閬ユ帶鍣ㄥ悕绉�
         /// </summary>
-        public string name = "0";
+        public string name = "";
         /// <summary>
         /// 绾㈠閬ユ帶鍣╯pk
         /// </summary>
@@ -39,10 +48,61 @@
         /// <summary>
         /// 鐮佺粍鍙�
         /// </summary>
-        public string group_id = "12";
+        public string groupId = "";  
+        /// <summary>
+        /// 绾㈠鐮佸簱
+        /// </summary>
+        public List<string> library = new List<string>();
+        /// <summary>
+        /// 瀛︿範鎸夐敭鍒楄〃
+        /// </summary>
+        public List<AttributesStatus> status = new List<AttributesStatus>();
+    }
+   
+    [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 List<string> library = new List<string>();
+        public string irCode = string.Empty;
+        /// <summary>
+        /// 鍝佺墝涓婚敭Id
+        /// </summary>
+        public string brandId = string.Empty;
+        /// <summary>
+        /// 绾㈠鐮佺储寮曞簭鍙�
+        /// </summary>
+        public string irIndex = string.Empty;
+
     }
+
 }

--
Gitblit v1.8.0