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

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs

@@ -568,7 +568,7 @@

                var btnBindName = new Button()
                {
                    Width = Application.GetRealWidth(500 - 120),
                    Width = Application.GetRealWidth(790),
                    X = devicePic.Right + Application.GetRealWidth(20),
                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
                    TextAlignment = TextAlignment.CenterLeft,
@@ -645,7 +645,7 @@
                btnBindName.MouseUpEventHandler += hander;
                btnChoose.MouseUpEventHandler += hander;

                if (device.CommonDevice?.DeviceEpointName == "")
                if (string.IsNullOrEmpty(device.CommonDevice?.DeviceEpointName))
                {
                    btnBindName.Text = device.CommonDevice?.DeviceAddr + "_" + device.CommonDevice?.DeviceEpoint;
                }