合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -112,12 +112,17 @@
                else if (i == 1)
                {
                    btnText.Text = Language.StringByID(R.MyInternationalizationString.FrozenUser);
                    btnRight.X = Application.GetRealWidth(50);
                    btnRight.Y = Application.GetRealHeight(32);
                    btnRight.Height = Application.GetRealHeight(63);
                    btnRight.Width = Application.GetRealWidth(104);
                    btnRight.UnSelectedImagePath = "DoorLock/Switch.png";
                    btnRight.SelectedImagePath = "DoorLock/SwitchOn.png";
                    btnRight.Height = Application.GetRealHeight(0);
                    var btnSwitch = new Button()
                    {
                        X = Application.GetRealWidth(50),
                        Y = Application.GetRealHeight(32),
                        Height = Application.GetRealHeight(60),
                        Width = Application.GetRealWidth(60),
                        UnSelectedImagePath = "DoorLock/Switch.png",
                        SelectedImagePath = "DoorLock/SwitchOn.png",
                    };
                    btnRightFrameLayout.AddChidren(btnSwitch);
                }
                else if (i == 2)
                {
@@ -143,6 +148,7 @@
                    }
                    else if (currentIndex == 1)
                    {
                        btnRight.IsSelected = !btnRight.IsSelected;
                    }
                    else if (currentIndex == 2)
                    {