From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
index cc6989d..15d44e8 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
@@ -4,7 +4,7 @@
namespace ZigBee.Device
{
[System.Serializable]
- public class FreshAir : Panel
+ public class FreshAir : CommonDevice
{
/// <summary>
/// 璇ョ被锛堟柊椋庡璞★級鍖呭惈鏂伴璁惧鍜屾柊椋庨潰鏉�
@@ -18,8 +18,9 @@
/// 椋庨�熸ā寮�
/// <para>5:鑷姩</para>
/// <para>6:Smart</para>
- /// <para>7:鎵嬪姩</para>
+ /// <para>15:鎵嬪姩</para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentFanMode = 0;
/// <summary>
/// 椋庨�熸。浣�
@@ -27,12 +28,14 @@
/// <para>2:涓</para>
/// <para>3:楂橀 </para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentFanSpeed = 0;
/// <summary>
/// 椋庢墖鐘舵��
/// <para>0:鍏抽棴 </para>
/// <para>4:鎵撳紑 </para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentFanStatus = 0;
/// <summary>
@@ -109,8 +112,7 @@
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());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -124,7 +126,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_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 tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -224,7 +225,7 @@
/// <summary>
/// 鎵嬪姩
/// </summary>
- Manual = 7,
+ Manual = 15,
}
}
}
--
Gitblit v1.8.0