合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

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

@@ -325,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();

                };

            }

        }

@@ -618,7 +623,7 @@
            {

                menuCount = 2;

            }

            var frame = new TopRightMenuControl(this, menuCount);

            var frame = new TopRightMenuControl(menuCount);

            if (canTest == true)

            {

                //定位