From c988ba6b217e0c619628e6920b06743465c4d3ac Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 08 十二月 2020 17:24:28 +0800
Subject: [PATCH] 2020-12-08-002
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 7e510d5..eedb16c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -309,7 +309,7 @@
}
- if (on_off != "" && on_off == "stop")
+ if (on_off != "" && on_off == "stop"|| on_off != "" && on_off == "off")
{
targetView.btnState.Text = Language.StringByID(StringId.stop);
}
@@ -331,12 +331,12 @@
{
case "on":
{
- stateStr = Language.StringByID(StringId.onLogic)+",";
+ stateStr = Language.StringByID(StringId.onLogic)+";";
}
break;
case "off":
{
- stateStr = Language.StringByID(StringId.offLogic) + ",";
+ stateStr = Language.StringByID(StringId.offLogic) + ";";
}
break;
@@ -346,7 +346,7 @@
if (set_temp != "")
{
- stateStr += set_temp + "鈩�,";
+ stateStr += set_temp + "鈩�;";
}
if (mode != "")
@@ -356,22 +356,22 @@
{
case "cool":
{
- stateStr += Language.StringByID(StringId.coolLogic)+",";
+ stateStr += Language.StringByID(StringId.coolLogic)+";";
}
break;
case "heat":
{
- stateStr += Language.StringByID(StringId.heatingLogic) + ",";
+ stateStr += Language.StringByID(StringId.heatingLogic) + ";";
}
break;
case "auto":
{
- stateStr += Language.StringByID(StringId.autoLogic) + ",";
+ stateStr += Language.StringByID(StringId.autoLogic) + ";";
}
break;
case "dry":
{
- stateStr += Language.StringByID(StringId.dehumidifyLogic) + ",";
+ stateStr += Language.StringByID(StringId.dehumidifyLogic) + ";";
}
break;
}
@@ -385,22 +385,22 @@
{
case "high":
{
- stateStr += Language.StringByID(StringId.HighWindSpeed)+",";
+ stateStr += Language.StringByID(StringId.HighWindSpeed)+";";
}
break;
case "medium":
{
- stateStr += Language.StringByID(StringId.MiddleWindSpeed) + ",";
+ stateStr += Language.StringByID(StringId.MiddleWindSpeed) + ";";
}
break;
case "low":
{
- stateStr += Language.StringByID(StringId.LowWindSpeed) + ",";
+ stateStr += Language.StringByID(StringId.LowWindSpeed) + ";";
}
break;
case "auto":
{
- stateStr += Language.StringByID(StringId.Auto) + ",";
+ stateStr += Language.StringByID(StringId.Auto) + ";";
}
break;
}
@@ -411,7 +411,7 @@
targetView.btnState.Text = Language.StringByID(StringId.offLogic);
}
else {
- targetView.btnState.Text = stateStr.TrimEnd(',');
+ targetView.btnState.Text = stateStr.TrimEnd(';');
}
@@ -428,12 +428,12 @@
{
case "on":
{
- stateStr = Language.StringByID(StringId.onLogic) + ",";
+ stateStr = Language.StringByID(StringId.onLogic) + ";";
}
break;
case "off":
{
- stateStr = Language.StringByID(StringId.offLogic) + ",";
+ stateStr = Language.StringByID(StringId.offLogic) + ";";
}
break;
@@ -442,7 +442,7 @@
if (set_temp != "")
{
- stateStr += set_temp + "鈩�,";
+ stateStr += set_temp + "鈩�;";
}
if (mode != "")
{
@@ -451,28 +451,28 @@
{
case "day":
{
- stateStr += Language.StringByID(StringId.dayMode)+",";
+ stateStr += Language.StringByID(StringId.dayMode)+";";
}
break;
case "night":
{
- stateStr += Language.StringByID(StringId.nightMode) + ",";
+ stateStr += Language.StringByID(StringId.nightMode) + ";";
}
break;
case "away":
{
- stateStr += Language.StringByID(StringId.leaveMode) + ",";
+ stateStr += Language.StringByID(StringId.leaveMode) + ";";
}
break;
case "normal":
{
- stateStr += Language.StringByID(StringId.ordinaryMode) + ",";
+ stateStr += Language.StringByID(StringId.ordinaryMode) + ";";
}
break;
case "timer":
{
- stateStr += Language.StringByID(StringId.timeMode) + ",";
+ stateStr += Language.StringByID(StringId.timeMode) + ";";
}
break;
}
@@ -482,22 +482,22 @@
{
case "cool":
{
- stateStr += Language.StringByID(StringId.coolLogic) + ",";
+ stateStr += Language.StringByID(StringId.coolLogic) + ";";
}
break;
case "heat":
{
- stateStr += Language.StringByID(StringId.heatingLogic) + ",";
+ stateStr += Language.StringByID(StringId.heatingLogic) + ";";
}
break;
case "auto":
{
- stateStr += Language.StringByID(StringId.autoLogic) + ",";
+ stateStr += Language.StringByID(StringId.autoLogic) + ";";
}
break;
case "dry":
{
- stateStr += Language.StringByID(StringId.dehumidifyLogic) + ",";
+ stateStr += Language.StringByID(StringId.dehumidifyLogic) + ";";
}
break;
}
@@ -509,7 +509,7 @@
}
else
{
- targetView.btnState.Text = stateStr.TrimEnd(',');
+ targetView.btnState.Text = stateStr.TrimEnd(';');
}
}
--
Gitblit v1.8.0