From 617a02739b82ae30772de25b4f9a8f6e9460f468 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 12 八月 2020 17:42:36 +0800
Subject: [PATCH] 请合并代码：新增多功能面板一对一绑定机制
---
ZigbeeApp20200810/Shared/Phone/ZigBee/Device/BindObj.cs | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp20200810/Shared/Phone/ZigBee/Device/BindObj.cs b/ZigbeeApp20200810/Shared/Phone/ZigBee/Device/BindObj.cs
index 28e3abc..abcd33e 100644
--- a/ZigbeeApp20200810/Shared/Phone/ZigBee/Device/BindObj.cs
+++ b/ZigbeeApp20200810/Shared/Phone/ZigBee/Device/BindObj.cs
@@ -19,6 +19,15 @@
}
[System.Serializable]
+ public class AddedDeviceSingleBindResponseAllData : ErrorResponCommon
+ {
+ /// <summary>
+ /// 缃戝叧鐩存帴鍙嶉缁戝畾璁惧淇℃伅
+ /// </summary>
+ public AddedDeviceSingleBindResponseData addedDeviceSingleBindResponseData;
+ }
+
+ [System.Serializable]
public class AddedDeviceBindResponseData
{
/// <summary>
@@ -34,6 +43,55 @@
///<para>1锛氱粦瀹氱洰鏍囧け璐ワ紝缁戝畾璁惧鐩爣鏈夋紡鎺�</para>
/// </summary>
public int Result = -1;
+ }
+
+ [System.Serializable]
+ public class AddedDeviceSingleBindResponseData
+ {
+ /// <summary>
+ /// 鎺у埗璁惧鑺傜偣鐨刴ac鍦板潃
+ /// </summary>
+ public string DeviceAddr;
+ /// <summary>
+ /// 鎺у埗璁惧鑺傜偣鐨勭鍙ｅ彿
+ /// </summary>
+ public int Epoint;
+ /// <summary>
+ ///缁戝畾鍚嶇О
+ /// </summary>
+ public string BindName;
+ /// <summary>
+ /// 0锛氭垚鍔燂紝閽堝鍦烘櫙鍜岃法缃戝叧缁戝畾
+ ///<para>1锛氬け璐ワ紝鑺傜偣璁惧鎴栧満鏅笉瀛樺湪銆�</para>
+ ///<para>2锛氬悓缃戝叧璁惧缁戝畾锛岀瓑寰呮帶鍒舵簮璁惧鍐欏叆鍙嶉缁撴灉锛涗互涓嬮潰涓婚缁撴灉涓哄噯</para>
+ /// </summary>
+ public int Result = -1;
+ /// <summary>
+ /// 缁戝畾绫诲瀷
+ ///<para>0锛氱粦瀹氳澶� </para>
+ ///<para>1锛氱粦瀹氬満鏅�</para>
+ /// </summary>
+ public int BindType;
+ /// <summary>
+ ///缁戝畾鐨刢luster鏁扮粍
+ /// </summary>
+ public List<int> BindClusterList = new List<int>();
+ /// <summary>
+ /// 缁戝畾璁惧Mac鍦板潃锛� 褰揃indType=0鏃跺瓨鍦�
+ /// </summary>
+ public string BindMacAddr;
+ /// <summary>
+ /// 缁戝畾璁惧鐨勭鍙ｅ彿锛屽綋BindType=0鏃跺瓨鍦�
+ /// </summary>
+ public int BindEpoint;
+ /// <summary>
+ /// 缁戝畾鍦烘櫙锛屽綋BindType=2鏃跺瓨鍦�
+ /// </summary>
+ public int BindScenesId;
+ /// <summary>
+ ///缁戝畾鐨勮澶囨垨鍦烘櫙鐨勫悕绉�
+ /// </summary>
+ public string ESName;
}
/// <summary>
@@ -97,7 +155,7 @@
/// </summary>
public string DeviceAddr;
/// <summary>
- /// 閿欒淇℃伅
+ /// 鎺у埗璁惧鑺傜偣鐨勭鍙ｅ彿
/// </summary>
public int Epoint;
/// <summary>
@@ -166,10 +224,9 @@
/// </summary>
public int BindType;
/// <summary>
- /// 缁戝畾鐨刢luster,闇�瑕佹帶鍒惰澶囩殑OutCluster鍒楄〃涓瓨鍦ㄨcluster銆�
- ///濡傜粦瀹氭煇涓澶囩殑on/off锛屼负6銆�
+ ///缁戝畾鐨刢lusters鏁扮粍锛岄渶瑕佹帶鍒惰澶囩殑OutCluster鍒楄〃涓瓨鍦ㄨcluster銆傚缁戝畾鏌愪釜璁惧鐨刼n/off锛屼负6銆傚缁戝畾鍦烘櫙锛屽～鏃廔d涓�6
/// </summary>
- public int BindCluster;
+ public List<int> BindClusterList = new List<int>();
/// <summary>
/// 缁戝畾璁惧Mac鍦板潃锛� 褰揃indType=0鏃跺瓨鍦�
/// </summary>
--
Gitblit v1.8.0