合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

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

@@ -98,7 +98,7 @@
                Y = Application.GetRealHeight(691 - 184),
                X = Application.GetRealWidth(144),
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                Radius = 6,
                Radius = (uint)Application.GetRealHeight(17),
            };
            flMain.AddChidren(dialogFrameLayout);

@@ -154,7 +154,7 @@
                Height = Application.GetRealHeight(128) - 1,
                Y = Application.GetRealHeight(380) + 1,
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMMidFrameLayout,
                Radius = 6,
                Radius = (uint)Application.GetRealHeight(17),
            };

            var r2FrameLayout = new FrameLayout
@@ -164,7 +164,7 @@
                X = Application.GetRealWidth(397),
                Y = Application.GetRealHeight(380) + 1,
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                Radius = 6,
                Radius = (uint)Application.GetRealHeight(17),
            };
            dialogFrameLayout.AddChidren(rFrameLayout0);
            dialogFrameLayout.AddChidren(rFrameLayout1);