From ea318e20d9a513bfae81a9203cef4bca0fc23c2c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 30 九月 2020 11:01:15 +0800
Subject: [PATCH] 202009301
---
HDL_ON/Entity/Function/AC.cs | 164 +++++++++++++++++++-----------------------------------
1 files changed, 58 insertions(+), 106 deletions(-)
diff --git a/HDL_ON/Entity/Function/AC.cs b/HDL_ON/Entity/Function/AC.cs
index e9038b1..671f080 100644
--- a/HDL_ON/Entity/Function/AC.cs
+++ b/HDL_ON/Entity/Function/AC.cs
@@ -1,19 +1,17 @@
锘縰sing System;
-using System.Collections;
using System.Collections.Generic;
-using Newtonsoft.Json.Linq;
namespace HDL_ON.Entity
{
public class AC : Function
{
/*
- * 绌鸿皟锛歵rait: [switch, mode, fan, temperature, swing, lock]
+ * 绌鸿皟锛歵rait: [switch, mode, fan, set_temperature, swing, lock]
* 灞炴�� 鎻忚堪
* on_off on/off
* mode mode: auto, cool, heat, dry, fan
* fan high, medium, low, auto
- * temperature up,down,value
+ * set_temperature up,down,value
* swing up/down/left/right
* lock boolean (Lock閿佸畾鎺у埗)
*/
@@ -30,7 +28,7 @@
/// <summary>
/// 褰撳墠娓╁害妯″紡瀛楃
/// </summary>
- public string curTempTypeString
+ public string tempUnitString
{
get
{
@@ -57,7 +55,7 @@
try
{
byte index = 0;
- switch (trait_mode.curValues.ToString())
+ switch (trait_mode.value.ToString())
{
case "auto":
index = 3;
@@ -91,22 +89,22 @@
switch (value)
{
case 0:
- trait_mode.curValues = "cool";
+ trait_mode.value = "cool";
break;
case 1:
- trait_mode.curValues = "heat";
+ trait_mode.value = "heat";
break;
case 2:
- trait_mode.curValues = "fan";
+ trait_mode.value = "fan";
break;
case 3:
- trait_mode.curValues = "auto";
+ trait_mode.value = "auto";
break;
case 4:
- trait_mode.curValues = "dry";
+ trait_mode.value = "dry";
break;
default:
- trait_mode.curValues = "cool";
+ trait_mode.value = "cool";
break;
}
@@ -124,7 +122,7 @@
try
{
byte index = 0;
- switch (trait_fan.curValues.ToString())
+ switch (trait_fan.value.ToString())
{
case "high":
index = 1;
@@ -155,19 +153,19 @@
switch (value)
{
case 0:
- trait_fan.curValues = "auto";
+ trait_fan.value = "auto";
break;
case 1:
- trait_fan.curValues = "high";
+ trait_fan.value = "high";
break;
case 2:
- trait_fan.curValues = "medium";
+ trait_fan.value = "medium";
break;
case 3:
- trait_fan.curValues = "low";
+ trait_fan.value = "low";
break;
default:
- trait_fan.curValues = "high";
+ trait_fan.value = "high";
break;
}
}
@@ -184,93 +182,78 @@
{
if (_trait_mode == null)
{
- _trait_mode = function.Find((obj) => obj.attri == "mode");
+ _trait_mode = function.Find((obj) => obj.name == "mode");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_mode == null)
{
_trait_mode = new Trait()
{
- attri = "mode",
- value = new List<string> { "auto", "cool", "heat", "dry", "fan" },
+ name = "mode",
+ value_key = new List<string> { "auto", "cool", "heat", "dry", "fan" },
max = 4,
min = 0,
};
}
- _trait_mode.curValues = _trait_mode.value.Count > 0 ? _trait_mode.value[0] : "";
+ _trait_mode.value = _trait_mode.value_key.Count > 0 ? _trait_mode.value_key[0] : "";
}
return _trait_mode;
- }
- }
- /// <summary>
- /// 绌鸿皟妯″紡
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public List<string> modeList
- {
- get
- {
- try
- {
- return trait_mode.value;
- }
- catch (Exception ex)
- {
- MainPage.Log($"ac get mode error : {ex.Message}");
- return new List<string> { "auto", "cool", "heat", "dry", "fan" };
- }
}
}
Trait _trait_fan;
[Newtonsoft.Json.JsonIgnore]
- public Trait trait_fan {
+ public Trait trait_fan
+ {
get
{
if (_trait_fan == null)
{
- _trait_fan = function.Find((obj) => obj.attri == "fan");
+ _trait_fan = function.Find((obj) => obj.name == "fan");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_fan == null)
{
_trait_fan = new Trait()
{
- attri = "fan",
- value = new List<string> { "high", "medium", "low", "auto" },
+ name = "fan",
+ value_key = new List<string> { "high", "medium", "low", "auto" },
max = 3,
min = 0,
};
}
- _trait_fan.curValues = _trait_fan.value.Count > 0 ? _trait_fan.value[0] : "";
+ _trait_fan.value = _trait_fan.value_key.Count > 0 ? _trait_fan.value_key[0] : "";
}
return _trait_fan;
}
}
- /// <summary>
- /// 绌鸿皟椋庨�熸ā寮�
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public List<string> fan_List
- {
- get
- {
- try
- {
- return trait_fan.value;
- }
- catch (Exception ex)
- {
- MainPage.Log($"ac get fan error : {ex.Message}");
- return new List<string> { "high", "medium", "low", "auto" };
- }
- }
- }
+
+ Trait _trait_temp;
/// <summary>
/// 褰撳墠绌鸿皟娓╁害
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public int curTemp = 20;
- // temperature up, down, value
- // swing up/down/left/right
+ public Trait trait_temp
+ {
+ get
+ {
+ if (_trait_temp == null)
+ {
+ _trait_temp = function.Find((obj) => obj.name == "set_temperature");
+ //鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
+ if (_trait_temp == null)
+ {
+ _trait_temp = new Trait()
+ {
+ name = "set_temperature",
+ value_key = new List<string> { },
+ max = 32,
+ min = 16,
+ };
+ }
+ _trait_temp.value = 16;
+ }
+ return _trait_temp;
+ }
+ }
Trait _trait_swting;
[Newtonsoft.Json.JsonIgnore]
@@ -280,19 +263,19 @@
{
if (_trait_swting == null)
{
- _trait_swting = function.Find((obj) => obj.attri == "swting");
+ _trait_swting = function.Find((obj) => obj.name == "swting");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_swting == null)
{
_trait_swting = new Trait()
{
- attri = "swting",
- value = new List<string> { "up", "down", "left", "right" },
+ name = "swting",
+ value_key = new List<string> { "up", "down", "left", "right" },
max = 3,
min = 0,
};
}
- _trait_swting.curValues = _trait_swting.value.Count > 0 ? _trait_swting.value[trait_mode.min] : "";
+ _trait_swting.value = _trait_swting.value_key.Count > 0 ? _trait_swting.value_key[trait_mode.min] : "";
}
return _trait_swting;
}
@@ -307,7 +290,7 @@
{
try
{
- return trait_swting.value;
+ return trait_swting.value_key;
}
catch (Exception ex)
{
@@ -333,7 +316,7 @@
try
{
var imagePath = "FunctionIcon/AC/CoolIcon.png";
- switch (trait_mode.curValues.ToString())
+ switch (trait_mode.value.ToString())
{
case "auto":
imagePath = "FunctionIcon/AC/AutoIcon.png";
@@ -374,7 +357,7 @@
try
{
var imagePath = "FunctionIcon/AC/WindHighIcon.png";
- switch (trait_fan.curValues.ToString())
+ switch (trait_fan.value.ToString())
{
case "high":
imagePath = "FunctionIcon/AC/WindHighIcon.png";
@@ -400,37 +383,6 @@
}
}
}
- /// <summary>
- /// 鎷兼帴銆佽幏鍙朅鍗忚鎿嶄綔鏁版嵁
- /// </summary>
- public override JObject GetSendJObject(CommandType_A command)
- {
- var sendJob = new JObject();
- if (command == CommandType_A.write)
- {
- sendJob = new JObject { { "Namespace", vendor_code }, { "Command", command.ToString() }, { "Type", "device" } };
- JObject data = new JObject { { "sid", sid } };
- sendJob.Add("objects", data);
- List<ControlData> controlData = new List<ControlData>();
- controlData.Add(new ControlData()
- {
- name = "on_off",
- data_type = "Bool",
- value = on_off
- });
-
-
- }
- else if (command == CommandType_A.read)
- {
- sendJob = new JObject { { "Namespace", vendor_code }, { "Command", command.ToString() }, { "Type", "device" } };
- var data = new JObject { { "sid", sid } };
- sendJob.Add("objects", data);
- }
- return sendJob;
- }
-
-
}
}
--
Gitblit v1.8.0