From e479b55d31cdac1fbf619d6f8cb51cfad365a78f Mon Sep 17 00:00:00 2001 From: tzy <hxb@hdlchina.com.cn> Date: 星期五, 02 七月 2021 16:18:14 +0800 Subject: [PATCH] 不再特殊跳过设备上报主题 --- HDL_ON/Entity/Function/Scene.cs | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs index 2f73b07..f4bdd83 100644 --- a/HDL_ON/Entity/Function/Scene.cs +++ b/HDL_ON/Entity/Function/Scene.cs @@ -67,7 +67,7 @@ /// </summary> public string delay = "0"; /// <summary> - /// 鍦烘櫙鐨勬渶濂戒竴娆℃墽琛屾椂闂� + /// 鍦烘櫙鐨勬渶鍚庝竴娆℃墽琛屾椂闂� /// </summary> public string LastExecutionTime = ""; @@ -346,7 +346,21 @@ /// </summary> public string GetDelayText() { + var delayInt = 0; + int.TryParse(delay,out delayInt); + if(delayInt == 0) + { + return Language.StringByID(StringId.NoDelay); + } string text = ""; + if (delayInt > 60) + { + text = (delayInt / 60) + Language.StringByID(StringId.m) + (delayInt % 60) + Language.StringByID(StringId.s); + }else + { + text = delayInt + Language.StringByID(StringId.s); + } + return text; switch (delay) { case "0": -- Gitblit v1.8.0