From eb3799496f3419e347849073e23e5105b74000e5 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 17:41:18 +0800
Subject: [PATCH] 2021-3-26-4
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs
index 19e74f1..4916e1e 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs
@@ -61,7 +61,7 @@
}
} catch { }
DateTime dateTime = new DateTime (DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, hour, Minute, DateTime.Now.Second, DateTime.Now.Millisecond);
- return dateTime.ToUniversalTime ().ToString ("hh") + ":" + dateTime.ToUniversalTime ().ToString ("mm");
+ return dateTime.ToUniversalTime ().ToString ("HH") + ":" + dateTime.ToUniversalTime ().ToString ("mm");
}
@@ -87,7 +87,7 @@
} catch { }
DateTime utcTime = new DateTime (DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, hour, Minute, DateTime.Now.Second, DateTime.Now.Millisecond);
var dateTime = TimeZoneInfo.ConvertTimeFromUtc (utcTime, TimeZoneInfo.Local);
- return dateTime.ToString ("hh") + ":" + dateTime.ToString ("mm");
+ return dateTime.ToString ("HH") + ":" + dateTime.ToString ("mm");
}
/// <summary>
/// 鑾峰彇鏃堕棿鎴筹紙鏃堕棿鏍煎紡杞崲鏃堕棿鎴筹級
@@ -209,12 +209,14 @@
for (int i = 0; i < list.Count; i++) {
var device = list [i];
switch (device.spk) {
- case "light.dimming":
- case "light.switch":
- case "curtain.roller":
- case "curtain.trietex":
- case "curtain.switch":
- case "electrical.socket": {
+ case SPK.LightDimming:
+ case SPK.LightSwitch:
+ case SPK.CurtainRoller:
+ case SPK.CurtainTrietex:
+ case SPK.CurtainSwitch:
+ case SPK.ElectricSocket:
+ case SPK.ElectricFan:
+ {
//鐩墠鏀寔鐨勮澶�
DeviceList.Add (device);
}
--
Gitblit v1.8.0