From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 14:30:13 +0800
Subject: [PATCH] 原来的 IOS 工程舍弃（注：没有合并其他组员的代码）
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs
index 07a3131..6dd6b98 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs
@@ -14,11 +14,11 @@
/// <summary>
/// 璁惧闀滃儚鐨勯�昏緫
- /// </summary>
- private static HdlDeviceImageInfoLogic m_Current = null;
+ /// </summary>
+ private static HdlDeviceImageInfoLogic m_Current = null;
/// <summary>
/// 璁惧闀滃儚鐨勯�昏緫
- /// </summary>
+ /// </summary>
public static HdlDeviceImageInfoLogic Current
{
get
@@ -71,10 +71,10 @@
/// <param name="tADevice"></param>
private void SetFirmwareVersionToOtaDevice(OTADevice tADevice)
{
- if (HdlDeviceAttributeLogic.Current.IsEsixt("DeviceAutoGetFirmwareVersion") == false)
+ if (HdlGatewayReceiveLogic.Current.IsEsixt("DeviceAutoGetFirmwareVersion") == false)
{
//娣诲姞浜嬩欢
- HdlDeviceAttributeLogic.Current.AddAttributeEvent("DeviceAutoGetFirmwareVersion", "DeviceStatusReport", this.SetFirmwareVersionByInterfaceResult);
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceAutoGetFirmwareVersion", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, this.SetFirmwareVersionByInterfaceResult);
}
//鍙戦�佸懡浠�
this.SetFirmwareVersionComand(tADevice);
@@ -91,26 +91,26 @@
public void SetFirmwareVersionComand(OTADevice device)
{
var jObject = new Newtonsoft.Json.Linq.JObject
- {
- { "DeviceAddr",device.DeviceAddr },
- { "Epoint", device.DeviceEpoint },
- { "Cluster_ID", (int)Cluster_ID.Ota },
- { "Command", 108 }
+ {
+ { "DeviceAddr",device.DeviceAddr },
+ { "Epoint", device.DeviceEpoint },
+ { "Cluster_ID", (int)Cluster_ID.Ota },
+ { "Command", 108 }
};
var attriBute = new Newtonsoft.Json.Linq.JArray
- {
+ {
new Newtonsoft.Json.Linq.JObject
- {
+ {
{ "AttriButeId", (int)AttriButeId.ImgVersion}
- },
+ },
new Newtonsoft.Json.Linq.JObject
{
{ "AttriButeId", (int)AttriButeId.mgHWversion}
- },
+ },
new Newtonsoft.Json.Linq.JObject
{
{ "AttriButeId", (int)AttriButeId.ImgTypeId}
- }
+ }
};
var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
jObject.Add("Data", data);
--
Gitblit v1.8.0