合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs

@@ -250,8 +250,13 @@
                btnRow.AddRightArrow();

                //底线

                btnRow.AddBottomLine();

                var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;

                btnRow.ButtonClickEvent += (sender, e) =>

                {

                    var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);

                    Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);

                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;

                    userManagement.Show();

                };

            }

        }

@@ -278,10 +283,23 @@
                var btnswitch = btnRow.AddMostRightSwitchIcon();

                //底线

                btnRow.AddBottomLine();

                if (string.IsNullOrEmpty(ZigBee.Device.DoorLock.RemoteUnlockPassword) == false)

                {

                    btnswitch.IsSelected = true;

                }



               var doorLock= (ZigBee.Device.DoorLock)listNewDevice[0];

                btnswitch.ButtonClickEvent += (sender, e) =>

                {

                    btnswitch.IsSelected = !btnswitch.IsSelected;

                    if (btnswitch.IsSelected == true)

                    {

                        btnswitch.IsSelected = false;

                        ZigBee.Device.DoorLock.RemoteUnlockPassword = string.Empty;

                        return;

                    }

                    var frame = new DoorLock.DoorLockCommonLayout();

                    frame.RemotePasswordDialog((ZigBee.Device.DoorLock)listNewDevice[0], btnswitch.btnIcon);

                    frame = null;

                };

            }

        }

@@ -307,8 +325,13 @@
                btnRow.AddRightArrow();

                //底线

                btnRow.AddBottomLine();

                var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;

                btnRow.ButtonClickEvent += (sender, e) =>

                {

                    var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");

                    Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);

                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;

                    tempPage.Show();

                };

            }

        }

@@ -600,7 +623,7 @@
            {

                menuCount = 2;

            }

            var frame = new TopRightMenuControl(this, menuCount);

            var frame = new TopRightMenuControl(menuCount);

            if (canTest == true)

            {

                //定位