Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserView/HomePage.cs

@@ -81,7 +81,7 @@
            else
            {
                //未登录弹出登录界面
                var accountLogin = new Login.AccountLogin { };
                var accountLogin = new Login.AccountLoginForm { };
                Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
                accountLogin.ShowForm();
            }