From 9137222ece9b978eb97b5598f2eee6e070bcf9d6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 28 二月 2020 15:22:16 +0800
Subject: [PATCH] 2020-02-28 更新
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
index 91abf57..be79cc4 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
@@ -7,6 +7,7 @@
public class AddSchedule : FrameLayout
{
VerticalScrolViewLayout bodyView;
+ FrameLayout devicesListView;
Action<Timer> action;
List<Common> roomDeviceList = new List<Common>();
List<string> roomNameList = new List<string> ();
@@ -459,7 +460,7 @@
};
devicesView.AddChidren (btnDeviceTitle);
- var devicesListView = new FrameLayout () {
+ devicesListView = new FrameLayout () {
Height = Application.GetRealHeight (130 * roomDeviceList.Count),
};
bodyView.AddChidren (devicesListView);
@@ -572,8 +573,9 @@
new Alert ("", "Please setting date!", "Close").Show ();
return;
}
- timerTemp.TimerName = etName.Text.Trim ();
- if (string.IsNullOrEmpty (timerTemp.TimerName)) {
+
+ string mTimerName = etName.Text.Trim ();
+ if (string.IsNullOrEmpty (mTimerName)) {
//new Alert ("", "璇峰～鍐欏畾鏃跺櫒鍚嶇О!", "Close").Show ();
new Alert ("", "Please set name for the timer!", "Close").Show ();
return;
@@ -591,7 +593,8 @@
return;
}
- var mTimer = listTimer.Find ((obj) => obj.TimerName == timerTemp.TimerName);
+ //鍚嶅瓧閲嶅鍒ゆ柇闄愬埗
+ var mTimer = listTimer.Find ((obj) => obj.TimerName == mTimerName);
if (isEdit) {
if (mTimer != null && mTimer.Id != timerTemp.Id) {
new Alert ("", "The timer name already exists. Please change it before saving it.", "Close").Show ();
@@ -600,6 +603,22 @@
} else {
if (mTimer != null) {
new Alert ("", "The timer name already exists. Please change it before saving it.", "Close").Show ();
+ return;
+ }
+ }
+
+ //2020-02-10 鏃堕棿閲嶅鍒ゆ柇闄愬埗
+ string mExecutionTime = btnTimelbl.Text;
+ //timerTemp.ExecutionTime = btnTimelbl.Text;
+ var mTimerExecutionTime = listTimer.Find ((obj) => (obj.ExecutionTime == mExecutionTime));
+ if (isEdit) {
+ if (mTimerExecutionTime != null && mTimerExecutionTime.Id != timerTemp.Id) {
+ new Alert ("", "The timer time already exists. Please change it before saving it.", "Close").Show ();
+ return;
+ }
+ } else {
+ if (mTimerExecutionTime != null) {
+ new Alert ("", "The timer time already exists. Please change it before saving it.", "Close").Show ();
return;
}
}
@@ -640,6 +659,9 @@
if (timerTemp.Periodicity [timerTemp.Periodicity.Length - 1] == ',') {
timerTemp.Periodicity = timerTemp.Periodicity.Remove (timerTemp.Periodicity.Length - 1, 1);
}
+
+
+
timerTemp.IsStart = true;
if (string.IsNullOrEmpty (timerTemp.Id)) {
timerTemp.Id = Guid.NewGuid ().ToString ();
@@ -681,6 +703,8 @@
}
+
+
/// <summary>
//(1)Success 鍒欒皟鐢ㄦ鎺ュ彛鎴愬姛
//(2)NoRecord 浣忓畢鏈粦瀹氱綉鍏筹紒
@@ -716,6 +740,7 @@
private static void InitDeviceListView (List<Common> roomDeviceList, List<DeviceInfo> timerControlDeviceList, FrameLayout devicesListView)
{
devicesListView.RemoveAll ();
+
System.Threading.Tasks.Task.Run (() => {
try {
int iniIndex = 0;
@@ -726,6 +751,15 @@
i++;
}
}
+
+#if __IOS__
+
+
+#else
+ //鍒锋柊devicesListView 楂樺害
+ devicesListView.Height = Application.GetRealHeight (130 * roomDeviceList.Count);
+#endif
+
foreach (var deviceCommon2 in roomDeviceList) {
if (deviceCommon2 == null)
continue;
--
Gitblit v1.8.0