From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs | 101 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
index 03a8a84..ebc2d6a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -1,21 +1,108 @@
锘縰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
+
+ [System.Serializable]
+ public class Control
{
- public string Key = string.Empty;
/// <summary>
- /// #app 鏄剧ず鐨勬枃瀛�
+ /// 绾㈠瀹濊澶嘔d
/// </summary>
- public string value = string.Empty;
+ 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>
+ public string type = "learn";
+ /// <summary>
+ /// 鐮佺粍鍙�
+ /// </summary>
+ 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 string irCode = string.Empty;
+ /// <summary>
+ /// 鍝佺墝涓婚敭Id
+ /// </summary>
+ public string brandId = string.Empty;
+ /// <summary>
+ /// 绾㈠鐮佺储寮曞簭鍙�
+ /// </summary>
+ public string irIndex = string.Empty;
+
+ }
+
}
--
Gitblit v1.8.0