From f23ad1b3f9f6193f35f72104d690b21dc67d5c1f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 七月 2020 12:35:25 +0800
Subject: [PATCH] 去掉了访问外网的异步
---
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 184 ++++++++-------------------------------------
1 files changed, 33 insertions(+), 151 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index 1c52a82..561bff8 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -85,6 +85,7 @@
/// <para>鎸佺画鏁版嵁涓婃姤(MomentStatus=0 TriggerZoneStatus>=1锛滄姤璀︼紴 TriggerZoneStatus=0锛滃彇娑堟姤璀︼紴)</para>
/// <para>21: Door/Window 闂ㄧ獥浼犳劅鍣紙鏈�21鍜�22锛岃繖閲屾病鏈夊啓閿欙級</para>
/// <para>22:Door/Window 闂ㄧ獥浼犳劅鍣紙鏈�21鍜�22锛岃繖閲屾病鏈夊啓閿�</para>
+ /// <para>541 鐞冨瀷绉诲姩浼犳劅鍣�</para>
/// </summary>
public int IasDeviceType;
/// <summary>
@@ -199,12 +200,12 @@
{
return null;
}
- var gateWay = ZbGateway.GateWayList.Find(obj => (obj != null) && (obj.getGatewayBaseInfo != null) && (obj.getGatewayBaseInfo.gwID == CurrentGateWayId));
+ var gateWay = ZbGateway.GateWayList.Find(obj => (obj != null) && (obj.GwId == CurrentGateWayId));
if (gateWay == null)
{
gateWay = new ZbGateway { IsVirtual = true, };
- gateWay.getGatewayBaseInfo.gwID = CurrentGateWayId;
- gateWay.getGatewayBaseInfo.HomeId = Shared.Common.Config.Instance.HomeId;
+ gateWay.GwId = CurrentGateWayId;
+ gateWay.HomeId = Shared.Common.Config.Instance.HomeId;
ZbGateway.GateWayList.Add(gateWay);
}
@@ -248,9 +249,21 @@
{
device = Newtonsoft.Json.JsonConvert.DeserializeObject<ToggleLight>(strDeviceByte);
}
+ else if (strDeviceType == ZigBee.Device.DeviceType.ColorDimmerSwitch.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<ColorDimmerSwitch>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.LevelControlSwitch.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<LevelControlSwitch>(strDeviceByte);
+ }
else if (strDeviceType == ZigBee.Device.DeviceType.WindowCoveringDevice.ToString())
{
device = Newtonsoft.Json.JsonConvert.DeserializeObject<Rollershade>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.WindowCoveringController.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<WindowCoveringController>(strDeviceByte);
}
else if (strDeviceType == ZigBee.Device.DeviceType.OnOffSwitch.ToString())
{
@@ -299,6 +312,14 @@
else if (strDeviceType == ZigBee.Device.DeviceType.PMSensor.ToString())
{
return Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.ColorTemperatureLight.ToString())
+ {
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<ColorTemperatureLight>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.Buzzer.ToString())
+ {
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<Buzzer>(strDeviceByte);
}
else { return null; }
//鑳藉皯瀛樹竴涓彉閲忓氨灏戝瓨涓�涓�
@@ -369,6 +390,11 @@
{
//璋冨厜鍣�
IconPath = "Device/Light.png";
+ }
+ else if (this.Type == DeviceType.ColorTemperatureLight)
+ {
+ //鑹叉俯鐏�
+ IconPath = "Device/ColorLightTemperature.png";
}
else if (this.Type == DeviceType.OnOffOutput)
{
@@ -662,6 +688,10 @@
/// 濂藉儚鏄簭鍒楀彿
/// </summary>
public string ProductCode = string.Empty;
+ /// <summary>
+ /// 璁惧鍔熻兘绫诲瀷(绌烘皵寮�鍏冲拰缁х數鍣ㄤ笓鐢�)
+ /// </summary>
+ public int FunctionType = -1;
/// <summary>
/// 杈撳叆绨囧垪琛�
/// </summary>
@@ -748,80 +778,6 @@
#endregion
#region 淇敼璁惧绔彛鍚嶇О
- ///<summary >
- /// 淇敼璁惧绔彛锛堟寜閿級鍚嶇О
- /// <para>Gateway:璁惧鎵�灞炵綉鍏筹紙璋冪敤鏂规硶锛歞evice.Gateway)</para>
- /// <para>deviceName:鎸夐敭鍚嶇О</para>
- /// </summary>
- public async System.Threading.Tasks.Task<DeviceRenameAllData> RenameDeviceNameAsync(string deviceAddr, int deviceEpoint, string deviceName)
- {
- if (Gateway == null)
- {
- return null;
- }
- return await System.Threading.Tasks.Task.Run(async () =>
- {
- DeviceRenameAllData d = null;
- Action<string, string> action = (topic, message) =>
- {
- var gatewayID = topic.Split('/')[0];
- var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
-
- if (topic == gatewayID + "/" + "Error_Respon")
- {
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
-
- if (temp == null)
- {
- d = new DeviceRenameAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
- }
- else
- {
- d = new DeviceRenameAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
- }
- }
-
- if (topic == gatewayID + "/" + "DeviceRenameRespon")
- {
- var receiptData = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceRenameResponseData>(jobject["Data"].ToString());
- d = new DeviceRenameAllData { deviceRenameData = receiptData };
- }
- };
- Gateway.Actions += action;
- System.Console.WriteLine("DeviceRename_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
- try
- {
- var bytes = new byte[64];
- var reamarkGwBytes = Encoding.UTF8.GetBytes(deviceName);
- System.Array.Copy(reamarkGwBytes, 0, bytes, 0, 64 < reamarkGwBytes.Length ? 64 : reamarkGwBytes.Length);
- deviceName = Encoding.UTF8.GetString(bytes);
-
- var jObject = new JObject { { "DeviceAddr", deviceAddr }, { "Epoint", deviceEpoint }, { "Cluster_ID", 0 }, { "Command", 96 } };
- var data = new JObject { { "DeviceName", deviceName } };
- jObject.Add("Data", data);
- Gateway?.Send(("DeviceRename"), jObject.ToString());
- }
- catch { }
-
- var dateTime = DateTime.Now;
- while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
- {
- await System.Threading.Tasks.Task.Delay(10);
- if (d != null)
- {
- break;
- }
- }
- if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
- {
- d = new DeviceRenameAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
- }
-
- Gateway.Actions -= action;
- System.Console.WriteLine("DeviceRename_Actions閫�鍑�" + System.DateTime.Now.ToString());
- return d;
- });
- }
/// <summary>
/// 閲嶅懡鍚嶈澶�,缃戝叧鍙嶉鍏蜂綋淇℃伅
@@ -863,80 +819,6 @@
#endregion
#region 淇敼璁惧mac鍚嶇О
- ///<summary >
- /// 淇敼璁惧mac鍚嶇О
- /// <para>macName:璁惧鍚嶇О</para>
- /// </summary>
- public async System.Threading.Tasks.Task<RenameDeviceMacNameAllData> RenameDeviceMacNameAsync(string deviceAddr, int deviceEpoint, string macName)
- {
- if (Gateway == null)
- {
- return null;
- }
- return await System.Threading.Tasks.Task.Run(async () =>
- {
- RenameDeviceMacNameAllData d = null;
- Action<string, string> action = (topic, message) =>
- {
- var gatewayID = topic.Split('/')[0];
- var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
-
- if (topic == gatewayID + "/" + "Error_Respon")
- {
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
-
- if (temp == null)
- {
- d = new RenameDeviceMacNameAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
- }
- else
- {
- d = new RenameDeviceMacNameAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
- }
- }
-
- if (topic == gatewayID + "/" + "MacRename_Respon")
- {
- var deviceID = jobject.Value<int>("Device_ID");
- d = new RenameDeviceMacNameAllData { renameDeviceMacNameData = Newtonsoft.Json.JsonConvert.DeserializeObject<ToggleLight.RenameDeviceMacNameData>(jobject["Data"].ToString()) };
- }
- };
- Gateway.Actions += action;
- System.Console.WriteLine("MacRename_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
- try
- {
- var bytes = new byte[64];
- var reamarkGwBytes = Encoding.UTF8.GetBytes(macName);
- System.Array.Copy(reamarkGwBytes, 0, bytes, 0, 64 < reamarkGwBytes.Length ? 64 : reamarkGwBytes.Length);
- macName = Encoding.UTF8.GetString(bytes);
-
- var jObject = new JObject { { "DeviceAddr", deviceAddr }, { "Epoint", deviceEpoint }, { "Cluster_ID", 0 }, { "Command", 100 } };
- var data = new JObject { { "MacName", macName } };
- jObject.Add("Data", data);
- Gateway?.Send(("MacRename"), jObject.ToString());
- }
- catch { }
-
- var dateTime = DateTime.Now;
- while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
- {
- await System.Threading.Tasks.Task.Delay(10);
- if (d != null)
- {
- break;
- }
- }
-
- if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
- {
- d = new RenameDeviceMacNameAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
- }
-
- Gateway.Actions -= action;
- System.Console.WriteLine("MacRename_Action閫�鍑�" + System.DateTime.Now.ToString());
- return d;
- });
- }
/// <summary>
/// 淇敼璁惧mac鍚嶇О鏁版嵁,缃戝叧鍙嶉鍏蜂綋淇℃伅
--
Gitblit v1.8.0