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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs

@@ -464,7 +464,7 @@
            }

            SetCurtainType(itemView, (device.CommonDevice as Rollershade).WcdType);
            

            var roomBG = new Button
            {
                Y = Application.GetRealHeight(1178 - 50),