From 38ca58ae790dc71e50070b54345455988a4a64a3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 27 八月 2021 11:24:52 +0800
Subject: [PATCH] 2021-8-27-01
---
HDL-ON_Android/HDL-ON_Android.csproj | 1
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 31 +++
HDL-ON_iOS/Resources/Language.ini | 4
HDL-ON_Android/Assets/Language.ini | 8
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 35 +++
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 254 ++++++++++++++++++++++++++--
HDL-ON_iOS/HDL-ON_iOS.csproj | 1
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 84 +++++++++
HDL_ON/Common/R.cs | 9 +
HDL_ON/HDL_ON.projitems | 1
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 90 +++++++++
HDL_ON/UI/UI2/3-Intelligence/Automation/Security.cs | 2
12 files changed, 493 insertions(+), 27 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 061811e..c7f0e01 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -992,9 +992,10 @@
7144=excellence
7145=Security
7146=Add security
-
7147=Arm
7148=Disarm
+7149=Manually
+7150=Smart
9000=Please sign in with new cell phone number.
@@ -2077,9 +2078,12 @@
7144=浼樼
7145=瀹夐槻
7146=娣诲姞瀹夐槻
-
7147=甯冮槻
7148=鎾ら槻
+7149=鎵嬪姩
+7150=鏅鸿兘
+
+
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 6a3c810..3fb89f0 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -443,6 +443,7 @@
<AndroidAsset Include="Assets\Phone\Collection\DefenseStatusIcon.png" />
<AndroidAsset Include="Assets\Phone\Collection\DisarmStatusIcon.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\ResidenceDefenseIcon.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\security.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\BindScene.png" />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 8be2178..584102e 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1331,6 +1331,7 @@
<BundleResource Include="Resources\Phone\Collection\DefenseStatusIcon.png" />
<BundleResource Include="Resources\Phone\Collection\DisarmStatusIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\ResidenceDefenseIcon.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\security.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 79c733d..5650c30 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -994,6 +994,8 @@
7146=Add security
7147=Arm
7148=Disarm
+7149=Manually
+7150=Smart
@@ -2079,6 +2081,8 @@
7146=娣诲姞瀹夐槻
7147=甯冮槻
7148=鎾ら槻
+7149=鎵嬪姩
+7150=鏅鸿兘
9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index e22b852..89f39e2 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -2555,6 +2555,15 @@
/// 鎾ら槻
/// </summary>
public const int chefang = 7148;
+ /// <summary>
+ /// manual:鎵嬪姩
+ /// </summary>
+ public const int shoudong = 7149;
+ /// <summary>
+ /// smart锛氭櫤鑳�
+ /// </summary>
+ public const int zhineng = 7150;
+
#region LE鏂板
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 163b1fa..dcd6964 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -476,6 +476,7 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmCenter\AddInputPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmCenter\AddOutputPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmCenter\AddOutputSettingPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\Security.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" />
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 168b3fc..b9d0e37 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -273,6 +273,90 @@
#endregion
}
break;
+ //娓╁害浼犳劅鍣�
+ case SPK.SensorTemperature:
+ {
+ ///娓╁害
+ LogicView.FunTypeView wenuView = new LogicView.FunTypeView();
+ wenuView.btnText.TextID = StringId.wendu;
+ fLayout.AddChidren(wenuView.FLayoutView());
+
+ ///娓╁害鐐瑰嚮浜嬩欢
+ wenuView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ new PublicInterface { }.ViewZuHe(this, StringId.wendugaoyu, StringId.wendudiyu, (intText, view) =>
+ {
+ InputBoxAction(device, intText, index, edit);
+ });
+ };
+ }
+ break;
+ //婀垮害浼犳劅鍣�
+ case SPK.SensorHumidity:
+ {
+ ///婀垮害
+ LogicView.FunTypeView shiduView = new LogicView.FunTypeView();
+ shiduView.btnText.TextID = StringId.shidu;
+ fLayout.AddChidren(shiduView.FLayoutView());
+ ///婀垮害鐐瑰嚮浜嬩欢
+ shiduView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ new PublicInterface { }.ViewZuHe(this, StringId.shidugaoyu, StringId.shidudiyu, (intText, view) =>
+ {
+ InputBoxAction(device, intText, index, edit);
+ });
+
+ };
+ }
+ break;
+ //co2
+ case SPK.SensorCO2:
+ {
+
+
+ ///co2
+ LogicView.FunTypeView co2View = new LogicView.FunTypeView();
+ co2View.btnText.TextID = StringId.co2;
+ fLayout.AddChidren(co2View.FLayoutView());
+
+ ///co2鐐瑰嚮浜嬩欢
+ co2View.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ PmCo2TvocAction(this, device, "co2", StringId.co2, index, edit);
+ };
+ }
+ break;
+ //pm2.5
+ case SPK.SensorPm25:
+ {
+ ///pm2.5
+ LogicView.FunTypeView pm25View = new LogicView.FunTypeView();
+ pm25View.btnText.TextID = StringId.pm25;
+ fLayout.AddChidren(pm25View.FLayoutView());
+
+ ///pm2.5鐐瑰嚮浜嬩欢
+ pm25View.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ PmCo2TvocAction(this, device, "pm25", StringId.pm25, index, edit);
+ };
+ }
+ break;
+ //tvoc
+ case SPK.SensorTVOC:
+ {
+ ///tvoc
+ LogicView.FunTypeView tvocView = new LogicView.FunTypeView();
+ tvocView.btnText.TextID = StringId.tvoc;
+ fLayout.AddChidren(tvocView.FLayoutView());
+
+ ///tvoc鐐瑰嚮浜嬩欢
+ tvocView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ PmCo2TvocAction(this, device, "tvoc", StringId.tvoc, index, edit);
+
+ };
+ }
+ break;
}
#region 淇濆瓨
///淇濆瓨View
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 8091f6f..7c485d1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -376,7 +376,41 @@
}
break;
+ case SPK.SensorTemperature:
+ {
+
+ string str =new InpOrOutLogicMethod { }.GetText(dicList);
+ inputView.btnState.Text = str;
+ }
+ break;
+ case SPK.SensorHumidity:
+ {
+ string str = new InpOrOutLogicMethod { }.GetText(dicList);
+ inputView.btnState.Text = str;
+ }
+ break;
+ case SPK.SensorCO2:
+ {
+ string str = new InpOrOutLogicMethod { }.GetText(dicList);
+ inputView.btnState.Text = str;
+
+ }
+ break;
+ case SPK.SensorPm25:
+ {
+ string str = new InpOrOutLogicMethod { }.GetText(dicList);
+ inputView.btnState.Text = str;
+
+ }
+ break;
+ case SPK.SensorTVOC:
+ {
+ string str = new InpOrOutLogicMethod { }.GetText(dicList);
+ inputView.btnState.Text = str;
+
+ }
+ break;
}
}
break;
@@ -612,7 +646,15 @@
{
//鐢╯id鎵惧埌璁惧锛�
var device = LogicMethod.CurrLogicMethod.GetDevice(inputCondition.sid);
- if (device.spk == SPK.SensorEnvironment|| device.spk == SPK.SensorEnvironment2 || device.spk == SPK.SensorEnvironment3)
+ if (device.spk == SPK.SensorEnvironment
+ || device.spk == SPK.SensorEnvironment2
+ || device.spk == SPK.SensorEnvironment3
+ || device.spk == SPK.SensorTemperature
+ || device.spk == SPK.SensorHumidity
+ || device.spk == SPK.SensorCO2
+ || device.spk == SPK.SensorPm25
+ || device.spk == SPK.SensorTVOC
+ )
{
//杩欎釜璁惧姣旇緝鐗规畩
ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
@@ -766,7 +808,7 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
break;
-
+
}
};
///鍒犻櫎鎺т欢
@@ -813,7 +855,6 @@
targetView.btnText.Text = device.name;
//鏀瑰彉璁惧鍚嶇О鏄剧ず鎺т欢瀹藉害
targetView.btnText.Width = Application.GetRealWidth(80);
-
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
@@ -1048,27 +1089,61 @@
break;
}
+ }
+ if (on_off != "" && on_off == "off")
+ {
+ stateStr = Language.StringByID(StringId.offLogic);
+ }
+ else
+ {
+ stateStr = stateStr.TrimEnd(',');
- switch (mode)
+ }
+ }
+ break;
+ case SPK.AirFreshStandard:
+ {
+ string on_off = GetKeyValue("on_off", dicList);
+ string fan = GetKeyValue("fan", dicList);
+ if (on_off != "")
+ {
+ switch (on_off)
{
- case "cool":
+ case "on":
{
- stateStr += Language.StringByID(StringId.coolLogic) + ",";
+ stateStr = Language.StringByID(StringId.onLogic) + ",";
}
break;
- case "heat":
+ case "off":
{
- stateStr += Language.StringByID(StringId.heatingLogic) + ",";
+ stateStr = Language.StringByID(StringId.offLogic) + ",";
+ }
+ break;
+ }
+ }
+ if (fan != "")
+ {
+
+ switch (fan)
+ {
+ case "high":
+ {
+ stateStr += Language.StringByID(StringId.HighWindSpeed) + ",";
+ }
+ break;
+ case "medium":
+ {
+ stateStr += Language.StringByID(StringId.MiddleWindSpeed) + ",";
+ }
+ break;
+ case "low":
+ {
+ stateStr += Language.StringByID(StringId.LowWindSpeed) + ",";
}
break;
case "auto":
{
- stateStr += Language.StringByID(StringId.autoLogic) + ",";
- }
- break;
- case "dry":
- {
- stateStr += Language.StringByID(StringId.dehumidifyLogic) + ",";
+ stateStr += Language.StringByID(StringId.Auto) + ",";
}
break;
}
@@ -1506,6 +1581,73 @@
}
break;
+ case SPK.AirFreshStandard:
+ {
+
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ switch (dic["key"])
+ {
+ case "on_off":
+ {
+ switch (value)
+ {
+ case "on":
+ {
+ button1.Text = Language.StringByID(StringId.onLogic);
+ }
+ break;
+ case "off":
+ {
+ button1.Text = Language.StringByID(StringId.offLogic);
+ }
+ break;
+ }
+ }
+ break;
+
+ case "fan":
+ {
+ if (button2 == null)
+ {
+ //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+ break;
+ }
+ switch (value)
+ {
+ case "high":
+ {
+ button2.Text = Language.StringByID(StringId.HighWindSpeed);
+ }
+ break;
+ case "medium":
+ {
+ button2.Text = Language.StringByID(StringId.MiddleWindSpeed);
+ }
+ break;
+ case "low":
+ {
+ button2.Text = Language.StringByID(StringId.LowWindSpeed);
+ }
+ break;
+ case "auto":
+ {
+ button2.Text = Language.StringByID(StringId.Auto);
+ }
+ break;
+ }
+
+
+ }
+ break;
+
+ }
+
+ }
+
+ }
+ break;
case SPK.SensorGas:
case SPK.SensorSmoke:
{
@@ -1700,6 +1842,13 @@
name = device.name + "-";
}
break;
+ case "10":
+ {
+ //鐢╯id鎵惧埌鍦烘櫙锛�
+ var scene = LogicMethod.CurrLogicMethod.GetSecne(inputCondition.sid);
+ name = scene.name + "-";
+ }
+ break;
}
//榛樿鍙栫涓�涓洰鏍�
@@ -1821,18 +1970,24 @@
}
break;
+ case "3":
+ {
+ //鐢╯id鎵惧埌瀹夐槻锛�
+ var security = LogicMethod.CurrLogicMethod.GetSecurity(outputTarget.sid);
+ name += security.name;
+
+ }
+ break;
}
if (!MainView.IsGatewayType)
{
- name +=Language.StringByID(StringId.push);
+ name += Language.StringByID(StringId.push);
}
}
catch { }
return name;
}
-
-
/// <summary>
/// 寤舵椂鏃堕棿鏂规硶
/// </summary>
@@ -1928,11 +2083,74 @@
state = seconds.ToString() + Language.StringByID(StringId.s);
}
}
- if (!string.IsNullOrEmpty(state)) {
+ if (!string.IsNullOrEmpty(state))
+ {
state = Language.StringByID(StringId.delayLogic) + state;
}
return state;
}
+ /// <summary>
+ /// 鑾峰彇鏄剧ず闈㈢啛鏂囨湰
+ /// </summary>
+ /// <param name="dicList">鐘舵�佹暟鎹垪琛�</param>
+ /// <returns></returns>
+ private string GetText(List<Dictionary<string, string>> dicList)
+ {
+ string strtext = "";
+ foreach (var dic in dicList)
+ {
+ string key = dic["key"];
+ string value = dic["value"];
+ string comparator = dic["comparator"];
+ switch (key)
+ {
+
+ case "temperature":
+ {
+ if (comparator == ">")
+ {
+ strtext = ">" + value + "鈩�";
+ }
+ else if (comparator == "<")
+ {
+ strtext = "<" + value + "鈩�";
+ }
+
+ }
+ break;
+ case "humidity":
+ {
+ if (comparator == ">")
+ {
+ strtext = ">" + value + "%";
+ }
+ else if (comparator == "<")
+ {
+ strtext = "<" + value + "%";
+ }
+
+ }
+ break;
+ case "co2":
+ {
+ strtext = Language.StringByID(StringId.co2) + new PublicInterface { }.GetString("co2", value);
+ }
+ break;
+ case "pm25":
+ {
+ strtext = Language.StringByID(StringId.pm25) + new PublicInterface { }.GetString("pm25", value);
+ }
+ break;
+ case "tvoc":
+ {
+ strtext = Language.StringByID(StringId.tvoc) + new PublicInterface { }.GetString("tvoc", value);
+ }
+ break;
+ }
+ }
+ return strtext;
+ }
}
}
+
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 8acfce2..7afe5be 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -344,6 +344,11 @@
strPath = "LogicIcon/heatlogic.png";
}
break;
+ case SPK.AirFreshStandard:
+ {
+ strPath = "LogicIcon/heatlogic.png";
+ }
+ break;
case SPK.SensorSmoke:
case SPK.SensorWater:
case SPK.SensorGas:
@@ -357,6 +362,11 @@
case SPK.SensorEnvironment:
case SPK.SensorEnvironment2:
case SPK.SensorEnvironment3:
+ case SPK.SensorTemperature:
+ case SPK.SensorHumidity:
+ case SPK.SensorCO2:
+ case SPK.SensorPm25:
+ case SPK.SensorTVOC:
{
strPath = "LogicIcon/sensor.png";
}
@@ -404,6 +414,11 @@
{
deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
}
+ var airFresh = deviceList.Find((device) => device.spk == SPK.AirFreshStandard);
+ if (airFresh != null)
+ {
+ deviceStrTypeList.Add(Language.StringByID(StringId.AirFresh));
+ }
var sensor = deviceList.Find((device) =>
device.spk == SPK.SensorWater
|| device.spk == SPK.SensorGas
@@ -418,6 +433,11 @@
|| device.spk == SPK.SensorEnvironment
|| device.spk == SPK.SensorEnvironment2
|| device.spk == SPK.SensorEnvironment3
+ || device.spk == SPK.SensorTemperature
+ || device.spk == SPK.SensorHumidity
+ || device.spk == SPK.SensorCO2
+ || device.spk == SPK.SensorPm25
+ || device.spk == SPK.SensorTVOC
);
if (sensor != null)
{
@@ -456,6 +476,10 @@
{
functionTypeList.Add(SPK.FloorHeatStandard);
}
+ else if (deviceType == Language.StringByID(StringId.AirFresh))
+ {
+ functionTypeList.Add(SPK.AirFreshStandard);
+ }
else if (deviceType == Language.StringByID(StringId.Sensor))
{
functionTypeList.Add(SPK.SensorSmoke);
@@ -471,6 +495,11 @@
functionTypeList.Add(SPK.SensorEnvironment);
functionTypeList.Add(SPK.SensorEnvironment2);
functionTypeList.Add(SPK.SensorEnvironment3);
+ functionTypeList.Add(SPK.SensorTemperature);
+ functionTypeList.Add(SPK.SensorHumidity);
+ functionTypeList.Add(SPK.SensorCO2);
+ functionTypeList.Add(SPK.SensorPm25);
+ functionTypeList.Add(SPK.SensorTVOC);
}
@@ -511,6 +540,11 @@
deviceTypeList.Add(SPK.SensorEnvironment);
deviceTypeList.Add(SPK.SensorEnvironment2);
deviceTypeList.Add(SPK.SensorEnvironment3);
+ deviceTypeList.Add(SPK.SensorTemperature);
+ deviceTypeList.Add(SPK.SensorHumidity);
+ deviceTypeList.Add(SPK.SensorCO2);
+ deviceTypeList.Add(SPK.SensorPm25);
+ deviceTypeList.Add(SPK.SensorTVOC);
}
break;
@@ -526,6 +560,7 @@
deviceTypeList.Add(SPK.CurtainTrietex);
deviceTypeList.Add(SPK.AcStandard);
deviceTypeList.Add(SPK.FloorHeatStandard);
+ deviceTypeList.Add(SPK.AirFreshStandard);
}
break;
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 14b652c..fce29b5 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -648,6 +648,16 @@
};
}
break;
+ case "airFresh":
+ {
+ list = new List<string> {
+ Language.StringByID(StringId.zidong),
+ Language.StringByID(StringId.shoudong),
+ Language.StringByID(StringId.dingshi),
+ Language.StringByID(StringId.zhineng),
+ };
+ }
+ break;
case "week":
{
list = new List<string> {
@@ -796,6 +806,27 @@
}
}
break;
+ case "airFresh":
+ {
+
+ if (text == Language.StringByID(StringId.autoLogic))
+ {
+ str = "auto";
+ }
+ else if (text == Language.StringByID(StringId.shoudong))
+ {
+ str = "manual";
+ }
+ else if (text == Language.StringByID(StringId.dingshi))
+ {
+ str = "timer";
+ }
+ else if (text == Language.StringByID(StringId.zhineng))
+ {
+ str = "smart";
+ }
+ }
+ break;
}
return str;
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Security.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Security.cs
index c6caebb..548c92b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Security.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Security.cs
@@ -92,7 +92,7 @@
outputDevice.target_type = "3";
outputDevice.sid = sid;
outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "security" }, { "value", selecttionMode } } };
- AddOutput(outputDevice);
+ AddOutput(outputDevice, true);
LogicMethod.CurrLogicMethod.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index ecd18e9..2b40f4b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -312,6 +312,88 @@
#endregion
}
break;
+ case SPK.AirFreshStandard:
+ {
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView AirFreshSwitchVie = new LogicView.FunTypeView();
+ AirFreshSwitchVie.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(AirFreshSwitchVie.FLayoutView());
+
+ ///椋庨��
+ LogicView.FunTypeView AirFreshSpeedView = new LogicView.FunTypeView();
+ AirFreshSpeedView.frameLayout.Y = AirFreshSwitchVie.frameLayout.Bottom;
+ AirFreshSpeedView.btnText.TextID = StringId.speedLogic;
+ fLayout.AddChidren(AirFreshSpeedView.FLayoutView());
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ AirFreshSwitchVie.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+
+ SwitchViewMethod(device, AirFreshSwitchVie.btnState, 2);
+ };
+ ///椋庨�熺偣鍑讳簨浠�
+ AirFreshSpeedView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ //瀹氫箟涓�涓复鏃跺垪琛�
+ List<string> fanAttrList = new List<string>();
+ //鍔ㄦ�佽鍙栨柊椋庨閫熷垪琛�
+ var fanAttr = device.GetAttribute(FunctionAttributeKey.FanSpeed);
+ foreach (var fanAttrValue in fanAttr.value)
+ {
+ switch (fanAttrValue)
+ {
+ case "high":
+ {
+ fanAttrList.Add(Language.StringByID(StringId.HighWindSpeed));
+ }
+ break;
+ case "medium":
+ {
+ fanAttrList.Add(Language.StringByID(StringId.MiddleWindSpeed));
+ }
+ break;
+ case "low":
+ {
+
+ fanAttrList.Add(Language.StringByID(StringId.LowWindSpeed));
+ }
+ break;
+ case "auto":
+ {
+ fanAttrList.Add(Language.StringByID(StringId.Auto));
+ break;
+ }
+
+ }
+ }
+ ///涔嬪墠鐨勭姸鎬佹枃鏈�
+ string currText = AirFreshSpeedView.btnState.Text;
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string keyVlaue = "fan";
+ selectedState = device.spk + "_" + keyVlaue;
+ PublicInterface speedView = new PublicInterface();
+ var speedListStr = fanAttrList;// speedView.GetViewList(keyVlaue);
+ speedView.SingleSelectionShow(this, speedListStr, Language.StringByID(StringId.speedLogic), currText
+ , (stateValue) =>
+ {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ AirFreshSpeedView.btnState.Text = stateValue;
+ //鏁版嵁灏佽
+ AddDictionary(keyVlaue, speedView.GetModeValueString(stateValue, keyVlaue));
+
+ });
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, AirFreshSwitchVie.btnState, AirFreshSpeedView.btnState, null, null);
+ }
+
+ #endregion
+ }
+ break;
}
#endregion
@@ -356,9 +438,9 @@
}
case SPK.AcStandard:
case SPK.FloorHeatStandard:
+ case SPK.AirFreshStandard:
{
-
- //(绌鸿皟/鍦扮儹)鍋氫簡涓�涓壒娈婂鐞嗭紱
+ //鍋氫簡涓�涓壒娈婂鐞嗭紱
bool _bool = false;
for (int i = 0; i < dicSateteList.Count; i++)
{
@@ -378,8 +460,6 @@
diction.Add("value", "on");
dicSateteList.Add(diction);
}
-
-
}
break;
}
@@ -600,8 +680,6 @@
}
}
-
-
}
}
--
Gitblit v1.8.0