合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -127,12 +127,14 @@
                Height = Application.GetRealHeight(60),
                X = Application.GetRealWidth(372),
                Y = Application.GetRealHeight(46),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                Text = string.IsNullOrEmpty(doorLock.DeviceName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : doorLock.DeviceName,
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack ,
                TextSize = 15,
                TextAlignment = TextAlignment.Center,
                IsBold =true,
            };
            midTopFrameLayout.AddChidren(btnDoorLockTitle);
            //获取Mac名字 
            btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);

            var btnRecord = new Button()
            {