Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

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

@@ -59,11 +59,17 @@
            TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
        };

        /// <summary>
        /// 阴影部分
        /// </summary>
        public FrameLayout flMain = new FrameLayout
        {
            BackgroundColor = 0x00000000,
        };

        public void Show()
        {
            dialog.Show();

            var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
            dialog.AddChidren(flMain);
            flMain.MouseUpEventHandler += (sender11, e11) =>
            {