完全合并了Wjc，Xm 的 代码

黄学彪

2019-10-24 31497bb69602433d94c8a28ea01c3ee3c7cc8576

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

@@ -125,9 +125,10 @@
                X = Application.GetRealWidth(202),
                Y = Application.GetRealHeight(1388),
                Height = Application.GetRealHeight(49),
                Width = Application.GetRealWidth(674),
                Width = Application.GetRealWidth(694),
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                Gravity = Gravity.CenterHorizontal,
                BackgroundColor = 0xff00ff00,
                TextSize = 12,
            };
            this.midFrameLayout.AddChidren(btnPicTip5);
@@ -138,7 +139,7 @@
                Y = Application.GetRealHeight(1472),
                Height = Application.GetRealHeight(127),
                Width = Application.GetRealWidth(907),
                Text = Language.StringByID(R.MyInternationalizationString.NextStep),
                Text = Language.StringByID(R.MyInternationalizationString.NextStepXm),
                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                Gravity = Gravity.CenterHorizontal,
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,