新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

 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>
        /// 该类（新风对象）包含新风设备和新风面板 
@@ -20,6 +20,7 @@
        /// <para>6:Smart</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)