派生自 ~xm/HomeApp
| ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -2,19 +2,19 @@ <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" /> <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" /> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicCommunalPage.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/MemberList.cs"> <Files> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="339" Column="51" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="418" Column="82" /> <File FileName="Shared/Phone/UserView/HomePage.cs" Line="97" Column="64" /> <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="470" Column="76" /> <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="249" Column="1" /> <File FileName="Shared/Common/CommonPage.cs" Line="42" Column="52" /> <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="536" Column="30" /> <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="723" Column="1" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="334" Column="77" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="413" Column="18" /> <File FileName="Shared/Phone/UserView/HomePage.cs" /> <File FileName="Shared/Phone/Device/Logic/Send.cs" /> <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" /> <File FileName="Shared/Common/CommonPage.cs" /> <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" /> <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1450" Column="54" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" Line="215" Column="59" /> <File FileName="Shared/Common/Logic.cs" Line="66" Column="15" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" /> <File FileName="Shared/Common/Logic.cs" /> <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="12" Column="16" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -29,7 +29,7 @@ <Node name="Device" expanded="True"> <Node name="Logic" expanded="True"> <Node name="DoorLockLogic" expanded="True" /> <Node name="LogicCommunalPage.cs" selected="True" /> <Node name="MemberList.cs" selected="True" /> </Node> </Node> <Node name="UserCenter" expanded="True"> ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ideBinary files differ
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -14,6 +14,7 @@ Button selectedIcon = new Button(); VerticalScrolViewLayout middle; public int conditionsIndex = -1; public async void Show() { #region 最上面的布局代码 @@ -284,26 +285,6 @@ TextSize = 14, }; doorlockRow.AddChidren(doorlockBtn); //(0按键/3卡/15指纹) //switch (userIdmode.OpenMode.ToString()) //{ // case "0": // { // doorlockBtn.Text = Language.StringByID(MyInternationalizationString.lockpassword); // } // break; // case "3": // { // doorlockBtn.Text = Language.StringByID(MyInternationalizationString.ic); // } // break; // case "15": // { // doorlockBtn.Text = Language.StringByID(MyInternationalizationString.fingerprint); // } // break; //} var doorlockSelected = new Button { @@ -395,7 +376,7 @@ { if (Common.Logic.CurrentLogic.Accounts[i]["Type"] == "1") { if (Common.Logic.CurrentLogic.Accounts[i]["Account"] == membershipIfon.UserName + modeName && Common.Logic.CurrentLogic.Accounts[i]["UserId"] == attriButeData2) if (Common.Logic.CurrentLogic.Accounts[i]["UserId"] == attriButeData2) { addAccount = true; break; @@ -409,13 +390,16 @@ } else { ///找出之前的旧数据移除掉，再重新添加新数据； string accountuserId = Common.Logic.CurrentLogic.Conditions[conditionsIndex]["AttriButeData2"]; Common.Logic.CurrentLogic.Conditions.RemoveAt(conditionsIndex); Common.Logic.CurrentLogic.Conditions.Insert(conditionsIndex, lockConditionsInfo); for (int i = 0; i < Common.Logic.CurrentLogic.Accounts.Count; i++) { if (Common.Logic.CurrentLogic.Accounts[i]["Type"] == "1") { if (Common.Logic.CurrentLogic.Accounts[i]["UserId"] == attriButeData2) ///找出之前的旧数据移除掉，再重新添加新数据； if (Common.Logic.CurrentLogic.Accounts[i]["UserId"] == accountuserId) { Common.Logic.CurrentLogic.Accounts.RemoveAt(i); Common.Logic.CurrentLogic.Accounts.Insert(i, accounts); ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -81,11 +81,6 @@ Common.Logic.CurrentLogic.IsEnable = 1;//默认为开 Common.Logic.CurrentLogic.LogicType = 1; Common.Logic.CurrentLogic.Relationship = 1; //Config.Instance.Guid用来识别账号身份； var accounts = new System.Collections.Generic.Dictionary<string, string>(); accounts.Add("Type","1"); accounts.Add("Account", Config.Instance.Guid); Common.Logic.CurrentLogic.Accounts.Add(accounts); Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1); var lockLogicCommunalPage = new LockLogicCommunalPage(); UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage); ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -15,7 +15,7 @@ } Button selectedIcon = new Button(); public static bool edit=false; VerticalScrolViewLayout middle; public async void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo=null) { @@ -73,7 +73,7 @@ }; #endregion var middle = new VerticalScrolViewLayout middle = new VerticalScrolViewLayout { Y = topRowLayout.Bottom, Height = Application.GetRealHeight(1920 - 184), @@ -94,13 +94,21 @@ } } CommonPage.Loading.Start(); if (!d) { var allMemberslist = await Send.AllMembers(common.DeviceAddr); Send.LockList.AddRange(allMemberslist); } UserList(macport, common, editdeviceConditionsInfo); CommonPage.Loading.Hide(); } /// <summary> /// 成员列表的方法 /// </summary> /// <param name="macport"></param> void UserList(string macport, CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo) { foreach (var user in Send.LockList) { @@ -147,6 +155,24 @@ userRow.AddChidren(userBack); EventHandler<MouseEventArgs> useridclick = (sender, e) => { User(user, common, editdeviceConditionsInfo); }; userBtn.MouseUpEventHandler += useridclick; userBack.MouseUpEventHandler += useridclick; userFramelayout.MouseUpEventHandler += useridclick; userRow.MouseUpEventHandler += useridclick; } } /// <summary> /// 当前成员信息的方法 /// </summary> /// <param name="user"></param> void User(Send.MembershipIfon user, CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo) { var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor }; this.AddChidren(flMain); @@ -305,8 +331,6 @@ } } Btncomplete.MouseUpEventHandler += (sender3, e3) => { string userIdstr = "", openModestr=""; @@ -396,14 +420,7 @@ }; }; userBtn.MouseUpEventHandler += useridclick; userBack.MouseUpEventHandler += useridclick; userFramelayout.MouseUpEventHandler += useridclick; userRow.MouseUpEventHandler += useridclick; } } } }
