派生自 ~xm/HomeApp
| 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/SkipView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,35 +1,42 @@ <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/SkipView.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs"> <Files> <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="101" Column="73" /> <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="807" Column="21" /> <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="673" Column="88" /> <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="137" Column="37" /> <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="391" Column="51" /> <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" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="GateWay" expanded="True"> <Node name="Shared" expanded="True"> <Node name="Common" expanded="True" /> <Node name="Phone" expanded="True"> <Node name="Device" expanded="True"> <Node name="Logic" expanded="True"> <Node name="DoorLockLogic" expanded="True" /> <Node name="DoorLockLogic" expanded="True"> <Node name="LockLogicList.cs" selected="True" /> </Node> <Node name="LogicView" expanded="True" /> <Node name="SkipView.cs" selected="True" /> </Node> </Node> <Node name="UserCenter" expanded="True"> <Node name="DoorLock" expanded="True" /> <Node name="Residence" expanded="True" /> </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
@@ -98,33 +98,34 @@ { continue; } bool yes = false; for (int a = 0; a < logic.Accounts.Count; a++) { //Option4是设备mac；Option2是设备端口； if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString()) { //查找是否是那个门锁； //如果不是该门锁联动事件不显示出来; yes = false; } else { yes = true; } //if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid) Common.Logic.LockLogicList.Add(logic); //bool yes = false; //for (int a = 0; a < logic.Accounts.Count; a++) //{ // //查找自己账号下的创建联动事件； // yes = true; // break; // //Option4是设备mac；Option2是设备端口； // if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString()) // { // //查找是否是那个门锁； // //如果不是该门锁联动事件不显示出来; // yes = false; //} } if (yes) { Common.Logic.LockLogicList.Add(listlogic[j]); } // else // { // yes = true; // } // //if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid) // //{ // // //查找自己账号下的创建联动事件； // // yes = true; // // break; // //} //} //if (yes) //{ // Common.Logic.LockLogicList.Add(listlogic[j]); //} } } } ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -725,8 +725,8 @@ actionsInfo.Add("PassData", "055704010113");//默认门锁常关 Dictionary<string, string> accounts = new Dictionary<string, string>(); accounts.Add("DeviceAddr", common.DeviceAddr.ToString());//用于判断识别是哪个门锁; accounts.Add("Epoint", common.DeviceEpoint.ToString()); accounts.Add("Option4", common.DeviceAddr.ToString());//用于判断识别是哪个门锁; accounts.Add("Option2", common.DeviceEpoint.ToString()); Common.Logic currentLogic = new Common.Logic(); currentLogic.IsEnable = 1;//默认为开 @@ -752,7 +752,7 @@ /// 注意(参数:2-常开自动化;3-失效时间自动化); /// 返回值：0不存在;其它值都存在; /// </summary> public static async System.Threading.Tasks.Task<int> Exist(int valueInt) public static async System.Threading.Tasks.Task<int> Exist(int valueInt, ZigBee.Device.DoorLock doorLock) { int exist = 0; var Idlist = await Send.GetLogicId(valueInt); @@ -769,7 +769,7 @@ var logic = await Send.GetLogic(id, 3); if (logic != null) { if (ExistLogic(logic)) if (ExistLogic(logic, doorLock)) { exist = id; } @@ -787,7 +787,7 @@ ///获取门锁逻辑信息 /// 返回值：null不存在;其它值都存在; /// </summary> public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon() public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon(ZigBee.Device.DoorLock doorLock) { Common.Logic logic = null; var Idlist = await Send.GetLogicId(3); @@ -796,7 +796,7 @@ //默认取第一个逻辑ID(时效性只有一条逻辑) int exist = Idlist[0]; logic = await Send.GetLogic(exist, 3); if (!ExistLogic(logic)) if (!ExistLogic(logic, doorLock)) { logic = null; } @@ -808,7 +808,7 @@ ///删除该门锁所有时效性自动化 /// 返回值：true成功;false失败; /// </summary> public static async System.Threading.Tasks.Task<bool> GetLogicAll() public static async System.Threading.Tasks.Task<bool> GetLogicAll(ZigBee.Device.DoorLock doorLock) { bool _if = false; var Idlist = await Send.GetLogicId(3); @@ -822,7 +822,7 @@ var logic = await Send.GetLogic(id, 3); if (logic != null) { if (ExistLogic(logic)) if (ExistLogic(logic, doorLock)) { //本来只有一条时效性自动化， //防止特殊情况,找到就删除掉; @@ -838,13 +838,13 @@ /// 查找这一条自动化是否属于该门锁 /// </summary> /// <returns></returns> public static bool ExistLogic(Common.Logic logic) public static bool ExistLogic(Common.Logic logic, ZigBee.Device.DoorLock doorLock) { bool yes = false; for (int j = 0; j < logic.Accounts.Count; j++) { //Option4是设备mac；Option2是设备端口； if (logic.Accounts[j]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString()) if (logic.Accounts[j]["Option4"].ToString() != doorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != doorLock.DeviceEpoint.ToString()) { //查找是否是那个门锁； //如果不是该门锁联动事件不显示出来; ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -64,7 +64,7 @@ { //进来更新一次 //查找是否存在时效性自动化；有的话就返回自动化对象; var logic = await SkipView.GetLogicIfon(); var logic = await SkipView.GetLogicIfon(Send.CurrentDoorLock); if (logic != null) { try @@ -388,7 +388,7 @@ else { ///因为有常开模式下才可以创建失效逻辑； SkipView.GetLogicAll();//删除之前所有失效逻辑 SkipView.GetLogicAll(Send.CurrentDoorLock);//删除之前所有失效逻辑 var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//添加一条失效逻辑 if (addResult == 0) { ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.csold mode 100755 new mode 100644
@@ -548,7 +548,7 @@ { //温居城的要网关中是否有逻辑存在 //参数:2-常开自动化;3-失效时间自动化 var result = await Shared.Phone.Device.Logic.SkipView.Exist(2); var result = await Shared.Phone.Device.Logic.SkipView.Exist(2, (ZigBee.Device.DoorLock)device); HdlThreadLogic.Current.RunMain(() => { //弹出徐梅的那个窗口 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -308,7 +308,7 @@ //删除设置常开模式创建的逻辑 if (haveLogic) { var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3); var resTemp1 = await Shared.Phone.Device.Logic.SkipView.Exist(3, doorLock); //温居城方法？？？ //此处是否要删除温居城的特殊逻辑 } ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -684,7 +684,7 @@ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes); Application.RunOnMainThread(async () => { var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(2); var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock); if (resTemp == 1) { HaveLogicNormallyOpenMode = true; @@ -1103,7 +1103,7 @@ //删除已经失效的“常开模式”的逻辑 if (HaveLogicNormallyOpenMode) { var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3); var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock); //if (resTemp == 3) //{ // string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed); @@ -1131,7 +1131,7 @@ //先删除已失效的“常开模式”的逻辑 if (HaveLogicNormallyOpenMode) { var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3); var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock); //if (resTemp == 3) //{ // string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed2); @@ -1208,7 +1208,7 @@ //删除已经失效的“常开模式”的逻辑 if (HaveLogicNormallyOpenMode) { var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3); var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock); //if (resTemp == 3) //{ // string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed); @@ -1247,7 +1247,7 @@ //删除设置常开模式创建的逻辑 if (HaveLogicNormallyOpenMode) { var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3); var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock); //因为目前机制问题，逻辑经常失败，所以不提示，后期机制要改，重新做一个这个界面 //if (resTemp == 3) //{
