From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 77 +++++++++++++++++---------------------
1 files changed, 35 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 62ce91a..999cd5d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -594,7 +594,9 @@
}; break;
case 5:
{
- string len = "", text = "";
+ string len = "";
+ string text = "";
+ string weekStr = Language.StringByID(MyInternationalizationString.week1);
List<int> listvalueInt = new List<int>();
listvalueInt.Clear();
var maxvalue = Convert.ToString(currentLogic.TimeAttribute.WeekDay, 2);
@@ -610,44 +612,36 @@
if (strvalue == "1")
{
listvalueInt.Add(j + 1);
-
-
- if ((j + 1) == 1)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.mon1) + ",";
- //text += Language.StringByID(MyInternationalizationString.mon) + ",";
+ switch ((j + 1)) {
+ case 1: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.mon1) + ",";
+ }
+ break;
+ case 2: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.tue1) + ",";
+ }
+ break;
+ case 3: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.wed1) + ",";
+ }
+ break;
+ case 4: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.thu1) + ",";
+ }
+ break;
+ case 5: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.frl1) + ",";
+ }
+ break;
+ case 6: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.sat1) + ",";
+ }
+ break;
+ case 7: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.sun1) + ",";
+ }
+ break;
}
- else if ((j + 1) == 2)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.tue1) + ",";
- //text += Language.StringByID(MyInternationalizationString.tue) + ",";
- }
- else if ((j + 1) == 3)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.wed1) + ",";
- //text += Language.StringByID(MyInternationalizationString.wed) + ",";
- }
- else if ((j + 1) == 4)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.thu1) + ",";
- //text += Language.StringByID(MyInternationalizationString.thu) + ",";
- }
- else if ((j + 1) == 5)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.frl1) + ",";
- //text += Language.StringByID(MyInternationalizationString.frl) + ",";
- }
- else if ((j + 1) == 6)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sat1) + ",";
- //text += Language.StringByID(MyInternationalizationString.sat) + ",";
- }
- else if ((j + 1) == 7)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sun1) + ",";
- //text += Language.StringByID(MyInternationalizationString.sun) + ",";
- }
-
}
}
@@ -668,8 +662,7 @@
//{
// btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
//}
- button.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
- //btndisplaycycle.Text = text.TrimEnd(',');
+ button.Text = weekStr + text.Replace(weekStr, "").TrimEnd(',');
}; break;
}
@@ -771,7 +764,7 @@
if (CurrentLogic.Conditions.Count == 0 || CurrentLogic.Actions.Count == 0)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.addnull),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -780,7 +773,7 @@
if (string.IsNullOrEmpty(name))
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.PleaseEnterLogicName),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0