Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs

@@ -37,7 +37,7 @@
        /// </summary>

        public virtual void ShowFrom()

        {

            Phone.MainPage.ListRoomViewFrom.Instance.CanClick = false;

            Phone.MainPage.LeftListRoomViewFrom.Instance.CanClick = false;



            UserView.UserPage.Instance.AddChidren(this);

            this.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;