From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
index f5ac6ec..e255b33 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
@@ -192,7 +192,6 @@
//淇敼缂撳瓨
TemplateData.TemplateDeviceDataLogic.Current.AddDeviceBindList(addBindData, result.JsonData[0]);
-
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<BindObj.AddedDeviceBindResponseData>(result.ReceiptData);
return new BindObj.AddedDeviceBindResponseAllData() { addedDeviceBindResponseData = tempData };
}
@@ -225,6 +224,53 @@
jObject.Add("Data", data);
return jObject.ToString();
}
+
+ /// <summary>
+ ///璁惧缁戝畾銆愪竴瀵逛竴 缁戝畾锛屼竴涓寜閿洖璺彧鑳界粦瀹氫竴涓澶囥��
+ /// </summary>
+ public BindObj.AddedDeviceSingleBindResponseAllData AddDeviceSingleBindAsync(BindObj.AddSingleBindData addSingleBindData)
+ {
+ var device = Common.LocalDevice.Current.GetDevice(addSingleBindData.DeviceAddr, addSingleBindData.Epoint);
+ //鑾峰彇鍙戦�佺殑鍛戒护瀛楃
+ var sendData = this.GetAddDeviceListSingleBindCommandText(addSingleBindData);
+ //鍙戦��
+ var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Bind/SetSingleBind", sendData, "Bind/SetSingleBind_Respon", 20);
+ if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
+ {
+ return null;
+ }
+
+ var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<BindObj.AddedDeviceSingleBindResponseData>(result.ReceiptData);
+ return new BindObj.AddedDeviceSingleBindResponseAllData() { addedDeviceSingleBindResponseData = tempData };
+ }
+
+ /// <summary>
+ /// 鑾峰彇娣诲姞璁惧缁戝畾鐨勫懡浠ゅ瓧绗�
+ /// </summary>
+ /// <param name="addBindData"></param>
+ /// <returns></returns>
+ public string GetAddDeviceListSingleBindCommandText(BindObj.AddSingleBindData addSingleBindData)
+ {
+ var jObject = new JObject { { "DeviceAddr", addSingleBindData.DeviceAddr }, { "Epoint", addSingleBindData.Epoint }, { "Cluster_ID", 0 }, { "Command", 5020 } };
+ var data = new JObject { };
+ var bindClusterList = new JArray { };
+ foreach (var cluster in addSingleBindData.BindClusterList)
+ {
+ bindClusterList.Add(cluster);
+ }
+ if (addSingleBindData.BindType == 0)
+ {
+ data = new JObject { { "BindName", addSingleBindData.BindName }, { "BindType", addSingleBindData.BindType }, { "BindClusterList", bindClusterList }, { "BindMacAddr", addSingleBindData.BindMacAddr }, { "BindEpoint", addSingleBindData.BindEpoint } };
+ }
+ else if (addSingleBindData.BindType == 1)
+ {
+ data = new JObject { { "BindName", addSingleBindData.BindName }, { "BindType", addSingleBindData.BindType }, { "BindClusterList", bindClusterList }, { "BindScenesId", addSingleBindData.BindScenesId } };
+
+ }
+ jObject.Add("Data", data);
+ return jObject.ToString();
+ }
+
#endregion
@@ -683,7 +729,7 @@
public Panel.PanelConfigureInfoResponAllData ReadPanelConfigureInfoAsync(CommonDevice device)
{
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
- if (Common.Config.Instance.Home.IsVirtually == true)
+ if (Common.Config.Instance.Home.IsVirtually == true || Common.Config.Instance.Home.IsShowTemplate == true)
{
return TemplateData.TemplateDeviceDataLogic.Current.ReadPanelConfigureKeyModel(device);
}
--
Gitblit v1.8.0