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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -54,7 +54,7 @@
            var btnKnwon = this.AddIKnwonButton();

            btnKnwon.ButtonClickEvent += (sender, e) =>

            {

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

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

                this.RemoveFromParent();

            };

        }