From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:11:28 +0800
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy"
---
HDL_ON/Entity/Function/Scene.cs | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index f4bdd83..ded2b0c 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 = "";
@@ -348,18 +348,7 @@
{
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);
- }
+ string text = (delayInt / 60)+Language.StringByID(StringId.m)+(delayInt % 60)+Language.StringByID(StringId.s);
return text;
switch (delay)
{
--
Gitblit v1.8.0