From 97e259d966cb5cb5d73c105d5dbaadcc1f920614 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 13:48:43 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
index 06a88f2..0f3e214 100755
--- a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
@@ -12,6 +12,10 @@
public class SceneTargetDeviceUI
{
/// <summary>
+ /// 鍦烘櫙娣诲姞瀵硅薄鐨勭被鍨� 榛樿0璁惧 1鏃堕棿娈� 2鍦烘櫙
+ /// </summary>
+ public int Type = 0;
+ /// <summary>
/// 浠诲姟鍒楄〃涓殑鏁版嵁鍒楄〃
/// Type=0 瀛樺湪
/// </summary>
@@ -22,19 +26,15 @@
/// </summary>
public DeviceUI DeviceUI = new DeviceUI();
/// <summary>
- /// 閫夋嫨鐨勫満鏅�
- /// Type=2 瀛樺湪
- /// </summary>
- public SceneUI SceneUI = new SceneUI();
- /// <summary>
/// 寤舵椂鏃堕棿
/// Type=1 瀛樺湪
/// </summary>
public int DelayTime = 0;
/// <summary>
- /// 鍦烘櫙娣诲姞瀵硅薄鐨勭被鍨� 榛樿0璁惧 1鏃堕棿娈� 2鍦烘櫙
+ /// 閫夋嫨鐨勫満鏅�
+ /// Type=2 瀛樺湪
/// </summary>
- public int Type = 0;
+ public SceneUI SceneUI = new SceneUI();
/// <summary>
/// 浣滀负鎴愬憳鐨勫叾浠栧満鏅痠d銆�
/// Type=2 瀛樺湪
@@ -56,14 +56,5 @@
return GetHashCode().ToString();
}
}
-
- //public string TargetHasd
- //{
- // get
- // {
- // return GetHashCode().ToString();
- // }
- //}
-
}
}
--
Gitblit v1.8.0