| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .vs/HDL_APP_Project/xs/sqlite3/storage.ide | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| .vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,21 +1,6 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs"> <Files> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" Line="108" Column="67" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="129" Column="43" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/DateView.cs" Line="27" Column="27" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/CheckView.cs" Line="5" Column="18" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs" Line="135" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="14" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="11" Column="27" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="43" Column="90" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="388" Column="96" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="548" Column="68" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs" Line="499" Column="10" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs" Line="162" Column="10" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs" Line="1" Column="1" /> </Files> <MonoDevelop.Ide.Workbench> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> @@ -25,10 +10,8 @@ <Node name="UI2" expanded="True"> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True"> <Node name="LogicView" expanded="True" /> <Node name="PublicInterface.cs" selected="True" /> <Node name="AddLogic.cs" selected="True" /> </Node> <Node name="Scene" expanded="True" /> </Node> <Node name="FuntionControlView" expanded="True"> <Node name="FoolHeating" expanded="True" /> @@ -49,7 +32,7 @@ <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/hdl/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" line="133" column="1" /> .vs/HDL_APP_Project/xs/sqlite3/storage.ideBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shmBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-walBinary files differ
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -184,6 +184,19 @@ ///保存点击事件 saveView.btnClick.MouseUpEventHandler += (sender, e) => { if (Logic.currlogic.input.Count == 0) { new LogicView.TipPopView().FlashingBox("条件不能为空"); return; } if (Logic.currlogic.output.Count == 0) { new LogicView.TipPopView().FlashingBox("目标不能为空"); return; } Loading loading = new Loading(); this.AddChidren(loading); HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null; @@ -226,7 +239,7 @@ //数据返序列化为Logic对象 var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay); var logic = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic>(str); if (logic.userLogicId!="") if (logic.userLogicId != "") { //更新云端唯一自动化id; Logic.currlogic.userLogicId = logic.userLogicId; HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -158,7 +158,7 @@ FrameLayout bghFrameLyout = new FrameLayout { X = Application.GetRealWidth(10), X = Application.GetRealWidth(118), Y = Application.GetRealHeight(103), Width = Application.GetRealWidth(160), Height = Application.GetRealHeight(21 + 44), 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": { //用sid找到设备； @@ -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": @@ -331,12 +342,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 +357,7 @@ if (set_temp != "") { stateStr += set_temp + "℃;"; stateStr += set_temp + "℃,"; } if (mode != "") @@ -356,22 +367,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 +396,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 +422,7 @@ targetView.btnState.Text = Language.StringByID(StringId.offLogic); } else { targetView.btnState.Text = stateStr.TrimEnd(';'); targetView.btnState.Text = stateStr.TrimEnd(','); } @@ -428,12 +439,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 +453,7 @@ if (set_temp != "") { stateStr += set_temp + "℃;"; stateStr += set_temp + "℃,"; } if (mode != "") { @@ -451,28 +462,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 +493,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 +520,7 @@ } else { targetView.btnState.Text = stateStr.TrimEnd(';'); targetView.btnState.Text = stateStr.TrimEnd(','); } } @@ -543,7 +554,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) HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -1155,7 +1155,6 @@ } break; } } /// <summary> /// 添加处理选中数据
