From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 572 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 538 insertions(+), 34 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index c859bcb..214e0fc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -17,12 +17,6 @@
for (int i = 0; i < Logic.currlogic.input.Count; i++)
{
Input inputCondition = Logic.currlogic.input[i];
- if (inputCondition == null)
- {
- //闃叉鏈夌殑绌哄璞★紱
- //姝ｅ父鎯呭喌涓嬩笉浼氳鐜拌薄锛�
- continue;
- }
///鍚勭鏉′欢鐨刅iew
LogicView.AddOutputInputView inputView = new LogicView.AddOutputInputView();
inputView.FLayoutView(viewLayout);
@@ -40,9 +34,78 @@
inputView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
foreach (var dic in dicList)
{
+ string keyValue = dic["key"];
string value = dic["value"];
- inputView.btnText.Text = Language.StringByID(StringId.hour) + ": " + value;
- inputView.btnClick.AddTag("timepoint", value);
+ if (keyValue == "timepoint")
+ {
+ inputView.btnText.Text = Language.StringByID(StringId.hour) + ": " + value;
+ }
+ else
+ {
+ string strtext = "";
+ string statetext = "";
+ switch (keyValue)
+ {
+ case "before_sunrise":
+ {
+ strtext = Language.StringByID(StringId.sunrise);
+ statetext = Language.StringByID(StringId.advanced);
+
+ }
+ break;
+ case "before_sunset":
+ {
+
+ strtext = Language.StringByID(StringId.sunset);
+ statetext = Language.StringByID(StringId.advanced);
+
+ }
+ break;
+ case "before_noon":
+ {
+ strtext = Language.StringByID(StringId.at);
+ statetext = Language.StringByID(StringId.advanced);
+ }
+ break;
+ case "after_sunrise":
+ {
+ strtext = Language.StringByID(StringId.sunrise);
+ statetext = Language.StringByID(StringId.delayLogic);
+ }
+ break;
+ case "after_sunset":
+ {
+ strtext = Language.StringByID(StringId.sunset);
+ statetext = Language.StringByID(StringId.delayLogic);
+ }
+ break;
+ case "after_noon":
+ {
+ strtext = Language.StringByID(StringId.at);
+ statetext = Language.StringByID(StringId.delayLogic);
+ }
+ break;
+ }
+
+ if (value != "0")
+ {
+ if (value == "30")
+ {
+ statetext += value + Language.StringByID(StringId.s);
+ }
+ else
+ {
+ statetext += value + Language.StringByID(StringId.minute);
+ }
+ }
+ else
+ {
+ statetext = "";
+ }
+
+ inputView.btnText.Text = strtext;
+ inputView.btnState.Text = statetext;
+ }
}
}
break;
@@ -53,7 +116,6 @@
{
string value = dic["value"];
inputView.btnText.Text = Language.StringByID(StringId.timeHorizon) + ": " + value;
- inputView.btnClick.AddTag("timeHorizon", value);
}
}
@@ -102,6 +164,230 @@
}
}
break;
+ //浼犳劅鍣�
+ case SPK.SensorSmoke:
+ case SPK.SensorGas:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "alarm")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.xieluo);
+
+ }
+ else
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.wuxieluo);
+ }
+ }
+ }
+ break;
+ case SPK.SensorWater:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "alarm")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.luoshui);
+
+ }
+ else
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.wuluoshui);
+ }
+ }
+ }
+ break;
+ case SPK.SensorDryContact:
+ {
+ foreach (var dic in dicList)
+ {
+
+ string value = dic["value"];
+ if (value == "on")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.onLogic);
+
+ }
+ else
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.offLogic);
+ }
+ }
+ }
+ break;
+ case SPK.SensorShanLan:
+ case SPK.SensorDuiShe:
+ case SPK.SensorPir:
+ {
+ foreach (var dic in dicList)
+ {
+
+ string value = dic["value"];
+ if (value == "true")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.youren);
+
+ }
+ else
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.wuren);
+ }
+ }
+ }
+ break;
+ case SPK.SensorDoorWindow:
+ {
+ foreach (var dic in dicList)
+ {
+
+ string value = dic["value"];
+ if (value == "open")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
+
+ }
+ else
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.bihe);
+ }
+ }
+ }
+ break;
+ case SPK.SensoruUtrasonic:
+ {
+ string str = "";
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ switch (dic["key"])
+ {
+ case "status":
+ {
+ if (value == "true")
+ {
+ str+= Language.StringByID(StringId.youren)+";";
+ }
+ else
+ {
+ str += Language.StringByID(StringId.wuren) + ";";
+ }
+
+
+ }
+ break;
+ case "dismantle":
+ {
+ if (value == "true")
+ {
+ str += Language.StringByID(StringId.zaixian);
+ }
+ else
+ {
+ str += Language.StringByID(StringId.buzaixian);
+ }
+ }
+ break;
+
+ }
+
+ }
+ inputView.btnState.Text = str;
+ }
+ break;
+
+ }
+ }
+ break;
+ case "4":
+ {
+ inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
+ string strtext = "";
+ string strvalue = "";
+ foreach (var dic in dicList)
+ {
+ string key = dic["key"];
+ string comparator = dic["comparator"];
+ string value = dic["value"];
+
+ switch (key)
+ {
+ case "outdoor_temp":
+ {
+ strvalue = value;
+ if (comparator == ">")
+ {
+ strtext = Language.StringByID(StringId.wendugaoyu);
+ }
+ else if (comparator == "<")
+ {
+ strtext = Language.StringByID(StringId.wendudiyu);
+ }
+
+ }
+ break;
+ case "outdoor_humity":
+ {
+ strvalue = value;
+ if (comparator == ">")
+ {
+ strtext = Language.StringByID(StringId.shidugaoyu);
+ }
+ else if (comparator == "<")
+ {
+ strtext = Language.StringByID(StringId.shidudiyu);
+ }
+
+ }
+ break;
+ case "pm2.5":
+ {
+ strtext = Language.StringByID(StringId.PM25);
+ strvalue = new OutdoorEnvironment { }.GetString(value);
+ }
+ break;
+
+ }
+
+
+ }
+ inputView.btnText.Text = strtext;
+ inputView.btnState.Text = strvalue;
+ }
+ break;
+ case "6":
+ {
+ inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
+ foreach (var dic in dicList)
+ {
+ string strtext = "";
+ string value = dic["value"];
+ switch (value)
+ {
+ case "sunny":
+ {
+ strtext = Language.StringByID(StringId.clearday);
+
+ }
+ break;
+ case "cloudy":
+ {
+
+ strtext = Language.StringByID(StringId.cloudy);
+
+ }
+ break;
+ case "rainy":
+ {
+ strtext = Language.StringByID(StringId.rain);
+ }
+ break;
+
+ }
+ inputView.btnText.TextID = StringId.tianqibianhua;
+ inputView.btnState.Text = strtext;
}
}
break;
@@ -124,20 +410,50 @@
break;
}
}
-
//鏍囪缂栬緫鐘舵��
bool edit = true;
switch (button.Name)
{
case "1":
{
- FrameLayout fLayout = new FrameLayout
+ bool is_bool = false;
+ Input _input = Logic.currlogic.input[indexVulae];
+ if (_input.condition_type == "1")
{
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- thisView.AddChidren(fLayout);
- TimeTpye timeTpye = new TimeTpye();
- timeTpye.TimePoint(fLayout, edit, indexVulae);
+ var dicLists = _input.condition as List<Dictionary<string, string>>;
+ foreach (var dic in dicLists)
+ {
+ string keyValue = dic["key"];
+ if (keyValue != "timepoint")
+ {
+ //閫氳繃閿�兼煡鎵鹃敭鍊兼槸鍚︽槸
+ //锛堟棩鍑�/鏃ヨ惤/姝ｅ崍锛�
+ is_bool = true;
+ break;
+ }
+
+ }
+
+ }
+ if (is_bool)
+ {
+ //璺宠浆鍒帮紙鏃ュ嚭/鏃ヨ惤/姝ｅ崍锛夌晫闈�
+ SpeciaTime speciaTime = new SpeciaTime();
+ MainPage.BasePageView.AddChidren(speciaTime);
+ speciaTime.Show(edit, indexVulae);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ else
+ {
+ //璺宠浆鍒帮紙鏃堕棿鐐癸級鐣岄潰
+ FrameLayout fLayout = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ thisView.AddChidren(fLayout);
+ TimeTpye timeTpye = new TimeTpye();
+ timeTpye.TimePoint(fLayout, edit, indexVulae);
+ }
}
break;
case "2":
@@ -161,8 +477,78 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
break;
+ case "4":
+ {
+ ///褰撳墠鐨勭储寮曞�兼暟鎹璞�
+ Input inputedit = Logic.currlogic.input[indexVulae];
+ ///鐘舵�佸��
+ string stateValue = "";
+ ///鐘舵�佸�兼枃鏈�
+ int intValue = -1;
+ foreach (var dic in inputedit.condition)
+ {
+ string key = dic["key"];
+ string comparator = dic["comparator"];
+ stateValue = dic["value"];
+ switch (key)
+ {
+ case "outdoor_temp":
+ {
+ if (comparator == ">")
+ {
+ intValue = StringId.wendugaoyu;
+ }
+ else if (comparator == "<")
+ {
+ intValue = StringId.wendudiyu;
+ }
+ }
+ break;
+ case "outdoor_humity":
+ {
+
+ if (comparator == ">")
+ {
+ intValue = StringId.shidugaoyu;
+ }
+ else if (comparator == "<")
+ {
+ intValue = StringId.shidudiyu;
+ }
+
+ }
+ break;
+ case "pm2.5":
+ {
+ intValue = StringId.PM25;
+ }
+ break;
+
+ }
+ }
+ OutdoorEnvironment outdoorEnvironment = new OutdoorEnvironment();
+ if (intValue == StringId.PM25)
+ {
+ outdoorEnvironment.PmAction(thisView, stateValue);
+ }
+ else
+ {
+ outdoorEnvironment.InputBoxAction(intValue, stateValue);
+ }
+
+ }
+ break;
+ case "6":
+ {
+
+ WeatherCondition weatherCondition = new WeatherCondition();
+ MainPage.BasePageView.AddChidren(weatherCondition);
+ weatherCondition.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ break;
}
};
///鍒犻櫎鎺т欢
@@ -181,16 +567,10 @@
/// <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];
- if (outputTarget == null)
- {
- //闃叉鏈夌殑绌哄璞★紱
- //姝ｅ父鎯呭喌涓嬩笉浼氳鐜拌薄锛�
- continue;
- }
///鍚勭鏉′欢鐨刅iew
LogicView.AddOutputInputView targetView = new LogicView.AddOutputInputView();
targetView.FLayoutView(viewLayout);
@@ -292,17 +672,19 @@
targetView.btnState.Text = stateStr;
}
break;
- case SPK.AcStandard: {
+ case SPK.AcStandard:
+ {
string on_off = GetKeyValue("on_off", dicList);
string set_temp = GetKeyValue("set_temp", dicList);
string mode = GetKeyValue("mode", dicList);
string fan = GetKeyValue("fan", dicList);
- if (on_off != "") {
+ if (on_off != "")
+ {
switch (on_off)
{
case "on":
{
- stateStr = Language.StringByID(StringId.onLogic)+",";
+ stateStr = Language.StringByID(StringId.onLogic) + ",";
}
break;
case "off":
@@ -310,7 +692,7 @@
stateStr = Language.StringByID(StringId.offLogic) + ",";
}
break;
-
+
}
}
@@ -327,7 +709,7 @@
{
case "cool":
{
- stateStr += Language.StringByID(StringId.coolLogic)+",";
+ stateStr += Language.StringByID(StringId.coolLogic) + ",";
}
break;
case "heat":
@@ -356,7 +738,7 @@
{
case "high":
{
- stateStr += Language.StringByID(StringId.HighWindSpeed)+",";
+ stateStr += Language.StringByID(StringId.HighWindSpeed) + ",";
}
break;
case "medium":
@@ -381,7 +763,8 @@
{
targetView.btnState.Text = Language.StringByID(StringId.offLogic);
}
- else {
+ else
+ {
targetView.btnState.Text = stateStr.TrimEnd(',');
}
@@ -422,7 +805,7 @@
{
case "day":
{
- stateStr += Language.StringByID(StringId.dayMode)+",";
+ stateStr += Language.StringByID(StringId.dayMode) + ",";
}
break;
case "night":
@@ -476,7 +859,7 @@
}
if (on_off != "" && on_off == "off")
{
- targetView.btnState.Text =Language.StringByID(StringId.offLogic);
+ targetView.btnState.Text = Language.StringByID(StringId.offLogic);
}
else
{
@@ -514,7 +897,7 @@
{
Button button = (Button)sen;
//鎵惧埌褰撳墠缂栬緫鐨勭储寮�
- int indexVulae =0;
+ int indexVulae = 0;
for (int index = 0; index < Logic.currlogic.output.Count; index++)
{
Output target = Logic.currlogic.output[index];
@@ -823,6 +1206,128 @@
}
break;
+ case SPK.SensorGas:
+ case SPK.SensorSmoke:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "alarm")
+ {
+ button1.Text = Language.StringByID(StringId.xieluo);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.wuxieluo);
+ }
+ }
+ }
+ break;
+ case SPK.SensorWater:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "alarm")
+ {
+ button1.Text = Language.StringByID(StringId.luoshui);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.wuluoshui);
+ }
+ }
+ }
+ break;
+ case SPK.SensorDryContact:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "on")
+ {
+ button1.Text = Language.StringByID(StringId.onLogic);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.offLogic);
+ }
+ }
+ }
+ break;
+ case SPK.SensorShanLan:
+ case SPK.SensorDuiShe:
+ case SPK.SensorPir:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "true")
+ {
+ button1.Text = Language.StringByID(StringId.youren);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.wuren);
+ }
+ }
+ }
+ break;
+ case SPK.SensorDoorWindow:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "open")
+ {
+ button1.Text = Language.StringByID(StringId.kaiqi);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.bihe);
+ }
+ }
+ }
+ break;
+ case SPK.SensoruUtrasonic:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ switch (dic["key"])
+ {
+ case "status":
+ {
+ if (value == "true")
+ {
+ button1.Text = Language.StringByID(StringId.youren);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.wuren);
+ }
+
+
+ }
+ break;
+ case "dismantle":
+ {
+ if (value == "true")
+ {
+ button1.Text = Language.StringByID(StringId.zaixian);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.buzaixian);
+ }
+ }
+ break;
+
+ }
+
+ }
+ }
+ break;
}
}
/// <summary>
@@ -846,7 +1351,6 @@
}
return valueStr;
}
-
/// <summary>
///鑾峰彇鑷姩鍖栧悕绉�
/// </summary>
--
Gitblit v1.8.0