From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index c28c5bc..d063079 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -6,11 +6,15 @@
{
public class ZbGatewayData : CommonDevice
{
- #region 缃戝叧鍦ㄧ嚎鏍囪瘑
+ #region 鏂拌拷鍔犵殑涓�浜涘彉閲�
/// <summary>
/// 鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎鐨勬爣璇嗭紝APP鐣岄潰浼氭敼鍙樺畠鐨勫��,Application浼氶噸鏂板埛鏂板畠鐨勫��
/// </summary>
public bool GatewayOnlineFlage = false;
+ /// <summary>
+ /// 缃戝叧鎵�鍦ㄧ殑鎴块棿ID
+ /// </summary>
+ public string RoomId = string.Empty;
#endregion
@@ -152,6 +156,10 @@
///缃戝叧鎵�鍦ㄥ眬鍩熺綉鐨刬p鍦板潃
/// </summary>
public string GwIP;
+ /// <summary>
+ /// 涓讳汉鐨凣uid(鍗充娇鏄鐞嗗憳,杩欓噷涔熸槸涓讳汉鐨凣uid)
+ /// </summary>
+ public string AccountId;
/// <summary>
///褰撳墠灞�鍩熺綉缃戠粶鍙峰崰鐢ㄤ綅鏁帮紝鐢ㄤ簬璁＄畻瀛愮綉鎺╃爜锛屽Mask=32锛屽垯瀛愮綉鎺╃爜涓�255.255.255.0
/// </summary>
--
Gitblit v1.8.0