Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -353,7 +353,7 @@
                    {
                        TextColor = Shared.Common.ZigbeeColor.Current.GXCTextWhiteColor,
                        X = btnBindName.Right,
                        TextID = R.MyInternationalizationString.Delete,
                        TextID = R.MyInternationalizationString.DelBindDevice,
                        BackgroundColor = Shared.Common.ZigbeeColor.Current.DelRowLayout,
                    };
                    rowLayout.AddRightView(btnDel);
@@ -463,7 +463,7 @@
            var btnDel = new Button()
            {
                TextColor = Shared.Common.ZigbeeColor.Current.GXCTextWhiteColor,
                TextID = R.MyInternationalizationString.Delete,
                TextID = R.MyInternationalizationString.DelBindDevice,
                BackgroundColor = Shared.Common.ZigbeeColor.Current.DelRowLayout,
            };
            modeRowLayout.AddRightView(btnDel);