派生自 ~xm/HomeApp
| .DS_Store | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.DS_StoreBinary files differ
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,23 +1,13 @@ <Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default"> <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" /> <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" /> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SoneLogicList.cs"> <Files> <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="728" Column="34" /> <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="503" Column="76" /> <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1040" Column="27" /> <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="282" Column="114" /> <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="850" Column="35" /> <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="392" Column="79" /> <File FileName="Shared/Common/Logic.cs" Line="46" Column="33" /> <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs" Line="543" Column="18" /> <File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="25" Column="23" /> <File FileName="Shared/Phone/ZigBee/Device/CommonDevice.cs" Line="21" Column="23" /> <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="300" Column="32" /> <File FileName="Shared/Phone/UserCenter/Residence/ResidenceListForm.cs" Line="1" Column="1" /> <File FileName="Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs" Line="1" Column="1" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="267" Column="35" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="101" Column="65" /> <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="323" Column="92" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="52" Column="62" /> <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="63" Column="61" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="618" Column="41" /> <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="891" Column="60" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -27,16 +17,17 @@ <Node name="Phone" expanded="True"> <Node name="Device" expanded="True"> <Node name="Logic" expanded="True"> <Node name="DoorLockLogic" expanded="True"> <Node name="LockLogicList.cs" selected="True" /> </Node> <Node name="LogicView" expanded="True" /> <Node name="DoorLockLogic" expanded="True" /> <Node name="SoneLogicList.cs" selected="True" /> </Node> </Node> <Node name="UserCenter" expanded="True"> <Node name="Residence" expanded="True" /> <Node name="CommonBase" expanded="True"> <Node name="Controls" expanded="True"> <Node name="MessageControls" expanded="True" /> </Node> </Node> </Node> <Node name="ZigBee" expanded="True" /> </Node> </Node> </Node> ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ideBinary files differ
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -108,12 +108,10 @@ // //查找是否是那个门锁； // //如果不是该门锁联动事件不显示出来; // yes = false; // } // else // { // yes = true; // } // //if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid) // //{ ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -163,6 +163,9 @@ actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr); actionsInfo.Add("Epoint", "200"); actionsInfo.Add("PassData", "055704010113");//默认门锁常关 Dictionary<string, string> accounts = new Dictionary<string, string>(); accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//用于判断识别是哪个门锁; accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString()); //new一个新逻辑对象； //新增门锁常开模式自动化入口； Common.Logic.CurrentLogic = new Common.Logic(); @@ -171,6 +174,7 @@ Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode); Common.Logic.CurrentLogic.Conditions.Add(timeConditionsInfo);//添加条件 Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//添加目标 Common.Logic.CurrentLogic.Accounts.Add(accounts); var oneLogic = new OneLogic(); UserView.HomePage.Instance.AddChidren(oneLogic); UserView.HomePage.Instance.PageIndex += 1; @@ -371,59 +375,58 @@ { LogicView.TipView.ShowConfrimTip(() => {///再次确认 LogicView.TipView.ShowInputTip(true, async (str) => {///确认发送命令 CommonPage.Loading.Start(); try { ///xm var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock); if (!result) { LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed)); return; } else { ///因为有常开模式下才可以创建失效逻辑； SkipView.GetLogicAll(Send.CurrentDoorLock);//删除之前所有失效逻辑 var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//添加一条失效逻辑 if (addResult == 0) { ///可欣说如果常开模式开，创建自动化失败，那么将要发一条常开模式关闭命令; UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock); ///提示失败 LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed)); return; } else { logicId = addResult; timeValue = int.Parse(str); Send.CurrentDoorLock.IsDoorLockNormallyMode = true; ModeView(); ///添加APP开启常开模式的历史记录 UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock,9001,string.Empty); } LogicView.TipView.ShowInputTip(true, async (str) => {///确认发送命令 CommonPage.Loading.Start(); try { ///xm var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock); if (!result) { LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed)); return; } else { ///因为有常开模式下才可以创建失效逻辑； SkipView.GetLogicAll(Send.CurrentDoorLock);//删除之前所有失效逻辑 var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//添加一条失效逻辑 if (addResult == 0) { ///可欣说如果常开模式开，创建自动化失败，那么将要发一条常开模式关闭命令; UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock); ///提示失败 LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed)); return; } else { logicId = addResult; timeValue = int.Parse(str); Send.CurrentDoorLock.IsDoorLockNormallyMode = true; ModeView(); ///添加APP开启常开模式的历史记录 UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty); } } } catch { } } catch { } finally { Application.RunOnMainThread(() => { CommonPage.Loading.Hide(); } finally { Application.RunOnMainThread(() => { CommonPage.Loading.Hide(); }); } }); }); } }); }); @@ -460,7 +463,10 @@ { continue; } Common.Logic.SoneLogicList.Add(logic); if (SkipView.ExistLogic(logic, Send.CurrentDoorLock)) { Common.Logic.SoneLogicList.Add(logic); } } } }
