From f4ec37cb00f1e75b6a6c723a799ffaa79408977b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 03 三月 2021 09:53:31 +0800
Subject: [PATCH] 2021-03-03 1.修改switch语法。
---
Crabtree/SmartHome/HDL/Operation/Device/AC.cs | 74 +++++++++++++++++++-----
Crabtree/SmartHome/HDL/Operation/Device/FoolHeat.cs | 39 ++++++++++--
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 15 ++--
3 files changed, 97 insertions(+), 31 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index f1d4a46..d3bfc20 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,8 +1,8 @@
锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
<MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.822QECU5228FU" />
- <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/HDL/Common/HDLLinkUtlis.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs">
<Files>
- <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="324" Column="46" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="382" Column="24" />
<File FileName="SmartHome/HDL/Common/HDLLinkUtlis.cs" Line="125" Column="21" />
</Files>
<Pads>
@@ -10,18 +10,19 @@
<State name="__root__">
<Node name="SmartHome" expanded="True">
<Node name="ON.Droid" expanded="True" />
- <Node name="ON.Ios" expanded="True" />
<Node name="Shared" expanded="True">
<Node name="HDL" expanded="True">
- <Node name="Common" expanded="True">
- <Node name="HttpUtil" expanded="True" />
- <Node name="HDLLinkUtlis.cs" selected="True" />
+ <Node name="Common" expanded="True" />
+ <Node name="Operation" expanded="True">
+ <Node name="Device" expanded="True" />
</Node>
</Node>
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
- <Node name="User" expanded="True" />
+ <Node name="User" expanded="True">
+ <Node name="UserSettingView.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
diff --git a/Crabtree/SmartHome/HDL/Operation/Device/AC.cs b/Crabtree/SmartHome/HDL/Operation/Device/AC.cs
index 64777b1..222538e 100644
--- a/Crabtree/SmartHome/HDL/Operation/Device/AC.cs
+++ b/Crabtree/SmartHome/HDL/Operation/Device/AC.cs
@@ -70,15 +70,37 @@
/// </summary>
/// <returns></returns>
public string SetModeAttribute {
- get{
- return SetMode switch {
- 0 => "cool",
- 1 => "heat",
- 2 => "fan",
- 3 => "auto",
- 4 => "dry",
- _ => "cool",
- };
+ get {
+ //return SetMode switch {
+ // 0 => "cool",
+ // 1 => "heat",
+ // 2 => "fan",
+ // 3 => "auto",
+ // 4 => "dry",
+ // _ => "cool",
+ //};
+ string mode;
+ switch (SetMode) {
+ case 0:
+ mode = "cool";
+ break;
+ case 1:
+ mode = "heat";
+ break;
+ case 2:
+ mode = "fan";
+ break;
+ case 3:
+ mode = "auto";
+ break;
+ case 4:
+ mode = "dry";
+ break;
+ default:
+ mode = "cool";
+ break;
+ }
+ return mode;
}
}
@@ -88,13 +110,33 @@
/// <returns></returns>
public string SetFanSpeedAttribute {
get {
- return SetFanSpeed switch {
- 0 => "auto",
- 1 => "high",
- 2 => "medium",
- 3 => "low",
- _ => "high",
- };
+ //return SetFanSpeed switch {
+ // 0 => "auto",
+ // 1 => "high",
+ // 2 => "medium",
+ // 3 => "low",
+ // _ => "high",
+ //};
+
+ string speed;
+ switch (SetFanSpeed) {
+ case 0:
+ speed = "auto";
+ break;
+ case 1:
+ speed = "high";
+ break;
+ case 2:
+ speed = "medium";
+ break;
+ case 3:
+ speed = "low";
+ break;
+ default:
+ speed = "high";
+ break;
+ }
+ return speed;
}
}
diff --git a/Crabtree/SmartHome/HDL/Operation/Device/FoolHeat.cs b/Crabtree/SmartHome/HDL/Operation/Device/FoolHeat.cs
index 1aa6b00..beb506e 100644
--- a/Crabtree/SmartHome/HDL/Operation/Device/FoolHeat.cs
+++ b/Crabtree/SmartHome/HDL/Operation/Device/FoolHeat.cs
@@ -161,14 +161,37 @@
/// <returns></returns>
public string SetModeAttribute {
get {
- return TemperatureType switch {
- 1 => "normal",
- 2 => "day",
- 3 => "night",
- 4 => "away",
- 5 => "timer",
- _ => "normal",
- };
+ //return TemperatureType switch {
+ // 1 => "normal",
+ // 2 => "day",
+ // 3 => "night",
+ // 4 => "away",
+ // 5 => "timer",
+ // _ => "normal",
+ //};
+
+ string mode;
+ switch (TemperatureType) {
+ case 1:
+ mode = "normal";
+ break;
+ case 2:
+ mode = "day";
+ break;
+ case 3:
+ mode = "night";
+ break;
+ case 4:
+ mode = "away";
+ break;
+ case 5:
+ mode = "timer";
+ break;
+ default:
+ mode = "normal";
+ break;
+ }
+ return mode;
}
}
--
Gitblit v1.8.0