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 | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
index 2f1cc37..ebc2d6a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -5,7 +5,7 @@
namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
{
[System.Serializable]
- public class Pir : Entity.Function
+ public class Pir : Entity.Function
{
/// <summary>
/// 绾㈠瀹濆垪琛�
@@ -25,22 +25,22 @@
[System.Serializable]
public class Control
{
- ///// <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>
+ /// 绾㈠瀹濊澶嘔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>
@@ -54,7 +54,7 @@
/// </summary>
public List<string> library = new List<string>();
/// <summary>
- ///
+ /// 瀛︿範鎸夐敭鍒楄〃
/// </summary>
public List<AttributesStatus> status = new List<AttributesStatus>();
}
--
Gitblit v1.8.0