From f71e74b5f0d2716fbf05da016cdaa18d64e09f80 Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期四, 31 十二月 2020 17:01:18 +0800 Subject: [PATCH] 又换完成最新门锁。空气质量传感器完成数据和基本配置功能。开发图表和自动化的同事可下载此代码 --- ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 95 ++++++++++++++++++++++------------------------- 1 files changed, 44 insertions(+), 51 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs index 62ce91a..0fc25d1 100755 --- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs @@ -84,15 +84,15 @@ { //杩囨护鎺変笉鏀寔鐨勮澶� continue; - } - if (device.Type == DeviceType.DoorLock) - { - var myInfo = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device }); - if (myInfo.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone) - { - //鏆傛椂涓嶆敮鎸丼-one闂ㄩ攣; - //杩囨护鎺変笉鏀寔S-one闂ㄩ攣璁惧; - continue; + } + if (device.Type == DeviceType.DoorLock) + { + var myInfo = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device }); + if (myInfo.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone) + { + //鏆傛椂涓嶆敮鎸丼-one闂ㄩ攣; + //杩囨护鎺変笉鏀寔S-one闂ㄩ攣璁惧; + continue; } } if (type == "condition_mould") @@ -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