From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/Entity/Function/AC.cs | 88 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/Entity/Function/AC.cs b/HDL_ON/Entity/Function/AC.cs
index 671f080..f720477 100644
--- a/HDL_ON/Entity/Function/AC.cs
+++ b/HDL_ON/Entity/Function/AC.cs
@@ -55,7 +55,7 @@
try
{
byte index = 0;
- switch (trait_mode.value.ToString())
+ switch (trait_mode.curValue.ToString())
{
case "auto":
index = 3;
@@ -89,22 +89,22 @@
switch (value)
{
case 0:
- trait_mode.value = "cool";
+ trait_mode.curValue = "cool";
break;
case 1:
- trait_mode.value = "heat";
+ trait_mode.curValue = "heat";
break;
case 2:
- trait_mode.value = "fan";
+ trait_mode.curValue = "fan";
break;
case 3:
- trait_mode.value = "auto";
+ trait_mode.curValue = "auto";
break;
case 4:
- trait_mode.value = "dry";
+ trait_mode.curValue = "dry";
break;
default:
- trait_mode.value = "cool";
+ trait_mode.curValue = "cool";
break;
}
@@ -122,7 +122,7 @@
try
{
byte index = 0;
- switch (trait_fan.value.ToString())
+ switch (trait_fan.curValue.ToString())
{
case "high":
index = 1;
@@ -153,129 +153,129 @@
switch (value)
{
case 0:
- trait_fan.value = "auto";
+ trait_fan.curValue = "auto";
break;
case 1:
- trait_fan.value = "high";
+ trait_fan.curValue = "high";
break;
case 2:
- trait_fan.value = "medium";
+ trait_fan.curValue = "medium";
break;
case 3:
- trait_fan.value = "low";
+ trait_fan.curValue = "low";
break;
default:
- trait_fan.value = "high";
+ trait_fan.curValue = "high";
break;
}
}
}
- Trait _trait_mode;
+ FunctionAttributes _trait_mode;
/// <summary>
/// 妯″紡灞炴��
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public Trait trait_mode
+ public FunctionAttributes trait_mode
{
get
{
if (_trait_mode == null)
{
- _trait_mode = function.Find((obj) => obj.name == "mode");
+ _trait_mode = function.Find((obj) => obj.key == "mode");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_mode == null)
{
- _trait_mode = new Trait()
+ _trait_mode = new FunctionAttributes()
{
- name = "mode",
- value_key = new List<string> { "auto", "cool", "heat", "dry", "fan" },
+ key = "mode",
+ value = new List<string> { "auto", "cool", "heat", "dry", "fan" },
max = 4,
min = 0,
};
}
- _trait_mode.value = _trait_mode.value_key.Count > 0 ? _trait_mode.value_key[0] : "";
+ _trait_mode.curValue = _trait_mode.value.Count > 0 ? _trait_mode.value[0] : "";
}
return _trait_mode;
}
}
- Trait _trait_fan;
+ FunctionAttributes _trait_fan;
[Newtonsoft.Json.JsonIgnore]
- public Trait trait_fan
+ public FunctionAttributes trait_fan
{
get
{
if (_trait_fan == null)
{
- _trait_fan = function.Find((obj) => obj.name == "fan");
+ _trait_fan = function.Find((obj) => obj.key == "fan");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_fan == null)
{
- _trait_fan = new Trait()
+ _trait_fan = new FunctionAttributes()
{
- name = "fan",
- value_key = new List<string> { "high", "medium", "low", "auto" },
+ key = "fan",
+ value = new List<string> { "high", "medium", "low", "auto" },
max = 3,
min = 0,
};
}
- _trait_fan.value = _trait_fan.value_key.Count > 0 ? _trait_fan.value_key[0] : "";
+ _trait_fan.curValue = _trait_fan.value.Count > 0 ? _trait_fan.value[0] : "";
}
return _trait_fan;
}
}
- Trait _trait_temp;
+ FunctionAttributes _trait_temp;
/// <summary>
/// 褰撳墠绌鸿皟娓╁害
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public Trait trait_temp
+ public FunctionAttributes trait_temp
{
get
{
if (_trait_temp == null)
{
- _trait_temp = function.Find((obj) => obj.name == "set_temperature");
+ _trait_temp = function.Find((obj) => obj.key == "set_temperature");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_temp == null)
{
- _trait_temp = new Trait()
+ _trait_temp = new FunctionAttributes()
{
- name = "set_temperature",
- value_key = new List<string> { },
+ key = "set_temperature",
+ value = new List<string> { },
max = 32,
min = 16,
};
}
- _trait_temp.value = 16;
+ _trait_temp.curValue = 16;
}
return _trait_temp;
}
}
- Trait _trait_swting;
+ FunctionAttributes _trait_swting;
[Newtonsoft.Json.JsonIgnore]
- public Trait trait_swting
+ public FunctionAttributes trait_swting
{
get
{
if (_trait_swting == null)
{
- _trait_swting = function.Find((obj) => obj.name == "swting");
+ _trait_swting = function.Find((obj) => obj.key == "swting");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_swting == null)
{
- _trait_swting = new Trait()
+ _trait_swting = new FunctionAttributes()
{
- name = "swting",
- value_key = new List<string> { "up", "down", "left", "right" },
+ key = "swting",
+ value = new List<string> { "up", "down", "left", "right" },
max = 3,
min = 0,
};
}
- _trait_swting.value = _trait_swting.value_key.Count > 0 ? _trait_swting.value_key[trait_mode.min] : "";
+ _trait_swting.curValue = _trait_swting.value.Count > 0 ? _trait_swting.value[trait_mode.min] : "";
}
return _trait_swting;
}
@@ -290,7 +290,7 @@
{
try
{
- return trait_swting.value_key;
+ return trait_swting.value;
}
catch (Exception ex)
{
@@ -316,7 +316,7 @@
try
{
var imagePath = "FunctionIcon/AC/CoolIcon.png";
- switch (trait_mode.value.ToString())
+ switch (trait_mode.curValue.ToString())
{
case "auto":
imagePath = "FunctionIcon/AC/AutoIcon.png";
@@ -357,7 +357,7 @@
try
{
var imagePath = "FunctionIcon/AC/WindHighIcon.png";
- switch (trait_fan.value.ToString())
+ switch (trait_fan.curValue.ToString())
{
case "high":
imagePath = "FunctionIcon/AC/WindHighIcon.png";
--
Gitblit v1.8.0