From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs | 148 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 145 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
index 5b956bf..63162da 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
@@ -140,6 +140,50 @@
/// </summary>
public int BindScenesId;
}
+
+ /// <summary>
+ /// 鍗曚釜璁惧鐨勬暟鎹�
+ /// </summary>
+ [System.Serializable]
+ public class AddSingleBindData
+ {
+ /// <summary>
+ /// 鎺у埗璁惧鑺傜偣鐨刴ac鍦板潃
+ /// </summary>
+ public string DeviceAddr;
+ /// <summary>
+ /// 閿欒淇℃伅
+ /// </summary>
+ public int Epoint;
+ /// <summary>
+ ///缁戝畾鍚嶇О锛屼笉淇敼鍚嶇О鏃跺拷鐣ヨ閫夐」
+ /// </summary>
+ public string BindName;
+ /// <summary>
+ /// 缁戝畾绫诲瀷
+ ///<para>0锛氱粦瀹氳澶� </para>
+ ///<para>1锛氱粦瀹氬満鏅�</para>
+ /// </summary>
+ public int BindType;
+ /// <summary>
+ /// 缁戝畾鐨刢luster,闇�瑕佹帶鍒惰澶囩殑OutCluster鍒楄〃涓瓨鍦ㄨcluster銆�
+ ///濡傜粦瀹氭煇涓澶囩殑on/off锛屼负6銆�
+ /// </summary>
+ public int BindCluster;
+ /// <summary>
+ /// 缁戝畾璁惧Mac鍦板潃锛� 褰揃indType=0鏃跺瓨鍦�
+ /// </summary>
+ public string BindMacAddr;
+ /// <summary>
+ /// 缁戝畾璁惧鐨勭鍙ｅ彿锛屽綋BindType=0鏃跺瓨鍦�
+ /// </summary>
+ public int BindEpoint;
+ /// <summary>
+ /// 缁戝畾鍦烘櫙锛屽綋BindType=1鏃跺瓨鍦�
+ /// </summary>
+ public int BindScenesId;
+
+ }
#endregion
#region 瑙ｉ櫎缁戝畾
@@ -311,9 +355,9 @@
{
/// <summary>
/// 缁戝畾绫诲瀷
- ///<para>0锛氱Щ闄よ澶囷紝鍚岀綉鍏宠澶囬棿鐨勭Щ闄�</para>
- ///<para>1锛氱Щ闄よ澶囷紝璺ㄧ綉鍏宠澶囬棿鐨勭Щ闄�</para>
- ///<para>2锛氱Щ闄ょ粦瀹氬満鏅�</para>
+ ///<para>0锛氬悓缃戝叧璁惧</para>
+ ///<para>1锛氳法缃戝叧璁惧闂�</para>
+ ///<para>2锛氬満鏅�</para>
/// </summary>
public int BindType;
/// <summary>
@@ -337,6 +381,104 @@
/// </summary>
public string ESName;
}
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夌粦瀹氱殑淇℃伅
+ /// </summary>
+ public class BindListAllInfo
+ {
+ /// <summary>
+ /// 鎺у埗婧愯澶嘙ac鍦板潃
+ /// </summary>
+ public string KeyMacAddr;
+ /// <summary>
+ /// 鎺у埗婧愯澶囩殑绔彛鍙�
+ /// </summary>
+ public int KeyEpoint;
+ /// <summary>
+ /// 缁戝畾绫诲瀷
+ ///<para>0锛氬悓缃戝叧璁惧</para>
+ ///<para>1锛氳法缃戝叧璁惧闂�</para>
+ ///<para>2锛氬満鏅�</para>
+ /// </summary>
+ public int BindType;
+ /// <summary>
+ /// 缁戝畾鐨刢luster
+ /// </summary>
+ public int BindCluster;
+ /// <summary>
+ /// 缁戝畾璁惧Mac鍦板潃锛� 褰揃indType=0鏃跺瓨鍦�
+ /// </summary>
+ public string BindMacAddr;
+ /// <summary>
+ /// 缁戝畾璁惧鐨勭鍙ｅ彿锛屽綋BindType=0鏃跺瓨鍦�
+ /// </summary>
+ public int BindEpoint;
+ /// <summary>
+ /// 缁戝畾鍦烘櫙锛屽綋BindType=1鏃跺瓨鍦�
+ /// </summary>
+ public int BindScenesId;
+ /// <summary>
+ /// 缁戝畾鐨勮澶囨垨鍦烘櫙鍚嶇О
+ /// </summary>
+ public string ESName;
+ }
+
+ /// <summary>
+ /// 鑾峰彇闈㈡澘缁戝畾鍥炲鐨勬暟鎹�愰�氳繃mac鑾峰彇鐨勫洖澶峕
+ /// </summary>
+ [System.Serializable]
+ public class GetPanelBindResponseDataByMac
+ {
+ /// <summary>
+ /// 0锛氭垚鍔�
+ ///<para>1锛氱粦瀹氫笉瀛樺湪</para>
+ /// </summary>
+ public int Result;
+ /// <summary>
+ /// MaxNumItems
+ /// </summary>
+ public int MaxNumItems;
+ /// <summary>
+ /// StartIndex
+ /// </summary>
+ public int StartIndex;
+ /// <summary>
+ /// ReturnBindNum
+ /// </summary>
+ public int ReturnBindNum;
+ /// <summary>
+ /// 缁戝畾鍒楄〃 锛屽綋Status=0鏃跺瓨鍦ㄣ��
+ /// </summary>
+ public List<BindDeviceByMacObj> BindList = new List<BindDeviceByMacObj>();
+ }
+
+ /// <summary>
+ /// 鑾峰彇闈㈡澘缁戝畾鍥炲鐨勬暟鎹�愰�氳繃mac鑾峰彇鐨勫洖澶峕
+ /// </summary>
+ public class BindDeviceByMacObj
+ {
+ /// <summary>
+ /// ControllerEpoint
+ /// </summary>
+ public int ControllerEpoint;
+ /// <summary>
+ /// 缁戝畾鐨刢luster
+ /// </summary>
+ public int BindCluster;
+ /// <summary>
+ /// 缁戝畾璁惧Mac鍦板潃锛� 褰揃indType=0鏃跺瓨鍦�
+ /// </summary>
+ public string BindMacAddr;
+ /// <summary>
+ /// 缁戝畾璁惧鐨勭鍙ｅ彿锛屽綋BindType=0鏃跺瓨鍦�
+ /// </summary>
+ public int BindEpoint;
+ /// <summary>
+ /// BindMode
+ /// </summary>
+ public int BindMode;
+ }
#endregion
#region 浠庤妭鐐硅澶囨湰鍦拌褰曡鍙栫粦瀹氬垪琛ㄤ俊鎭�
--
Gitblit v1.8.0