Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs

@@ -60,10 +60,6 @@
                TextID = R.MyInternationalizationString.SelectFloor
            };
            backgroundFL.AddChidren(tip);
            tip.MouseUpEventHandler += (sender, e) =>
            {
                BackgroundColor = ZigbeeColor.Current.GXCRedColor;
            };

            var floorLayout = new VerticalScrolViewLayout
            {