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 | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
index e985b71..ebc2d6a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs
@@ -1,14 +1,15 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.Entity;
+
namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
{
[System.Serializable]
- public class Pir: Entity.Function
+ public class Pir : Entity.Function
{
/// <summary>
- /// 娣诲姞鎸夐敭鍒楄〃
+ /// 绾㈠瀹濆垪琛�
/// </summary>
- public static List<ButtonObj> BuottonList = new List<ButtonObj>();
public static List<Pir> pirDeviceList = new List<Pir>();
/// <summary>
/// 褰撳墠閫昏緫
@@ -20,7 +21,6 @@
public List<Entity.Function> FunctioList = new List<Entity.Function>();
}
-
[System.Serializable]
public class Control
@@ -28,11 +28,15 @@
/// <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>
@@ -44,25 +48,17 @@
/// <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>();
}
- [System.Serializable]
- public class ButtonObj
- {
- public string Key = string.Empty;
- /// <summary>
- /// #app 鏄剧ず鐨勬枃瀛�
- /// </summary>
- public string value = string.Empty;
- }
+
[System.Serializable]
public class DeviceType
{
@@ -92,7 +88,6 @@
public string brandName = string.Empty;
}
-
public class Library
{
/// <summary>
--
Gitblit v1.8.0