轻会员-登录下线弹窗代码位置移动

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -374,12 +374,6 @@ namespace PDF_Master.ViewModels
 
                     LoginVis = Visibility.Visible;
                     OphVis = Visibility.Visible;
-                    if (Settings.Default.UserDate.IsLoginoff == false)
-                    {
-                        App.mainWindowViewModel.OpenLoginoff();
-                        Settings.Default.UserDate.IsLoginoff = true;
-                        Settings.Default.Save();
-                    }
                 }
                 else
                 {

PDF Office/Views/MainWindow.xaml.cs

@@ -171,6 +171,21 @@ namespace PDF_Master.Views
             App.Current.MainWindow = this;
             App.mainWindowViewModel = this.DataContext as MainWindowViewModel;
             aggregator?.GetEvent<DragablzWindowEvent>().Publish(new DragablzWindowEventArgs() { TabControl = TabablzControl, Type = DragablzWindowEventType.Activated });
+            //判断本地有没有token，没有显示登录，有再判断登录状态
+            if (Settings.Default.AppProperties.LoginToken != "")
+            {
+
+                if (ServiceHelper.GetUser() == "401")
+                {
+
+                    if (Settings.Default.UserDate.IsLoginoff == false)
+                    {
+                        App.mainWindowViewModel.OpenLoginoff();
+                        Settings.Default.UserDate.IsLoginoff = true;
+                        Settings.Default.Save();
+                    }
+                }
+            }
 
             //设为默认浏览器后，外部点击文档打开
             if (App.NeedOpenFilePathList.Count != 0)