2021-3-26-4

陈嘉乐

2021-03-26 eb3799496f3419e347849073e23e5105b74000e5

 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);
                    }