合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -100,8 +100,9 @@
                Y = Application.GetRealHeight(35),
                X = Application.GetRealWidth(812 - 100),
                TextAlignment = TextAlignment.CenterRight,
                TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextSize = 12,
                IsBold =true,
            };
            midTopFrameLayout.AddChidren(btnAllMethod);
            // 类型区分 
@@ -243,6 +244,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                    Gravity = Gravity.CenterVertical,
                    TextSize =15,
                };
                rowFrameLayout.AddChidren(btnText);

@@ -314,7 +316,7 @@
        {
            #region  UI
            FrameLayout flMain = new FrameLayout { BackgroundColor = 0x0f000000 };
            this.midFrameLayout.AddChidren(flMain);
            this.AddChidren(flMain);
            flMain.MouseUpEventHandler += (sender11, e11) =>
            {
                flMain.RemoveFromParent();
@@ -323,24 +325,24 @@
            bottomFrameLayout = new FrameLayout()
            {
                Height = Application.GetRealHeight(100),
                Y = Application.GetRealHeight(930),
                Radius = 17,
                Y = Application.GetRealHeight(1253),
                Radius =(uint) Application.GetRealHeight(100/2),
                BackgroundColor = ZigbeeColor.Current.XMWhite,
            };
            flMain.AddChidren(bottomFrameLayout);

            var bottomFrameLayout1 = new FrameLayout()
            {
                Height = Application.GetRealHeight(806 - 50),
                Y = Application.GetRealHeight(930 + 48),
                Height = Application.GetRealHeight(668 - 60),
                Y = Application.GetRealHeight(1253+58),
                BackgroundColor = ZigbeeColor.Current.XMWhite,
            };
            flMain.AddChidren(bottomFrameLayout1);

            var bottomFrameLayout2 = new FrameLayout()
            {
                Height = Application.GetRealHeight(806),
                Y = Application.GetRealHeight(930),
                Height = Application.GetRealHeight(668),
                Y = Application.GetRealHeight(1253),
            };
            flMain.AddChidren(bottomFrameLayout2);

@@ -519,12 +521,12 @@
                           CommonPage.Loading.Start("");
                       });
                       if (curAccountId == "")
                       {  
                       {
                           Application.RunOnMainThread(() =>
                           {
                               flMain.RemoveFromParent();
                               bottomFrameLayout.RemoveAll();
                               CommonPage.Loading.Hide ();
                               CommonPage.Loading.Hide();
                           });
                       }
                       else
@@ -596,11 +598,12 @@
                                   {
                                       Application.RunOnMainThread(() =>
                                       {
                                           new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.DistributeSuccess), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                                           TypeRefresh();
                                           CommonPage.Loading.Hide();
                                           flMain.RemoveFromParent();
                                           bottomFrameLayout.RemoveAll();
                                       }); 
                                       });
                                   }
                                   else
                                   {
@@ -684,7 +687,7 @@
                {
                    Width = Application.GetRealWidth(81),
                    Height = Application.GetRealHeight(81),
                    Y = Application.GetRealHeight(55),
                    Y = Application.GetRealHeight(35),
                };
                rowFrameLayout.AddChidren(btnAllMethod);

@@ -693,7 +696,7 @@
                    Width = Application.GetRealWidth(311),
                    Height = Application.GetRealHeight(58),
                    X = Application.GetRealWidth(92),
                    Y = Application.GetRealHeight(69),
                    Y = Application.GetRealHeight(49),
                    TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                    TextSize = 14,
                    TextAlignment = TextAlignment.CenterLeft,
@@ -717,6 +720,7 @@
                        doorLock.currentUserDisplayMethod = btnMethodText.Text;
                        btnAllMethod.IsSelected = true;
                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                        oldbuttonText.IsBold = true;
                        TypeRefresh();
                    }
                    dialog.Close();
@@ -753,6 +757,7 @@
                {
                    btnAllMethod.IsSelected = true;
                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                    btnMethodText.IsBold = true;
                    oldbutton = btnAllMethod;
                    oldbuttonText = btnMethodText;
                }
@@ -760,6 +765,7 @@
                {
                    btnAllMethod.IsSelected = true;
                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                    btnMethodText.IsBold = true;
                    oldbutton = btnAllMethod;
                    oldbuttonText = btnMethodText;
                }
@@ -767,6 +773,7 @@
                {
                    btnAllMethod.IsSelected = true;
                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                    btnMethodText.IsBold = true;
                    oldbutton = btnAllMethod;
                    oldbuttonText = btnMethodText;
                }
@@ -774,6 +781,7 @@
                {
                    btnAllMethod.IsSelected = true;
                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                    btnMethodText.IsBold = true;
                    oldbutton = btnAllMethod;
                    oldbuttonText = btnMethodText;
                }
@@ -781,6 +789,7 @@
                {
                    btnAllMethod.IsSelected = true;
                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                    btnMethodText.IsBold = true;
                    oldbutton = btnAllMethod;
                    oldbuttonText = btnMethodText;
                }