From 8edf8fd9f5f7c29cc6302a8d46de06d391ed3657 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 16 一月 2020 13:03:57 +0800
Subject: [PATCH] 2020-01-16 Version 2.50115-B3 1.优化MQTT连接。 2.增加本地通信加密。 3.增加配置网关提示语。 4.编辑定时器增加重复名字提示 5.更新规范翻译。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
index 1aa9471..91abf57 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
@@ -577,17 +577,33 @@
//new Alert ("", "璇峰～鍐欏畾鏃跺櫒鍚嶇О!", "Close").Show ();
new Alert ("", "Please set name for the timer!", "Close").Show ();
return;
- } else if (listTimer.Find ((obj) => obj.TimerName == timerTemp.TimerName) != null && !isEdit) {//2020-01-09 缂栬緫鐨勬椂鍊欎篃鎻愮ず閲嶅鍚嶅瓧
- //if (isEdit) {
-
- //}
- new Alert ("", "The timer name already exists. Please change it before saving it.", "Close").Show ();
- return;
}
+ //else if (listTimer.Find ((obj) => obj.TimerName == timerTemp.TimerName) != null && !isEdit) {//2020-01-09 缂栬緫鐨勬椂鍊欎篃鎻愮ず閲嶅鍚嶅瓧
+ // //if (isEdit) {
+
+ // //}
+ // new Alert ("", "The timer name already exists. Please change it before saving it.", "Close").Show ();
+ // return;
+ //}
+
if (timerControlDeviceList.Count == 0) {
new Alert ("", "Please choose at least one device!", "Close").Show ();
return;
}
+
+ var mTimer = listTimer.Find ((obj) => obj.TimerName == timerTemp.TimerName);
+ if (isEdit) {
+ if (mTimer != null && mTimer.Id != timerTemp.Id) {
+ new Alert ("", "The timer name already exists. Please change it before saving it.", "Close").Show ();
+ return;
+ }
+ } else {
+ if (mTimer != null) {
+ new Alert ("", "The timer name already exists. Please change it before saving it.", "Close").Show ();
+ return;
+ }
+ }
+
timerTemp.Periodicity = "";
if (btnMonday.IsSelected == true && btnFriday.IsSelected == true && btnThursday.IsSelected == true && btnSunday.IsSelected == true && btnTuesday.IsSelected == true && btnSaturday.IsSelected == true && btnWednesday.IsSelected == true) {
timerTemp.TimerType = TimerType.EveryDay;
--
Gitblit v1.8.0