From d53e6af2c5f17838fa79659614b15a2a1f383399 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 31 三月 2023 10:04:58 +0800
Subject: [PATCH] 1
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs | 49 +++++++++++--------------------------------------
1 files changed, 11 insertions(+), 38 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/Method.cs
index 19e74f1..2461a8b 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);
}
@@ -245,35 +247,6 @@
}
return null;
}
- /// <summary>
- //(1)Success 鍒欒皟鐢ㄦ鎺ュ彛鎴愬姛
- //(2)NoRecord 浣忓畢鏈粦瀹氱綉鍏筹紒
- //(3)NoExist 浣忓畢涓嶅瓨鍦紒
- /// </summary>
- public void ShowGetTimerListErrorInfo (string stateCodeStr)
- {
- string mes = "";
- if (stateCodeStr == "NoRecord") {
- // 浣忓畢鏈粦瀹氱綉鍏筹紒
- mes = ErrorCode.HomeNoRecord;
- } else if (stateCodeStr == "NoExist") {
- //浣忓畢涓嶅瓨鍦紒
- mes = ErrorCode.HomeNoExist;
- } else if (stateCodeStr == ErrorCode.NetworkError) {
- mes = ErrorCode.NetworkError;
- } else {
- mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr;
-
- }
- if (!string.IsNullOrEmpty (mes)) {
- Application.RunOnMainThread (() => {
- new Alert ("", mes, Language.StringByID (Shared.SimpleControl.R.MyInternationalizationString.Close)).Show ();
- });
- }
-
-
-
-
- }
+
}
}
--
Gitblit v1.8.0