合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -55,35 +55,50 @@
                BackgroundImagePath = "DoorLock/DoorlockPicture.png",
            };
            this.midFrameLayout.AddChidren(MidTopFrameLayout);

            var btnDeviceText = new Button()
            {
                Y = Application.GetRealHeight(288),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterHorizontal,
                TextColor = ZigbeeColor.Current.XMBlack,
                TextSize = 15,
                Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock),
            };
            this.midFrameLayout.AddChidren(btnDeviceText);

            BottomFrameLayout();
        }

        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(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 bottomFrameLayout2 = new FrameLayout()
            {
                Height = Application.GetRealHeight(1319),
                Y = Application.GetRealHeight(418),
                BackgroundColor = ZigbeeColor.Current.XMWhite,
            };
            this.midFrameLayout.AddChidren(bottomFrameLayout2);
            this.midFrameLayout.AddChidren(bottomFrameLayout);
            bottomFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);


            var informationEdit = new Button()
            {
@@ -95,7 +110,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 15,
            };
            bottomFrameLayout2.AddChidren(informationEdit);
            bottomFrameLayout.AddChidren(informationEdit);

            for (int i = 0; i < 4; i++)
            {
@@ -103,7 +118,7 @@
                {
                    Height = Application.GetRealHeight(58),
                };
                bottomFrameLayout2.AddChidren(bottomRowLayout);
                bottomFrameLayout.AddChidren(bottomRowLayout);

                var btnName = new Button()
                {
@@ -140,7 +155,7 @@
                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
                    Visible = false,
                };
                bottomFrameLayout2.AddChidren(btnLine);
                bottomFrameLayout.AddChidren(btnLine);

                if (i == 0)
                {
@@ -154,6 +169,7 @@
                        Width = Application.GetRealWidth(731),
                        Height = Application.GetRealHeight(58),
                        TextColor = ZigbeeColor.Current.XMGray3,
                        TextSize = 14,
                        PlaceholderTextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
                        TextAlignment = TextAlignment.CenterLeft,
                        Text = string.IsNullOrEmpty(doorLock.DeviceName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : doorLock.DeviceName,
@@ -225,7 +241,7 @@
                    btnNext.Height = Application.GetRealHeight(58);
                    btnNext.Text = doorLock.DeviceName;
                    btnNext.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;

                    btnNext.TextSize = 14;
                    btnLine.Visible = true;
                    btnLine.Y = Application.GetRealHeight(575);
                }
@@ -285,10 +301,13 @@
                         }
                     }
                 };
                bottomRowLayout.MouseDownEventHandler += eHandler;
                btnNext.MouseDownEventHandler += eHandler;
                btnName.MouseDownEventHandler += eHandler;
                btnNextFrameLayout.MouseDownEventHandler += eHandler;
                if (i != 3)
                {
                    bottomRowLayout.MouseDownEventHandler += eHandler;
                    btnName.MouseDownEventHandler += eHandler;
                    btnNextFrameLayout.MouseDownEventHandler += eHandler;
                }
                #endregion
            }

@@ -304,6 +323,7 @@
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                TextSize = 16,
                IsBold =true,
            };
            this.midFrameLayout.AddChidren(btnFinifh);
            btnFinifh.MouseUpEventHandler += (sender, e) =>