派生自 ~xm/HomeApp
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> @@ -820,6 +850,109 @@ } #endregion #region 一键更新四寸屏按键属性 /// <summary> /// 同步设备功能 /// </summary> /// <returns></returns> public async System.Threading.Tasks.Task<SynchronizationDeviceResponseAllData> SyncMsgToBindSource(string deviceAddr, int deviceEpoint) { if (Gateway == null) { return null; } return await System.Threading.Tasks.Task.Run(async () => { SynchronizationDeviceResponseAllData resContent = 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) { resContent = new SynchronizationDeviceResponseAllData { errorMessageBase = "网关错误回复，且数据是空" }; } else { resContent = new SynchronizationDeviceResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) }; } } if (topic == gatewayID + "/" + "Bind/SyncMsgToBindSourceRespon") { var res = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString()); if (res == null) { resContent = new SynchronizationDeviceResponseAllData { errorMessageBase = "网关返回的数据为空" }; } else { resContent = new SynchronizationDeviceResponseAllData { result = res }; System.Console.WriteLine($"UI收到通知后的主题_{ topic}"); } } }; Gateway.Actions = action; DebugPrintLog("Bind/SyncMsgToBindSourceRespon_Actions 启动" + "_" + System.DateTime.Now.ToString()); try { var jObject = new JObject { { "DeviceAddr", deviceAddr }, { "Epoint", deviceEpoint }, { "Cluster_ID", 0 }, { "Command", 5010 } }; Gateway.Send("Bind/SyncMsgToBindSource", jObject.ToString()); } catch { } var dateTime = DateTime.Now; while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime) { await System.Threading.Tasks.Task.Delay(10); if (resContent != null) { break; } } if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime) { resContent = new SynchronizationDeviceResponseAllData { errorMessageBase = " 回复超时，请重新操作" }; } Gateway.Actions -= action; DebugPrintLog("Bind/SyncMsgToBindSource_Actions 退出" + System.DateTime.Now.ToString()); return resContent; }); } /// <summary> /// 同步设备,网关反馈具体信息 /// </summary> [System.Serializable] public class SynchronizationDeviceResponseAllData { /// <summary> /// 错误信息 /// </summary> public string errorMessageBase; /// <summary> /// 网关信息错误反馈 /// <para>当网关接收到客户端信息后，出现以下异常情况将反馈错误。</para> /// </summary> public ErrorResponData errorResponData; /// <summary> /// 同步结果 /// 0:成功：网关内部自动写入设备目标名字、设备目标功能类型、场景目标名字、utc时间写入4寸屏 /// 1:失败 /// </summary> public int result; } #endregion #region 删除设备（使设备离网） /// <summary> /// 删除设备（使设备离网） @@ -870,7 +1003,7 @@ } }; Gateway.Actions += action; System.Console.WriteLine("RemoveDevice_Actions 启动" + "_" + System.DateTime.Now.ToString()); DebugPrintLog("RemoveDevice_Actions 启动" + "_" + System.DateTime.Now.ToString()); try { @@ -908,7 +1041,7 @@ d = new RemoveDeviceResponseAllData { errorMessageBase = " 回复超时，请重新操作" }; } Gateway.Actions -= action; System.Console.WriteLine("RemoveDevice_Actions 退出" + System.DateTime.Now.ToString()); DebugPrintLog("RemoveDevice_Actions 退出" + System.DateTime.Now.ToString()); return d; });
