From 38ca58ae790dc71e50070b54345455988a4a64a3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 27 八月 2021 11:24:52 +0800
Subject: [PATCH] 2021-8-27-01

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs |   69 +++++++++++-----------------------
 1 files changed, 23 insertions(+), 46 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..ebc2d6a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -1,59 +1,42 @@
 锘縰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<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";
+        public string deviceId = "";
+        /// <summary>
+        /// sid
+        /// </summary>
+        public string sid = "";
         /// <summary>
         /// 绾㈠閬ユ帶鍣ㄥ悕绉�
         /// </summary>
-        public string name = "0";
+        public string name = "";
         /// <summary>
         /// 绾㈠閬ユ帶鍣╯pk
         /// </summary>
@@ -65,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>
@@ -94,6 +71,7 @@
         /// </summary>
         public string deviceType = string.Empty;
     }
+    [System.Serializable]
     public class Brand
     {
         /// <summary>
@@ -110,7 +88,6 @@
         public string brandName = string.Empty;
 
     }
-
     public class Library
     {
         /// <summary>
@@ -127,5 +104,5 @@
         public string irIndex = string.Empty;
 
     }
-   
+
 }

--
Gitblit v1.8.0