2021-3-26-4

陈嘉乐

2021-03-26 eb3799496f3419e347849073e23e5105b74000e5

 Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs

@@ -220,7 +220,26 @@
            UserMiddle.updateSensorhreadList.Clear ();
        }

        //2020-01-11 
        /// <summary>
        /// 移除GuidePageView
        /// </summary>
        static void removeGuidePageView ()
        {
            if (guidePageView != null) {
                if (guidePageView.Parent != null) {
                    Utlis.WriteLine ("移除GuidePageView Parent 不为");
                }
                
                guidePageView.RemoveFromParent ();
               
            }
        }

        /// <summary>
        /// 2020-01-11 
        /// </summary>
        /// <param name="isGuide">是否Guide</param>
        /// <param name="bFromLogin">是否来自登录界面</param>
        public static void Init (bool isGuide = false, bool bFromLogin = false)
        {
            if (MainPage.LoginUser == null)
@@ -230,14 +249,14 @@
                new AccountLogin ().Show ();
                UserConfig.Instance.TipVersionBackup = UserConfig.Instance.VersionNumber;
            } else {
                //2021-03-23 移除GuidePageView
                removeGuidePageView ();

                //if (UserConfig.Instance.GatewayList.Count == 0) {
                //2020-01-11 Mac没绑定 是否来只登录界面
                if (bFromLogin) {
                    if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
                        if (guidePageView != null) {
                            guidePageView.RemoveAll ();
                            guidePageView.RemoveFromParent ();
                        }
                       
                        UserHomePage.FrameLayoutMain.AddChidren (guidePageView);
                        var guide = new GuideAddResidence ();
                        guide.IsHideBack = true;
@@ -338,12 +357,10 @@
        /// </summary>
        static void InitHomePageView ()
        {
            //SystemRemote.LinkRemote ("", "", "",true); 
            //SystemRemote.LinkRemote ("", "", "",true);
           
            if (null != UserPageView.Parent) {
                if (guidePageView.Parent != null) {
                    guidePageView.RemoveAll ();
                    guidePageView.RemoveFromParent ();
                }

                CleanPageView (FavoriteBodyView);
                UserPageView.AddChidren (FavoritePageView);
                FavoritePageView.AddChidren (FavoriteBodyView);