合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs

@@ -73,23 +73,6 @@
        public void BottomFrameLayout()
        {
            #region  UI 
            //var bottomFrameLayout = new FrameLayout()
            //{
            //    Height = Application.GetRealHeight(100),
            //    Y = Application.GetRealHeight(418),
            //    Radius = 17,
            //    BackgroundColor = ZigbeeColor.Current.XMWhite,
            //};
            //this.midFrameLayout.AddChidren(bottomFrameLayout);

            //var bottomFrameLayout1 = new FrameLayout()
            //{
            //    Height = Application.GetRealHeight(1319 - 50),
            //    Y = Application.GetRealHeight(418 + 48),
            //    BackgroundColor = ZigbeeColor.Current.XMWhite,
            //};
            //this.midFrameLayout.AddChidren(bottomFrameLayout1);

            var bottomFrameLayout = new FrameLayout()
            {
                Height = Application.GetRealHeight(1319),
@@ -256,7 +239,7 @@
                    btnNext.SelectedImagePath = "DoorLock/SwitchOn.png";
                    btnLine.Visible = true;
                    btnLine.Y = Application.GetRealHeight(714);
                    if (doorLock.RemoteUnlockPassword == "")
                    if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
                    {
                        btnNext.IsSelected = false;
                    }
@@ -280,7 +263,7 @@
                                 btnNext.IsSelected = !btnNext.IsSelected;
                                 if (btnNext.IsSelected)
                                 {
                                     if (doorLock.RemoteUnlockPassword == "")
                                     if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
                                     {
                                         RemotePasswordDialog(doorLock, btnNext);
                                     }