From 320d7cc8feb394d0ce3db2ec1d01593b554d990f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 10:57:13 +0800
Subject: [PATCH] 2020-12-23 1.更新
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 164 ++++++++++++++++++++++--------------------------------
1 files changed, 66 insertions(+), 98 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
old mode 100644
new mode 100755
index e429b56..350280b
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -21,7 +21,7 @@
///璁板綍鏉′欢绫诲瀷
inputView.btnClick.Name = inputCondition.condition_type;
///璁板綍鏉′欢绱㈠紩
- inputView.btnClick.Tag = i;
+ inputView.btnClick.Tag = inputCondition.sid;
///鏉′欢鐘舵�佹暟缁�
List<Dictionary<string, string>> dicList = inputCondition.condition as List<Dictionary<string, string>>;
//鏄剧ず鏉′欢鍚勭绫诲瀷鐘舵��
@@ -104,7 +104,19 @@
{
Button button = (Button)sen;
//鎵惧埌褰撳墠缂栬緫鐨勭储寮�
- int indexVulae = int.Parse(inputView.btnClick.Tag.ToString());
+ int indexVulae = 0;
+ for (int index = 0; index < Logic.currlogic.input.Count; index++)
+ {
+ Input input = Logic.currlogic.input[index];
+ if (input.sid == inputView.btnClick.Tag.ToString())
+ {
+ //鐢ㄦ埛鍙兘鍒犻櫎鏁版嵁锛屼娇鍒楄〃绱㈠紩鍙戠敓鏀瑰彉锛�
+ //閫氳繃鍞竴sid閲嶆柊鏌ユ壘鍒扮储寮曚笖鏇存柊绱㈠紩鍊�
+ indexVulae = index;
+ break;
+ }
+ }
+
//鏍囪缂栬緫鐘舵��
bool edit = true;
switch (button.Name)
@@ -131,7 +143,6 @@
timeTpye.TimeHorizon(fLayout, edit, indexVulae);
}
break;
-
case "3":
{
//鐢╯id鎵惧埌璁惧锛�
@@ -162,7 +173,7 @@
/// <param name="viewLayout">涓婁笅婊戝姩鎺т欢</param>
public static void OutputTarget(FrameLayout thisView, VerticalScrolViewLayout viewLayout)
{
-
+
for (int i = 0; i < Logic.currlogic.output.Count; i++)
{
Output outputTarget = Logic.currlogic.output[i];
@@ -172,10 +183,10 @@
///璁板綍鏉′欢绫诲瀷
targetView.btnClick.Name = outputTarget.target_type;
///璁板綍鏉′欢绱㈠紩
- targetView.btnClick.Tag = i;
+ targetView.btnClick.Tag = outputTarget.sid;
///鏉′欢鐘舵�佹暟缁�
List<Dictionary<string, string>> dicList = outputTarget.status as List<Dictionary<string, string>>;
- //鏄剧ず鏉′欢鍚勭绫诲瀷鐘舵��
+ //鏄剧ず杈撳嚭鏉′欢鍚勭绫诲瀷鐘舵��
switch (outputTarget.target_type)
{
case "1":
@@ -219,37 +230,29 @@
{
string on_off = GetKeyValue("on_off", dicList);
string brightness = GetKeyValue("brightness", dicList);
- if (on_off != "")
+ if (on_off == "on" && brightness != "")
{
- if (on_off == "on")
- {
- stateStr = Language.StringByID(StringId.onLogic);
-
- }
- else
- {
- stateStr = Language.StringByID(StringId.offLogic);
-
- }
+ stateStr = Language.StringByID(StringId.onLogic) + brightness + "%";
}
- if (brightness != "")
+ else if (on_off == "on")
{
- stateStr += brightness + "%";
+ stateStr = Language.StringByID(StringId.onLogic);
}
- if (on_off != "" && on_off == "off")
+ else if (on_off == "off")
{
- targetView.btnState.Text = Language.StringByID(StringId.offLogic);
+ stateStr = Language.StringByID(StringId.offLogic);
}
- else
+ else if (brightness != "")
{
- targetView.btnState.Text = stateStr;
-
+ stateStr = brightness + "%";
}
-
+ targetView.btnState.Text = stateStr;
}
break;
case FunctionType.Curtain:
- {//寮�鍏崇伅
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
+ {
foreach (var dic in dicList)
{
string value = dic["value"];
@@ -275,52 +278,6 @@
targetView.btnState.Text = stateStr;
}
break;
- case FunctionType.MotorCurtain:
- case FunctionType.RollingShutter:
- {//寮�鍏崇伅
- string on_off = GetKeyValue("on_off", dicList);
- string brightness = GetKeyValue("brightness", dicList);
- if (on_off != "")
- {
- switch (on_off)
- {
- case "on":
- {
- stateStr = Language.StringByID(StringId.onLogic);
-
- }
- break;
- case "off":
- {
- stateStr = Language.StringByID(StringId.offLogic);
-
- }
- break;
- case "stop":
- {
- stateStr = Language.StringByID(StringId.stop);
- }
- break;
- }
- }
- if (brightness != "")
- {
- stateStr += brightness + "%";
-
- }
-
- if (on_off != "" && on_off == "stop"|| on_off != "" && on_off == "off")
- {
- targetView.btnState.Text = Language.StringByID(StringId.stop);
- }
- else
- {
- targetView.btnState.Text = stateStr;
-
- }
-
- }
- break;
case FunctionType.AC: {
string on_off = GetKeyValue("on_off", dicList);
string set_temp = GetKeyValue("set_temp", dicList);
@@ -331,12 +288,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 +303,7 @@
if (set_temp != "")
{
- stateStr += set_temp + "鈩�;";
+ stateStr += set_temp + "鈩�,";
}
if (mode != "")
@@ -356,22 +313,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 +342,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 +368,7 @@
targetView.btnState.Text = Language.StringByID(StringId.offLogic);
}
else {
- targetView.btnState.Text = stateStr.TrimEnd(';');
+ targetView.btnState.Text = stateStr.TrimEnd(',');
}
@@ -428,12 +385,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 +399,7 @@
if (set_temp != "")
{
- stateStr += set_temp + "鈩�;";
+ stateStr += set_temp + "鈩�,";
}
if (mode != "")
{
@@ -451,28 +408,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 +439,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 +466,7 @@
}
else
{
- targetView.btnState.Text = stateStr.TrimEnd(';');
+ targetView.btnState.Text = stateStr.TrimEnd(',');
}
}
@@ -543,7 +500,18 @@
{
Button button = (Button)sen;
//鎵惧埌褰撳墠缂栬緫鐨勭储寮�
- int indexVulae = int.Parse(targetView.btnClick.Tag.ToString());
+ int indexVulae =0;
+ for (int index = 0; index < Logic.currlogic.output.Count; index++)
+ {
+ Output target = Logic.currlogic.output[index];
+ if (target.sid == targetView.btnClick.Tag.ToString())
+ {
+ //鐢ㄦ埛鍙兘鍒犻櫎鏁版嵁锛屼娇鍒楄〃绱㈠紩鍙戠敓鏀瑰彉锛�
+ //閫氳繃鍞竴sid閲嶆柊鏌ユ壘鍒扮储寮曚笖鏇存柊绱㈠紩鍊�
+ indexVulae = index;
+ break;
+ }
+ }
//鏍囪缂栬緫鐘舵��
bool edit = true;
switch (button.Name)
--
Gitblit v1.8.0