| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,31 +1,27 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs"> <Files> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="336" Column="27" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="620" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs" /> <File FileName="HDL_ON/Common/R.cs" /> <File FileName="../EvoyoHomeNewCloud/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="62" Column="54" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="83" Column="43" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs" Line="62" Column="70" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs" Line="203" Column="24" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" Line="50" Column="15" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="UI2" expanded="True"> <Node name="4-PersonalCenter" expanded="True"> <Node name="PirDevice" expanded="True"> <Node name="BrandList.cs" selected="True" /> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True"> <Node name="AddTarget.cs" selected="True" /> </Node> </Node> <Node name="4-PersonalCenter" expanded="True" /> </Node> </Node> </Node> HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -47,7 +47,7 @@ delayView.frameLayout.Y = sceneView.frameLayout.Bottom; delayView.btnText.TextID = StringId.delayLogic; delayView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png"; viewLayout.AddChidren(delayView.FLayoutView()); //viewLayout.AddChidren(delayView.FLayoutView()); #endregion #region 所有点击事件 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -69,6 +69,7 @@ } } break; //水浸传感器 case SPK.SensorWater: { LogicView.FunTypeView view = new LogicView.FunTypeView(); @@ -85,7 +86,9 @@ } break; //烟雾传感器 case SPK.SensorSmoke: //燃气传感器 case SPK.SensorGas: { LogicView.FunTypeView view = new LogicView.FunTypeView(); @@ -102,6 +105,7 @@ } break; //干接点 case SPK.SensorDryContact: { LogicView.FunTypeView view = new LogicView.FunTypeView(); @@ -118,8 +122,11 @@ } break; //红外珊栏传感器 case SPK.SensorShanLan: //红外对射传感器 case SPK.SensorDuiShe: //红外移动传感器 case SPK.SensorPir: { LogicView.FunTypeView view = new LogicView.FunTypeView(); @@ -135,6 +142,7 @@ } } break; //门窗传感器 case SPK.SensorDoorWindow: { LogicView.FunTypeView view = new LogicView.FunTypeView(); @@ -150,6 +158,7 @@ } } break; //超声波传感器 case SPK.SensoruUtrasonic: { @@ -175,6 +184,7 @@ } } break; //毫米波传感器 case SPK.SenesorMegahealth: { LogicView.FunTypeView view = new LogicView.FunTypeView(); @@ -359,7 +369,7 @@ //显示文本 button.TextID = intValue; selectedState = device.spk + "_" + value; AddDictionary(keyVlaue, value); AddDictionary(keyVlaue, value, "string"); }); @@ -391,29 +401,34 @@ /// </summary> /// <param name="KeyValue">设备属性值，云雀上定义好的</param> /// <param name="selectedValue">状态值</param> private void AddDictionary(string KeyValue, string selectedValue) /// <param name="data_type">类型</param> /// <param name="comparator">比较关系</param> private void AddDictionary(string KeyValue, string selectedValue,string data_type,string comparator="=") { //数据封装 Dictionary<string, string> dic = new Dictionary<string, string>(); LogicMethod.dictionary(dic, "key", KeyValue); LogicMethod.dictionary(dic, "comparator", "="); LogicMethod.dictionary(dic, "data_type", "string"); LogicMethod.dictionary(dic, "comparator", comparator); LogicMethod.dictionary(dic, "data_type", data_type); LogicMethod.dictionary(dic, "value", selectedValue); AddDictionaryList(KeyValue, dic); AddDictionaryList(KeyValue, comparator,dic); } /// <summary> /// 更新数据列表 /// </summary> /// <param name="keyValue">设备属性值，云雀上定义好的</param> /// <param name="keyValue">设备属性值，云雀上定义好的</param> /// <param name="comparator">比较关系</param> /// <param name="dictionary">添加选中数据</param> /// <returns></returns> private void AddDictionaryList(string keyValue, Dictionary<string, string> dictionary) private void AddDictionaryList(string keyValue,string comparator, Dictionary<string, string> dictionary) { int indexValue = -1; for (int i = 0; i < dicSateteList.Count; i++) { var dic = dicSateteList[i]; if (dic.ContainsValue(keyValue)) string key = dic["key"]; string comparatorValue = dic["comparator"]; if (key == keyValue && comparatorValue == comparator) { //判断是否存在 indexValue = i; HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs
@@ -75,7 +75,7 @@ pmhigherView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16); pmhigherView.btnText.TextID = StringId.PM25; viewLayout.AddChidren(pmhigherView.FLayoutView()); #endregion @@ -110,7 +110,7 @@ PmAction(this); }; #endregion } @@ -119,7 +119,7 @@ /// </summary> /// <param name="textInt">文本</param> /// <param name="stateValue">编辑之前的状态值,默认为20</param> public void InputBoxAction(int textInt,string stateValue="20") public void InputBoxAction(int textInt, string stateValue = "20") { new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) => { @@ -217,7 +217,7 @@ /// <param name="input"></param> /// <param name="keyValue"></param> /// <param name="comparator">比较关系</param> private void AddCondition(Input input, string keyValue,string comparator) private void AddCondition(Input input, string keyValue, string comparator) { ///记录索引值 int index = -1; @@ -261,7 +261,7 @@ /// <param name="keyValue"></param> /// <param name="comparator">比较关系</param> /// <returns></returns> private bool ExistKey(List<Dictionary<string, string>> dicList, string keyValue, string comparator) private bool ExistKey(List<Dictionary<string, string>> dicList, string keyValue, string comparator) { for (int i = 0; i < dicList.Count; i++) { @@ -277,7 +277,11 @@ return false; } /// <summary> /// 数值返回文本 /// </summary> /// <param name="strValue">值</param> /// <returns></returns> public string GetString(string strValue) { string text = "";
