From 2e7e5f9af5b32cfe1fc3c6ba40bf7eb984bbd0a4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 11 五月 2020 17:52:06 +0800
Subject: [PATCH] ???????
---
ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs | 63 +++++++------------------------
1 files changed, 15 insertions(+), 48 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs
index daed5b8..ac390e4 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs
@@ -4,7 +4,7 @@
namespace ZigBee.Device
{
[System.Serializable]
- public class AC : ThirdPartyModuleUpgrade
+ public class AC : CommonDevice
{
public AC()
{
@@ -14,35 +14,23 @@
/// <summary>
///褰撳墠瀹ゅ唴娓╁害
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentLocalTemperature = 0;
-
/// <summary>
/// 褰撳墠鍔犵儹搴︽暟
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentHeatingSetpoint = 0;
-
/// <summary>
/// 褰撳墠鍒跺喎搴︽暟
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentCoolingSetpoint = 0;
-
/// <summary>
/// 褰撳墠鑷姩娓╁害
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentAutoSetpoint;
-
- /// <summary>
- ///鎭掓俯璁惧绫诲瀷
- /// <para>鎭掓俯璁惧鍏峰鍔熻兘锛孉ttribute Values濡備笅</para>
- /// <para>0:(Cooling Only) 鏃燞eat鍜孍mergency鍔熻兘</para>
- /// <para>1:(Cooling With Reheat)鏃燞eat鍜孍mergency鍔熻兘</para>
- /// <para>2:(Heating Only)鏃燙ool鍜孭recooling鍔熻兘</para>
- /// <para>3:(Heating With Reheat)鏃燙ool鍜孭recooling鍔熻兘</para>
- /// <para>4:(Cooling and Heating 4-pipes)鍙兘鏈夋墍鏈夊姛鑳�</para>
- /// <para>5:(Cooling and Heating 4-pipes with Reheat)鍙兘鏈夋墍鏈夊姛鑳�</para>
- /// </summary>
- public int currentAcType = 0;
-
/// <summary>
/// 鎭掓俯璁惧褰撳墠妯″紡
/// <para>鎭掓俯璁惧鍏峰鍔熻兘锛孲ystemMode Attribute Values濡備笅</para>
@@ -56,8 +44,8 @@
/// <para>8:Dry </para>
/// <para>9:Sleep</para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentSystemMode = 0;
-
/// <summary>
/// 椋庢墖褰撳墠妯″紡
/// <para>0:Off </para>
@@ -68,8 +56,8 @@
/// <para>5:Auto </para>
/// <para>6:Smart</para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentFanMode = 0;
-
/// <summary>
/// 椋庢墖zz鎵褰撳墠妯″紡
/// <para>0:1鎸� </para>
@@ -79,18 +67,9 @@
/// <para>4:5 </para>
/// <para>7:Auto </para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentFanSwingMode = 0;
-
/// <summary>
- /// 鏀寔鐨勬帶鍒舵ā寮�
- /// </summary>
- public List<AcMode> acModes = new List<AcMode> { };
-
- /// <summary>
- /// 鏀寔鐨勯閫熸ā寮�
- /// </summary>
- public List<FanMode> fanModes = new List<FanMode> { };
- /// <summary>
/// <para>鑷畾涔夌┖璋冩敮鎸佺殑妯″紡(榛樿鍏ㄥ紑)</para>
/// <para>鏁扮粍绱㈠紩 -> 0:鍒跺喎 1:鍒剁儹 2:閫侀 3:闄ゆ箍 4:鑷姩</para>
/// <para>鍊� -> 1:浠ｈ〃浣跨敤 0:浠ｈ〃涓嶄娇鐢�</para>
@@ -100,10 +79,10 @@
/// 鏄惁鍚敤鎽嗛鍔熻兘 false:涓嶄娇鐢ㄦ憜椋庡姛鑳� true:浣跨敤鎽嗛鍔熻兘
/// </summary>
public bool UseSwingFunction = true;
-
/// <summary>
/// 杩囨护缃戞竻娲楃姸鎬�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public bool CleanStatu = false;
/// <summary>
@@ -261,8 +240,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)
{
@@ -276,7 +254,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)
@@ -340,8 +317,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)
{
@@ -355,7 +331,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)
@@ -418,8 +393,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)
{
@@ -433,7 +407,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)
@@ -496,8 +469,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)
{
@@ -511,7 +483,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)
@@ -574,8 +545,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)
{
@@ -589,7 +559,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)
@@ -692,8 +661,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)
{
@@ -707,7 +675,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)
--
Gitblit v1.8.0