From e6692890b94c885a98f090848d6ebdff72328632 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 12 五月 2020 11:05:31 +0800
Subject: [PATCH] 2020-5-12-1
---
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 993 ----------------------------------------------------------
1 files changed, 5 insertions(+), 988 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index 0f6dec7..e77d781 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -6,11 +6,15 @@
{
public class ZbGatewayData : CommonDevice
{
- #region 缃戝叧鍦ㄧ嚎鏍囪瘑
+ #region 鏂拌拷鍔犵殑涓�浜涘彉閲�
/// <summary>
/// 鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎鐨勬爣璇嗭紝APP鐣岄潰浼氭敼鍙樺畠鐨勫��,Application浼氶噸鏂板埛鏂板畠鐨勫��
/// </summary>
public bool GatewayOnlineFlage = false;
+ /// <summary>
+ /// 缃戝叧鎵�鍦ㄧ殑鎴块棿ID
+ /// </summary>
+ public string RoomId = string.Empty;
#endregion
@@ -437,355 +441,6 @@
public string gwID;
}
- #endregion
-
- #region 鑾峰彇鎵�鏈夌綉鍏崇殑鑺傜偣璁惧淇℃伅锛堢敤浜庝富缃戝叧锛�
- ///// <summary>
- ///// 鑾峰彇鎵�鏈夌綉鍏崇殑鑺傜偣璁惧淇℃伅锛堢敤浜庝富缃戝叧锛�
- ///// </summary>
- //public static async System.Threading.Tasks.Task<List<CommonDevice>> GetAllGatewayDeviceInfoList()
- //{
- // if (ZbGateway.MainGateWay == null)
- // {
- // return null;
- // }
- // ZbGateway.MainGateWay.AllGatewayDeviceList.Clear();
- // return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<CommonDevice>>>)(async () =>
- // {
- // var dateTime = DateTime.Now;
- // Action<string, string> action = (topic, message) =>
- // {
-
- // var gatewayID = topic.Split('/')[0];
- // var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
- // if (topic == gatewayID + "/" + "DeviceInfoRespon")
- // {
- // dateTime = DateTime.Now;
- // var deviceID = jobject.Value<int>("Device_ID");
- // switch ((DeviceType)(deviceID))
- // {
- // case DeviceType.ColorDimmableLight:
- // var dimmableLight = new ColorDimmableLight() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID") };
- // dimmableLight.getAllGatewayDeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ColorDimmableLight.AllGatewayDeviceInfo>(jobject["Data"].ToString());
- // if (dimmableLight.getAllGatewayDeviceInfo == null)
- // {
- // return;
- // }
- // dimmableLight.CurrentGateWayId = dimmableLight.getAllGatewayDeviceInfo.GwId;
- // var light = ZbGateway.MainGateWay.AllGatewayDeviceList.Find(obj => obj.DeviceID == dimmableLight.DeviceID && obj.DeviceAddr == dimmableLight.DeviceAddr && obj.DeviceEpoint == dimmableLight.DeviceEpoint);
- // if (light == null)
- // {
- // ZbGateway.MainGateWay.AllGatewayDeviceList.Add(dimmableLight);
- // dimmableLight.DeviceName = dimmableLight.getAllGatewayDeviceInfo.MacName;
- // dimmableLight.DeviceEpointName = dimmableLight.getAllGatewayDeviceInfo.DeviceName;
- // dimmableLight.ImgVersion = dimmableLight.getAllGatewayDeviceInfo.ImgVersion;
- // dimmableLight.IsOnline = dimmableLight.getAllGatewayDeviceInfo.IsOnline;
- // dimmableLight.IasDeviceType = dimmableLight.getAllGatewayDeviceInfo.DeviceType;
- // dimmableLight.Profile = dimmableLight.getAllGatewayDeviceInfo.Profile;
- // dimmableLight.ImgTypeId = dimmableLight.getAllGatewayDeviceInfo.ImgTypeId;
- // dimmableLight.InClusterList = dimmableLight.getAllGatewayDeviceInfo.InClusterList;
- // dimmableLight.OutClusterList = dimmableLight.getAllGatewayDeviceInfo.OutClusterList;
- // dimmableLight.AttributeStatus = dimmableLight.getAllGatewayDeviceInfo.AttributeStatus;
- // dimmableLight.Save();
- // }
- // else
- // {
- // light.getAllGatewayDeviceInfo = dimmableLight.getAllGatewayDeviceInfo;
- // light.DeviceName = dimmableLight.getAllGatewayDeviceInfo.MacName;
- // light.DeviceEpointName = dimmableLight.getAllGatewayDeviceInfo.DeviceName;
- // light.ImgVersion = dimmableLight.getAllGatewayDeviceInfo.ImgVersion;
- // light.IsOnline = dimmableLight.getAllGatewayDeviceInfo.IsOnline;
- // light.IasDeviceType = dimmableLight.getAllGatewayDeviceInfo.DeviceType;
- // light.Profile = dimmableLight.getAllGatewayDeviceInfo.Profile;
- // light.ImgTypeId = dimmableLight.getAllGatewayDeviceInfo.ImgTypeId;
- // light.InClusterList = dimmableLight.getAllGatewayDeviceInfo.InClusterList;
- // light.OutClusterList = dimmableLight.getAllGatewayDeviceInfo.OutClusterList;
- // light.AttributeStatus = dimmableLight.getAllGatewayDeviceInfo.AttributeStatus;
- // light.ReSave();
- // }
- // System.Console.WriteLine($"鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
-
- // break;
- // case DeviceType.OnOffOutput:
- // var toggleLight = new ToggleLight() { Time = jobject.Value<int>("Time"), DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID") };
- // toggleLight.getAllGatewayDeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ToggleLight.AllGatewayDeviceInfo>(jobject["Data"].ToString());
- // if (toggleLight.getAllGatewayDeviceInfo == null)
- // {
- // return;
- // }
- // toggleLight.CurrentGateWayId = toggleLight.getAllGatewayDeviceInfo.GwId;
-
- // var localToggleLight = ZbGateway.MainGateWay.AllGatewayDeviceList.Find(obj => obj.DeviceID == toggleLight.DeviceID && obj.DeviceAddr == toggleLight.DeviceAddr && obj.DeviceEpoint == toggleLight.DeviceEpoint);
- // if (localToggleLight == null)
- // {
- // toggleLight.DeviceName = toggleLight.getAllGatewayDeviceInfo.MacName;
- // toggleLight.DeviceEpointName = toggleLight.getAllGatewayDeviceInfo.DeviceName;
- // toggleLight.ImgVersion = toggleLight.getAllGatewayDeviceInfo.ImgVersion;
- // toggleLight.IsOnline = toggleLight.getAllGatewayDeviceInfo.IsOnline;
- // toggleLight.IasDeviceType = toggleLight.getAllGatewayDeviceInfo.DeviceType;
- // toggleLight.Profile = toggleLight.getAllGatewayDeviceInfo.Profile;
- // toggleLight.ImgTypeId = toggleLight.getAllGatewayDeviceInfo.ImgTypeId;
- // toggleLight.InClusterList = toggleLight.getAllGatewayDeviceInfo.InClusterList;
- // toggleLight.OutClusterList = toggleLight.getAllGatewayDeviceInfo.OutClusterList;
- // toggleLight.AttributeStatus = toggleLight.getAllGatewayDeviceInfo.AttributeStatus;
- // ZbGateway.MainGateWay.AllGatewayDeviceList.Add(toggleLight);
- // toggleLight.Save();
-
- // }
- // else
- // {
- // localToggleLight.getAllGatewayDeviceInfo = toggleLight.getAllGatewayDeviceInfo;
- // localToggleLight.DeviceName = toggleLight.getAllGatewayDeviceInfo.MacName;
- // localToggleLight.DeviceEpointName = toggleLight.getAllGatewayDeviceInfo.DeviceName;
- // localToggleLight.ImgVersion = toggleLight.getAllGatewayDeviceInfo.ImgVersion;
- // localToggleLight.IsOnline = toggleLight.getAllGatewayDeviceInfo.IsOnline;
- // localToggleLight.IasDeviceType = toggleLight.getAllGatewayDeviceInfo.DeviceType;
- // localToggleLight.Profile = toggleLight.getAllGatewayDeviceInfo.Profile;
- // localToggleLight.ImgTypeId = toggleLight.getAllGatewayDeviceInfo.ImgTypeId;
- // localToggleLight.InClusterList = toggleLight.getAllGatewayDeviceInfo.InClusterList;
- // localToggleLight.OutClusterList = toggleLight.getAllGatewayDeviceInfo.OutClusterList;
- // localToggleLight.AttributeStatus = toggleLight.getAllGatewayDeviceInfo.AttributeStatus;
- // localToggleLight.ReSave();
- // }
- // System.Console.WriteLine($"鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
-
- // break;
- // case DeviceType.OnOffSwitch:
- // var panel = new Panel() { Time = jobject.Value<int>("Time"), DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID") };
- // panel.getAllGatewayDeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<Panel.AllGatewayDeviceInfo>(jobject["Data"].ToString());
- // if (panel.getAllGatewayDeviceInfo == null)
- // {
- // return;
- // }
- // panel.CurrentGateWayId = panel.getAllGatewayDeviceInfo.GwId;
-
- // var localPanel = ZbGateway.MainGateWay.AllGatewayDeviceList.Find(obj => obj.DeviceID == panel.DeviceID && obj.DeviceAddr == panel.DeviceAddr && obj.DeviceEpoint == panel.DeviceEpoint);
- // if (localPanel == null)
- // {
- // panel.DeviceName = panel.getAllGatewayDeviceInfo.MacName;
- // panel.DeviceEpointName = panel.getAllGatewayDeviceInfo.DeviceName;
- // panel.ImgVersion = panel.getAllGatewayDeviceInfo.ImgVersion;
- // panel.IsOnline = panel.getAllGatewayDeviceInfo.IsOnline;
- // panel.IasDeviceType = panel.getAllGatewayDeviceInfo.DeviceType;
- // panel.Profile = panel.getAllGatewayDeviceInfo.Profile;
- // panel.ImgTypeId = panel.getAllGatewayDeviceInfo.ImgTypeId;
- // panel.InClusterList = panel.getAllGatewayDeviceInfo.InClusterList;
- // panel.OutClusterList = panel.getAllGatewayDeviceInfo.OutClusterList;
- // panel.AttributeStatus = panel.getAllGatewayDeviceInfo.AttributeStatus;
- // if (panel.DeviceAddr != null)
- // {
- // ZbGateway.MainGateWay.AllGatewayDeviceList.Add(panel);
- // }
- // panel.Save();
- // }
- // else
- // {
- // localPanel.getAllGatewayDeviceInfo = panel.getAllGatewayDeviceInfo;
- // localPanel.DeviceName = panel.getAllGatewayDeviceInfo.MacName;
- // localPanel.DeviceEpointName = panel.getAllGatewayDeviceInfo.DeviceName;
- // localPanel.ImgVersion = panel.getAllGatewayDeviceInfo.ImgVersion;
- // localPanel.IsOnline = panel.getAllGatewayDeviceInfo.IsOnline;
- // localPanel.IasDeviceType = panel.getAllGatewayDeviceInfo.DeviceType;
- // localPanel.Profile = panel.getAllGatewayDeviceInfo.Profile;
- // localPanel.ImgTypeId = panel.getAllGatewayDeviceInfo.ImgTypeId;
- // localPanel.InClusterList = panel.getAllGatewayDeviceInfo.InClusterList;
- // localPanel.OutClusterList = panel.getAllGatewayDeviceInfo.OutClusterList;
- // localPanel.AttributeStatus = panel.getAllGatewayDeviceInfo.AttributeStatus;
- // localPanel.ReSave();
- // }
- // System.Console.WriteLine($"鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
-
- // break;
- // case DeviceType.WindowCoveringDevice:
- // var windowCovering = new Rollershade() { DeviceID = jobject.Value<int>((object)"Device_ID"), DeviceAddr = jobject.Value<string>((object)"DeviceAddr"), DeviceEpoint = jobject.Value<int>((object)"Epoint"), DataID = jobject.Value<int>((object)"Data_ID") };
- // windowCovering.getAllGatewayDeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<Rollershade.AllGatewayDeviceInfo>(jobject["Data"].ToString());
- // if (windowCovering.getAllGatewayDeviceInfo == null)
- // {
- // return;
- // }
- // windowCovering.CurrentGateWayId = windowCovering.getAllGatewayDeviceInfo.GwId;
-
- // var wc = ZbGateway.MainGateWay.AllGatewayDeviceList.Find(obj => obj.DeviceID == windowCovering.DeviceID && obj.DeviceAddr == windowCovering.DeviceAddr && obj.DeviceEpoint == windowCovering.DeviceEpoint);
- // if (wc == null)
- // {
- // windowCovering.DeviceName = windowCovering.getAllGatewayDeviceInfo.MacName;
- // windowCovering.DeviceEpointName = windowCovering.getAllGatewayDeviceInfo.DeviceName;
- // windowCovering.ImgVersion = windowCovering.getAllGatewayDeviceInfo.ImgVersion;
- // windowCovering.IsOnline = windowCovering.getAllGatewayDeviceInfo.IsOnline;
- // windowCovering.IasDeviceType = windowCovering.getAllGatewayDeviceInfo.DeviceType;
- // windowCovering.Profile = windowCovering.getAllGatewayDeviceInfo.Profile;
- // windowCovering.ImgTypeId = windowCovering.getAllGatewayDeviceInfo.ImgTypeId;
- // windowCovering.InClusterList = windowCovering.getAllGatewayDeviceInfo.InClusterList;
- // windowCovering.OutClusterList = windowCovering.getAllGatewayDeviceInfo.OutClusterList;
- // windowCovering.AttributeStatus = windowCovering.getAllGatewayDeviceInfo.AttributeStatus;
- // ZbGateway.MainGateWay.AllGatewayDeviceList.Add(windowCovering);
- // windowCovering.Save();
-
- // }
- // else
- // {
- // wc.getAllGatewayDeviceInfo = windowCovering.getAllGatewayDeviceInfo;
- // wc.DeviceName = windowCovering.getAllGatewayDeviceInfo.MacName;
- // wc.DeviceEpointName = windowCovering.getAllGatewayDeviceInfo.DeviceName;
- // wc.ImgVersion = windowCovering.getAllGatewayDeviceInfo.ImgVersion;
- // wc.IsOnline = windowCovering.getAllGatewayDeviceInfo.IsOnline;
- // wc.IasDeviceType = windowCovering.getAllGatewayDeviceInfo.DeviceType;
- // wc.Profile = windowCovering.getAllGatewayDeviceInfo.Profile;
- // wc.ImgTypeId = windowCovering.getAllGatewayDeviceInfo.ImgTypeId;
- // wc.InClusterList = windowCovering.getAllGatewayDeviceInfo.InClusterList;
- // wc.OutClusterList = windowCovering.getAllGatewayDeviceInfo.OutClusterList;
- // wc.AttributeStatus = windowCovering.getAllGatewayDeviceInfo.AttributeStatus;
- // wc.ReSave();
- // }
- // System.Console.WriteLine($"鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
-
- // break;
- // case DeviceType.IASZone:
- // var ias = new IASZone() { Time = jobject.Value<int>("Time"), DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID") };
- // ias.getAllGatewayDeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<IASZone.AllGatewayDeviceInfo>(jobject["Data"].ToString());
- // if (ias.getAllGatewayDeviceInfo == null)
- // {
- // return;
- // }
- // ias.CurrentGateWayId = ias.getAllGatewayDeviceInfo.GwId;
-
- // var infoIAS = ZbGateway.MainGateWay.AllGatewayDeviceList.Find(obj => obj.DeviceID == ias.DeviceID && obj.DeviceAddr == ias.DeviceAddr && obj.DeviceEpoint == ias.DeviceEpoint);
- // if (infoIAS == null)
- // {
- // ZbGateway.MainGateWay.AllGatewayDeviceList.Add(ias);
- // ias.DeviceName = ias.getAllGatewayDeviceInfo.MacName;
- // ias.DeviceEpointName = ias.getAllGatewayDeviceInfo.DeviceName;
- // ias.ImgVersion = ias.getAllGatewayDeviceInfo.ImgVersion;
- // ias.IsOnline = ias.getAllGatewayDeviceInfo.IsOnline;
- // ias.IasDeviceType = ias.getAllGatewayDeviceInfo.DeviceType;
- // ias.Profile = ias.getAllGatewayDeviceInfo.Profile;
- // ias.ImgTypeId = ias.getAllGatewayDeviceInfo.ImgTypeId;
- // ias.InClusterList = ias.getAllGatewayDeviceInfo.InClusterList;
- // ias.OutClusterList = ias.getAllGatewayDeviceInfo.OutClusterList;
- // ias.AttributeStatus = ias.getAllGatewayDeviceInfo.AttributeStatus;
- // ias.Save();
- // }
- // else
- // {
- // infoIAS.DeviceName = ias.getAllGatewayDeviceInfo.MacName;
- // infoIAS.DeviceEpointName = ias.getAllGatewayDeviceInfo.DeviceName;
- // infoIAS.getAllGatewayDeviceInfo = ias.getAllGatewayDeviceInfo;
- // infoIAS.ImgVersion = ias.getAllGatewayDeviceInfo.ImgVersion;
- // infoIAS.IsOnline = ias.getAllGatewayDeviceInfo.IsOnline;
- // infoIAS.IasDeviceType = ias.getAllGatewayDeviceInfo.DeviceType;
- // infoIAS.Profile = ias.getAllGatewayDeviceInfo.Profile;
- // infoIAS.ImgTypeId = ias.getAllGatewayDeviceInfo.ImgTypeId;
- // infoIAS.InClusterList = ias.getAllGatewayDeviceInfo.InClusterList;
- // infoIAS.OutClusterList = ias.getAllGatewayDeviceInfo.OutClusterList;
- // infoIAS.AttributeStatus = ias.getAllGatewayDeviceInfo.AttributeStatus;
- // ias.ReSave();
- // }
- // System.Console.WriteLine($"鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- // break;
- // case DeviceType.OtaDevice:
- // case DeviceType.OtaPanelDevice:
- // var ota = new OTADevice() { Time = jobject.Value<int>("Time"), DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID") };
- // ota.getAllGatewayDeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<AllGatewayDeviceInfo>(jobject["Data"].ToString());
- // if (ota.getAllGatewayDeviceInfo == null)
- // {
- // return;
- // }
- // ota.CurrentGateWayId = ota.getAllGatewayDeviceInfo.GwId;
-
- // var infoOta = ZbGateway.MainGateWay.AllGatewayDeviceList.Find(obj => obj.DeviceID == ota.DeviceID && obj.DeviceAddr == ota.DeviceAddr && obj.DeviceEpoint == ota.DeviceEpoint);
- // if (infoOta == null)
- // {
- // ZbGateway.MainGateWay.AllGatewayDeviceList.Add(ota);
- // ota.DeviceName = ota.getAllGatewayDeviceInfo.MacName;
- // ota.DeviceEpointName = ota.getAllGatewayDeviceInfo.DeviceName;
- // ota.ImgVersion = ota.getAllGatewayDeviceInfo.ImgVersion;
- // ota.IsOnline = ota.getAllGatewayDeviceInfo.IsOnline;
- // ota.IasDeviceType = ota.getAllGatewayDeviceInfo.DeviceType;
- // ota.Profile = ota.getAllGatewayDeviceInfo.Profile;
- // ota.ImgTypeId = ota.getAllGatewayDeviceInfo.ImgTypeId;
- // ota.InClusterList = ota.getAllGatewayDeviceInfo.InClusterList;
- // ota.OutClusterList = ota.getAllGatewayDeviceInfo.OutClusterList;
- // ota.AttributeStatus = ota.getAllGatewayDeviceInfo.AttributeStatus;
- // ota.Save();
- // }
- // else
- // {
- // infoOta.DeviceName = ota.getAllGatewayDeviceInfo.MacName;
- // infoOta.DeviceEpointName = ota.getAllGatewayDeviceInfo.DeviceName;
- // infoOta.getAllGatewayDeviceInfo = ota.getAllGatewayDeviceInfo;
- // infoOta.ImgVersion = ota.getAllGatewayDeviceInfo.ImgVersion;
- // infoOta.IsOnline = ota.getAllGatewayDeviceInfo.IsOnline;
- // infoOta.IasDeviceType = ota.getAllGatewayDeviceInfo.DeviceType;
- // infoOta.Profile = ota.getAllGatewayDeviceInfo.Profile;
- // infoOta.ImgTypeId = ota.getAllGatewayDeviceInfo.ImgTypeId;
- // infoOta.InClusterList = ota.getAllGatewayDeviceInfo.InClusterList;
- // infoOta.OutClusterList = ota.getAllGatewayDeviceInfo.OutClusterList;
- // infoOta.AttributeStatus = ota.getAllGatewayDeviceInfo.AttributeStatus;
- // ota.ReSave();
- // }
- // System.Console.WriteLine($"鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- // break;
- // //case DeviceType.Thermostat:
- // //var thermostat = new ThermostatObj() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo.gwID };
- // //thermostat.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ThermostatObj.DeviceInfoData>(jobject["Data"].ToString());
- // //if (thermostat.DeviceInfo == null)
- // //{
- // // return;
- // //}
- // // var ther = ZbGateway.MainGateWay.AllGatewayDeviceList.Find(obj => obj.DeviceID == thermostat.DeviceID && obj.DeviceAddr == thermostat.DeviceAddr && obj.DeviceEpoint == thermostat.DeviceEpoint);
- // //if (ther == null)
- // //{
- // // thermostat.DeviceName = thermostat.DeviceInfo.DeviceName;
- // // ZbGateway.MainGateWay.AllGatewayDeviceList.Add(thermostat);
- // //}
- // //else
- // //{
- // // thermostat.DeviceName = thermostat.DeviceInfo.DeviceName;
- // // ZigBee.IO.LocalFileUtils.SaveDeviceInfo(thermostat, thermostat.DeviceEpoint.ToString());
- // //}
- // //break;
- // //case DeviceType.TemperatureSensor:
- // // var temperatureSensor = new TemperatureSensor() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo.gwID };
- // // temperatureSensor.DeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<TemperatureSensor.DeviceInfoData>(jobject["Data"].ToString());
- // // if (temperatureSensor.DeviceInfo == null)
- // // {
- // // return;
- // // }
- // // var ts = ZbGateway.MainGateWay.AllGatewayDeviceList.Find(obj => obj.DeviceID == temperatureSensor.DeviceID && obj.DeviceAddr == temperatureSensor.DeviceAddr && obj.DeviceEpoint == temperatureSensor.DeviceEpoint);
- // // if (ts == null)
- // // {
- // // temperatureSensor.DeviceName = temperatureSensor.DeviceInfo.DeviceName;
- // // ZbGateway.MainGateWay.AllGatewayDeviceList.Add(temperatureSensor);
-
- // // }
- // // else
- // // {
- // // temperatureSensor.DeviceName = temperatureSensor.DeviceInfo.DeviceName;
- // // IO.LocalFileUtils.SaveDeviceInfo(temperatureSensor, temperatureSensor.DeviceEpoint.ToString());
- // // }
- // // break;
-
- // }
- // }
- // };
-
- // ZbGateway.MainGateWay.Actions += action;
- // System.Console.WriteLine("MainGatewayDeviceInfo_Actions 鍚姩" + System.DateTime.Now.ToString());
-
- // var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 90 } };
- // ZbGateway.MainGateWay.CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo?.gwID;
- // ZbGateway.MainGateWay.Send("GetAllDeviceInfo", Common.SecuritySet.Encryption(jObject.ToString()));
-
- // while ((DateTime.Now - dateTime).TotalMilliseconds < 4000)
- // {
- // await System.Threading.Tasks.Task.Delay(100);
- // }
-
- // ZbGateway.MainGateWay.Actions -= action;
- // System.Console.WriteLine("MainGatewayDeviceInfo_Actions 閫�鍑�" + System.DateTime.Now.ToString());
- // return ZbGateway.MainGateWay.AllGatewayDeviceList;
- // }));
- //}
#endregion
#region 缃戝叧鎭㈠鍑哄巶璁剧疆
@@ -1236,414 +891,6 @@
}
#endregion
- //#region 鑾峰彇鍗忚皟鍣ㄨ幏鍙栧崗璋冨櫒褰撳墠鍙戝皠鍔熺巼.
- /////<summary >
- ///// 鑾峰彇鍗忚皟鍣ㄨ幏鍙栧崗璋冨櫒褰撳墠鍙戝皠鍔熺巼
- ///// </summary>
- //public static async System.Threading.Tasks.Task<GwGetPowerResponData> GetPowerAsync(ZigBee.Device.ZbGateway gateway)
- //{
- // if (gateway == null)
- // {
- // return null;
- // }
- // return await System.Threading.Tasks.Task.Run(async () =>
- // {
- // GwGetPowerResponData 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 gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
-
- // if (temp == null)
- // {
- // d = new GwGetPowerResponData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
- // }
- // else
- // {
- // d = new GwGetPowerResponData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
-
- // }
- // }
-
- // if (topic == gatewayID + "/" + "ZbGw/GetPower_Respon")
- // {
- // var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- // var power = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Power"].ToString());
-
- // if (power == 0)
- // {
- // d = new GwGetPowerResponData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
- // }
- // else
- // {
- // d = new GwGetPowerResponData { power = power };
- // DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- // }
- // }
- // };
-
- // gateway.Actions += action;
- // System.Console.WriteLine("GetPower_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
-
- // var jObject = new JObject { { "Cluster_ID", 64512 }, { "Command", 10 } };
- // gateway.Send(("ZbGw/GetPower"), Common.SecuritySet.Encryption((jObject.ToString())));
-
- // var dateTime = DateTime.Now;
- // while ((DateTime.Now - dateTime).TotalMilliseconds < 1000)
- // {
- // await System.Threading.Tasks.Task.Delay(10);
- // if (d != null)
- // {
- // break;
- // }
- // }
- // if ((DateTime.Now - dateTime).TotalMilliseconds > 1000)
- // {
- // d = new GwGetPowerResponData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
-
- // }
- // gateway.Actions -= action;
- // System.Console.WriteLine("GetPower_Actions 閫�鍑�" + "_" + System.DateTime.Now.ToString());
-
- // return d;
- // });
- //}
-
- ///// <summary>
- ///// 鑾峰彇鍗忚皟鍣ㄨ幏鍙栧崗璋冨櫒褰撳墠鍙戝皠鍔熺巼,缃戝叧鍙嶉鍏蜂綋淇℃伅
- ///// </summary>
- //public GwGetPowerResponData gwGetPowerResponData;
- ///// <summary>
- ///// 鑾峰彇鍗忚皟鍣ㄨ幏鍙栧崗璋冨櫒褰撳墠鍙戝皠鍔熺巼,缃戝叧鍙嶉鍏蜂綋淇℃伅
- ///// </summary>
- //[System.Serializable]
- //public class GwGetPowerResponData
- //{
- // /// <summary>
- // /// 閿欒淇℃伅
- // /// </summary>
- // public string errorMessageBase;
- // /// <summary>
- // /// 缃戝叧淇℃伅閿欒鍙嶉
- // /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- // /// </summary>
- // public ErrorResponData errorResponData;
- // /// <summary>
- // /// 鍗忚皟鍣ㄥ彂灏勫姛鐜�
- // /// </summary>
- // public int power = 999;
- //}
-
- //#endregion
-
- //#region 璁剧疆鍙戝皠鍔�.
- /////<summary >
- /////璁剧疆鍙戝皠鍔熺巼
- ///// <para>power:瑕佹洿鏀圭殑璁惧鍙戝皠鍔熺巼锛屽彲璁剧疆8,10,11,13,15,16,18,19,20,21,22(dBm)</para>
- ///// </summary>
- //public static async System.Threading.Tasks.Task<SetPowerResponAllData> GwSetPowerAsync(ZigBee.Device.ZbGateway gateway, int power)
- //{
- // if (gateway == null)
- // {
- // return null;
- // }
- // return await System.Threading.Tasks.Task.Run(async () =>
- // {
- // SetPowerResponAllData 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 gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
-
- // if (temp == null)
- // {
- // d = new SetPowerResponAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
- // }
- // else
- // {
- // d = new SetPowerResponAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
- // }
- // }
-
- // if (topic == gatewayID + "/" + "ZbGw/SetPower_Respon")
- // {
- // var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- // var tempInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<SetPoweResponData>(jobject["Data"].ToString());
-
- // if (tempInfo == null)
- // {
- // d = new SetPowerResponAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
- // }
- // else
- // {
- // d = new SetPowerResponAllData { setPoweResponData = tempInfo };
- // DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- // }
- // }
- // };
-
- // gateway.Actions += action;
- // System.Console.WriteLine("ZbGw/SetPower_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
-
- // var jObject = new JObject { { "Cluster_ID", 64512 }, { "Command", 11 } };
- // var data = new JObject { { "Power", power } };
- // jObject.Add("Data", data);
- // gateway.Send(("ZbGw/SetPower"), Common.SecuritySet.Encryption(jObject.ToString(),Password));
-
- // var dateTime = DateTime.Now;
- // while ((DateTime.Now - dateTime).TotalMilliseconds < 1000)
- // {
- // await System.Threading.Tasks.Task.Delay(10);
- // if (d != null)
- // {
- // break;
- // }
- // }
- // if ((DateTime.Now - dateTime).TotalMilliseconds > 1000)
- // {
- // d = new SetPowerResponAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
- // }
- // gateway.Actions -= action;
- // System.Console.WriteLine("ZbGw/SetPower_Actions閫�鍑�" + "_" + System.DateTime.Now.ToString());
-
- // return d;
- // });
- //}
-
- ///// <summary>
- ///// 璁剧疆鍙戝皠鍔熺巼,缃戝叧鍙嶉鍏蜂綋淇℃伅
- ///// </summary>
- //public SetPowerResponAllData setPoweResponAllData;
- ///// <summary>
- ///// 璁剧疆鍙戝皠鍔熺巼,缃戝叧鍙嶉鍏蜂綋淇℃伅
- ///// </summary>
- //[System.Serializable]
- //public class SetPowerResponAllData
- //{
- // /// <summary>
- // /// 閿欒淇℃伅
- // /// </summary>
- // public string errorMessageBase;
- // /// <summary>
- // /// 缃戝叧淇℃伅閿欒鍙嶉
- // /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- // /// </summary>
- // public ErrorResponData errorResponData;
- // /// <summary>
- // /// 璁剧疆鍙戝皠鍔熺巼鏁版嵁
- // /// </summary>
- // public SetPoweResponData setPoweResponData;
- //}
-
- ///// <summary>
- ///// 璁剧疆鍙戝皠鍔熺巼鏁版嵁
- ///// </summary>
- //public SetPoweResponData setPoweResponData;
- ///// <summary>
- ///// 璁剧疆鍙戝皠鍔熺巼鏁版嵁
- ///// </summary>
- //[System.Serializable]
- //public class SetPoweResponData
- //{
- // /// <summary>
- // /// 鏄惁閰嶇疆鎴愬姛
- // ///<para>0锛氭垚鍔�</para>
- // ///<para>2锛氶厤缃殑淇￠亾涓烘棤鏁堝��</para>
- // /// </summary>
- // public int Status = 999;
- // /// <summary>
- // /// 鍔熺巼
- // /// </summary>
- // public int Power = 999;
- //}
- //#endregion
-
- //#region 璇诲彇褰撳墠灞�鍩熺綉鐨凱ANID.
- /////<summary >
- ///// 璇诲彇褰撳墠灞�鍩熺綉鐨凱ANID
- ///// </summary>
- //public static async System.Threading.Tasks.Task<GetPanIdResponData> ReadPanIdAsync(ZigBee.Device.ZbGateway gateway)
- //{
- // if (gateway == null)
- // {
- // return null;
- // }
- // return await System.Threading.Tasks.Task.Run(async () =>
- // {
- // GetPanIdResponData 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 gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
-
- // if (temp == null)
- // {
- // d = new GetPanIdResponData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
- // }
- // else
- // {
- // d = new GetPanIdResponData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
- // }
- // }
-
- // if (topic == gatewayID + "/" + "ZbGw/GetPanId_Respon")
- // {
- // var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- // var panID = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["PANID"].ToString());
-
- // if (panID == null)
- // {
- // d = new GetPanIdResponData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
-
- // }
- // else
- // {
- // d = new GetPanIdResponData { panID = panID };
- // DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- // }
- // }
- // };
-
- // gateway.Actions += action;
- // System.Console.WriteLine("ZbGw/GetPanId_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
-
- // var jObject = new JObject { { "Cluster_ID", 64512 }, { "Command", 12 } };
- // gateway.Send(("ZbGw/GetPanId"), Common.SecuritySet.Encryption((jObject.ToString())));
-
- // var dateTime = DateTime.Now;
- // while ((DateTime.Now - dateTime).TotalMilliseconds < 1000)
- // {
- // await System.Threading.Tasks.Task.Delay(10);
- // if (d != null)
- // {
- // break;
- // }
- // }
- // if ((DateTime.Now - dateTime).TotalMilliseconds > 1000)
- // {
- // d = new GetPanIdResponData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
- // }
- // gateway.Actions -= action;
- // System.Console.WriteLine("ZbGw/GetPanId_Actions 閫�鍑�" + "_" + System.DateTime.Now.ToString());
-
- // return d;
- // });
- //}
-
- ///// <summary>
- ///// 璇诲彇褰撳墠灞�鍩熺綉鐨凱ANID,缃戝叧鍙嶉鍏蜂綋淇℃伅
- ///// </summary>
- //public GetPanIdResponData getPanIdResponData;
- ///// <summary>
- ///// 璇诲彇褰撳墠灞�鍩熺綉鐨凱ANID,缃戝叧鍙嶉鍏蜂綋淇℃伅
- ///// </summary>
- //[System.Serializable]
- //public class GetPanIdResponData
- //{
- // /// <summary>
- // /// 閿欒淇℃伅
- // /// </summary>
- // public string errorMessageBase;
- // /// <summary>
- // /// 缃戝叧淇℃伅閿欒鍙嶉
- // /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- // /// </summary>
- // public ErrorResponData errorResponData;
- // /// <summary>
- // /// 褰撳墠缃戠粶鐨凱ANID
- // /// </summary>
- // public int panID = 999;
- //}
-
- //#endregion
-
- //#region 璇诲彇鍗忚皟鍣∕AC鍦板潃.
- /////<summary >
- ///// 璇诲彇鍗忚皟鍣∕AC鍦板潃
- ///// </summary>
- //public static async System.Threading.Tasks.Task<GetMacResponData> ReadMacAsync(ZigBee.Device.ZbGateway gateway)
- //{
- // if (gateway == null)
- // {
- // return null;
- // }
- // return await System.Threading.Tasks.Task.Run(async () =>
- // {
- // GetMacResponData 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 gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
-
- // if (temp == null)
- // {
- // d = new GetMacResponData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
- // }
- // else
- // {
- // d = new GetMacResponData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
- // }
- // }
-
- // if (topic == gatewayID + "/" + "ZbGw/GetMac_Respon")
- // {
- // var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- // var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<MacAddrData>(jobject["Data"].ToString());
-
- // if (tempData == null)
- // {
- // d = new GetMacResponData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
- // }
- // else
- // {
- // d = new GetMacResponData { macAddrData = tempData };
- // DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- // }
- // }
- // };
-
- // gateway.Actions += action;
- // var jObject = new JObject { { "Cluster_ID", 64512 }, { "Command", 13 } };
- // gateway.Send(("ZbGw/GetMac"), Common.SecuritySet.Encryption((jObject.ToString())));
-
- // var dateTime = DateTime.Now;
- // while ((DateTime.Now - dateTime).TotalMilliseconds < 1000)
- // {
- // await System.Threading.Tasks.Task.Delay(10);
- // if (d != null)
- // {
- // break;
- // }
- // }
- // if ((DateTime.Now - dateTime).TotalMilliseconds > 10000)
- // {
- // d = new GetMacResponData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
- // }
- // gateway.Actions -= action;
- // return d;
- // });
- //}
-
/// <summary>
/// 璇诲彇鍗忚皟鍣∕AC鍦板潃,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
@@ -1682,108 +929,6 @@
//#endregion
- #region 娣诲姞Install Codes鐮�
- /////<summary >
- /////娣诲姞Install Codes鐮�
- ///// <para>installCode:InstallCode鐮� 36涓瓧绗�</para>
- ///// <para>installCodeAddr:InstallCodes鐮佽澶囩殑mac鍦板潃16涓瓧绗�</para>
- ///// </summary>
- //public static async System.Threading.Tasks.Task<InstallCodeResponData> InstallCodeAsync(ZigBee.Device.ZbGateway gateway, string installCode, string installCodeAddr)
- //{
- // if (gateway == null)
- // {
- // return null;
- // }
- // return await System.Threading.Tasks.Task.Run(async () =>
- // {
- // var d = new InstallCodeResponData { };
- // 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 gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
-
- // if (temp == null)
- // {
- // d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
- // }
- // else
- // {
- // d.errorResponData = temp;
- // d.errorMessageBase = ErrorMess(temp.Error);
- // }
- // }
-
- // if (topic == gatewayID + "/" + "ZbGw/InstallCode_Respon")
- // {
- // var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- // var code = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"].ToString());
-
- // if (code == null)
- // {
- // d.errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�";
- // }
- // else
- // {
- // d.Status = code;
- // DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- // }
- // }
- // };
-
- // gateway.Actions += action;
- // var jObject = new JObject { { "Cluster_ID", 64512 }, { "Command", 13 } };
- // gateway.Send(("ZbGw/GetMac"), Common.SecuritySet.Encryption((jObject.ToString())));
-
- // var dateTime = DateTime.Now;
- // while ((DateTime.Now - dateTime).TotalMilliseconds < 1000)
- // {
- // await System.Threading.Tasks.Task.Delay(10);
- // //if (d.Status != 999)
- // //{
- // // break;
- // //}
- // }
- // if ((DateTime.Now - dateTime).TotalMilliseconds > 1000)
- // {
- // d.errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔";
- // }
- // gateway.Actions -= action;
- // return d;
- // });
- //}
-
- /// <summary>
- /// 娣诲姞Install Codes鐮�,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
- public InstallCodeResponData installCodeResponData;
- /// <summary>
- /// 娣诲姞Install Codes鐮�,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
- [System.Serializable]
- public class InstallCodeResponData
- {
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
- /// <summary>
- /// 0:鎴愬姛锛�1:澶辫触
- /// </summary>
- public int Status = 999;
- }
-
- #endregion
-
#region 鍚敤鎴栧叧闂�忎紶鏁版嵁涓婁紶鎺ュ彛
/// <summary>
/// 閫忎紶鏁版嵁涓婁紶鎺ュ彛,缃戝叧鍙嶉淇℃伅
@@ -1810,134 +955,6 @@
public string passData;
}
#endregion
-
- //#region 鍗忚皟鍣ㄩ�氱敤鍔熻兘鎿嶄綔鎺ュ彛
- ///// <summary>
- ///// 鍗忚皟鍣ㄩ�氱敤鍔熻兘鎿嶄綔鎺ュ彛
- ///// </summary>
- ///// <returns>The or get all data async.</returns>
- ///// <param name="gateway">Gateway.</param>
- ///// <param name="commandID">Command identifier.</param>
- ///// <param name="payload">Payload.</param>
- //public static async System.Threading.Tasks.Task<SetOrGetAllData> SetOrGetAllDataAsync(ZigBee.Device.ZbGateway gateway, int commandID, string payload)
- //{
- // if (gateway == null)
- // {
- // return null;
- // }
- // return await System.Threading.Tasks.Task.Run(async () =>
- // {
- // var d = new SetOrGetAllData { };
- // 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 gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
-
- // if (temp == null)
- // {
- // d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
- // }
- // else
- // {
- // d.errorResponData = temp;
- // d.errorMessageBase = ErrorMess(temp.Error);
- // }
- // }
-
- // if (topic == gatewayID + "/" + "ZbGw/SetOrGetData_Respon")
- // {
- // var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SetOrGetData>(jobject["Data"].ToString());
-
- // if (gatewayTemp.getGwVersion == null)
- // {
- // d.errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�";
- // }
- // else
- // {
- // d.setOrGetData = temp;
- // DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- // }
- // }
- // };
- // gateway.Actions += action;
- // System.Console.WriteLine("ZbDataPassthrough_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
-
- // var jObject = new JObject { { "Cluster_ID", 64512 }, { "Command", 2 } };
- // var data = new JObject { { "Command_ID", commandID }, { "Payload", payload } };
- // jObject.Add("Data", data);
- // gateway.Send("ZbGw/SetOrGetData", Common.SecuritySet.Encryption(jObject.ToString()));
- // var dateTime = DateTime.Now;
- // while ((DateTime.Now - dateTime).TotalMilliseconds < 1000)
- // {
- // await System.Threading.Tasks.Task.Delay(10);
- // if (d.setOrGetData != null)
- // {
- // break;
- // }
- // }
- // if ((DateTime.Now - dateTime).TotalMilliseconds > 10000)
- // {
- // d.errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔";
- // }
- // gateway.Actions -= action;
- // System.Console.WriteLine("GetGwVersionData_Actions 閫�鍑�" + System.DateTime.Now.ToString());
-
- // return d;
- // });
- //}
-
- ///// <summary>
- ///// BDB鎺ュ彛,缃戝叧鍙嶉淇℃伅
- ///// </summary>
- //public SetOrGetAllData setOrGetAllData;
- ///// <summary>
- ///// BDB鎺ュ彛,缃戝叧鍙嶉淇℃伅
- ///// </summary>
- //[System.Serializable]
- //public class SetOrGetAllData
- //{
- // /// <summary>
- // /// 閿欒淇℃伅
- // /// </summary>
- // public string errorMessageBase;
- // /// <summary>
- // /// 缃戝叧淇℃伅閿欒鍙嶉
- // /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- // /// </summary>
- // public ErrorResponData errorResponData;
- // /// <summary>
- // /// BDB鏁版嵁
- // /// </summary>
- // public SetOrGetData setOrGetData;
-
- //}
-
- ///// <summary>
- ///// BDB鏁版嵁
- ///// </summary>
- //public SetOrGetData setOrGetData;
- ///// <summary>
- ///// BDB鏁版嵁
- ///// </summary>
- //[System.Serializable]
- //public class SetOrGetData
- //{
- // /// <summary>
- // /// 鍗忚皟鍣ㄦ寚浠ょ殑command_ID銆傚搴斻�婂崗璋冨櫒涓插彛閫氫俊鍗忚瑙勮寖銆嬬2绔犺妭鎸囦护鐨刢ommand_ID
- // /// </summary>
- // public int commandID;
- // /// <summary>
- // /// 宸茬粡杞崲鎴愬瓧绗︽牸寮忕殑16杩涘埗鐨刣ata鏁版嵁銆傚搴斻�婂崗璋冨櫒涓插彛閫氫俊鍗忚瑙勮寖銆嬬2绔犺妭鎸囦护鐨勨�滄暟鎹�濆唴瀹�
- // /// </summary>
- // public string payload;
- //}
- //#endregion
#region 瀹㈡埛绔彂閫佹枃浠舵祦鍒扮綉鍏�
/// <summary>
--
Gitblit v1.8.0