轻会员ui优化

PDF Office/Helper/ServiceHelper.cs

@@ -19,6 +19,8 @@ namespace PDF_Office.Helper
 
     public static class ServiceHelper
     {
+
+        public static bool IsLogin=false;
         public static string ALLEmail = "";
         public static string ALLPassword = "";
         public static string access_token = "";
@@ -170,9 +172,18 @@ namespace PDF_Office.Helper
                     {
                         request.Abort();
                     }
-                    return jobject["email"].ToObject<string>().ToLower();
+
+                    JToken jToken;
+                    if(jobject.TryGetValue("msg" ,out jToken)==false)
+                    {
+                        return jobject["email"].ToObject<string>().ToLower();
+                    }
+                   else
+                    {
+                        return "false";
+                    }
                 }
-        }
+           }
             catch
             {
                 return "网络不稳定请重试";
@@ -387,6 +398,7 @@ namespace PDF_Office.Helper
 
                     if (jobject["msg"].ToObject<string>().ToLower() == "success")
                     {
+                        App.IsLogin =true;
                         access_token = jobject["result"]["access_token"].ToObject<string>().ToLower();
                         Settings.Default.AppProperties.LoginToken = jobject["result"]["access_token"].ToObject<string>().ToLower();
                         Settings.Default.Save();
@@ -435,6 +447,7 @@ namespace PDF_Office.Helper
                     }
                     if (jobject["msg"].ToObject<string>().ToLower() == "success")
                     {
+                        App.IsLogin = true;
                         access_token = jobject["result"]["access_token"].ToObject<string>().ToLower();
                         Settings.Default.AppProperties.LoginToken = jobject["result"]["access_token"].ToObject<string>().ToLower();
                         Settings.Default.Save();
@@ -474,6 +487,7 @@ namespace PDF_Office.Helper
                     Console.WriteLine(responseData);
                     reader.Close();
                     JObject jobject = (JObject)JsonConvert.DeserializeObject(responseData);
+                    App.IsLogin = false;
                     if (response != null)
                     {
                         response.Close();

PDF Office/ViewModels/Dialog/ServiceDialog/CodeRegionViewModel.cs

@@ -211,7 +211,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public DelegateCommand CodetooCommand { get; set; }
         public DelegateCommand Code6ChangedCommand { get; set; }
         public DelegateCommand RegisterNextCommand { get; set; }
-        public DelegateCommand CloseDialogCommand { get; set; }
 
 
         public CodeRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
@@ -224,7 +223,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             CodetooCommand = new DelegateCommand(Codetoo);
             Code6ChangedCommand = new DelegateCommand(Code6Changed);
             RegisterNextCommand = new DelegateCommand(RegisterNext);
-            CloseDialogCommand = new DelegateCommand(CloseDialog);
 
             if (LoginDialogViewModel != null && LoginDialogViewModel.IsReset == true)
             {
@@ -247,19 +245,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             }
         }
 
-        private void CloseDialog()
-        {
-            if (CodeType == "user_register")
-            {
-                RegisterDialogViewModel.Close();
-            }
-            else if (CodeType == "user_reset_password")
-            {
-                LoginDialogViewModel.Close();
-            }
-           
-
-        }
         private bool CodeSum()
         {
             Codesum = Code1 + Code2 + Code3 + Code4 + Code5 + Code6;
@@ -349,6 +334,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
                                 App.mainWindowViewModel.UserVis = Visibility.Visible;
                                 App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
                                 App.mainWindowViewModel.LoginVis = Visibility.Collapsed;
+                                App.mainWindowViewModel.OphVis = Visibility.Collapsed;
                                 RegisterDialogViewModel.RegionMan("RegisterOKRegion");
                             }
                             else

PDF Office/ViewModels/Dialog/ServiceDialog/LoginPasswordRegionViewModel.cs

@@ -166,7 +166,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public DelegateCommand LoginCommand { get; set; }
         public DelegateCommand LinkLicenseCommand { get; set; }
         public DelegateCommand LoginPasswordChangedCommand { get; set; }
-        public DelegateCommand CloseDialogCommand { get; set; }
 
         LoginPasswordRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
@@ -177,16 +176,9 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             ChangeEmailCommand = new DelegateCommand(ChangeEmail);
             GoCodeUpdataCommand = new DelegateCommand(GoCodeUpdata);
             LoginPasswordChangedCommand = new DelegateCommand(LoginPasswordChanged);
-            CloseDialogCommand = new DelegateCommand(CloseDialog);
 
         }
 
-        private void CloseDialog()
-        {
-
-            LoginDialogViewModel.Close();
-
-        }
 
         //密码改变
         private void LoginPasswordChanged()
@@ -231,6 +223,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
                 App.mainWindowViewModel.UserVis = Visibility.Visible;
                 App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
                 App.mainWindowViewModel.LoginVis = Visibility.Collapsed;
+                App.mainWindowViewModel.OphVis = Visibility.Collapsed;
             }
             else if(ServiceHelper.Login(LoginEmail, LoginPassword, uuid) == "网络不稳定请重试")
             {

PDF Office/ViewModels/Dialog/ServiceDialog/LoginRegionViewModel.cs

@@ -109,7 +109,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 
         public DelegateCommand LoginNextCommand { get; set; }
         public DelegateCommand GoLoginCommand { get; set; }
-        public DelegateCommand CloseDialogCommand { get; set; }
 
         LoginRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
@@ -117,15 +116,8 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
           
             LoginNextCommand = new DelegateCommand(LoginNext);
             GoLoginCommand = new DelegateCommand(GoLogin);
-            CloseDialogCommand = new DelegateCommand(CloseDialog);
         }
 
-        private void CloseDialog()
-        {
-
-            LoginDialogViewModel.Close();
-
-        }
 
         private void LoginNext()
         {

PDF Office/ViewModels/Dialog/ServiceDialog/NoInternetRegionViewModel.cs

@@ -38,13 +38,11 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         }
 
    
-        public DelegateCommand CloseDialogCommand { get; set; }
         public DelegateCommand RetryCommand { get; set; }
 
         NOInternetRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
             dialogs = dialogService;        
-            CloseDialogCommand = new DelegateCommand(CloseDialog);
             RetryCommand = new DelegateCommand(Retry);
 
         }
@@ -55,11 +53,5 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 
 
 
-        private void CloseDialog()
-        {
-
-            LoginDialogViewModel.Close();
-
-        }
     }
 }

PDF Office/ViewModels/Dialog/ServiceDialog/PasswordUpdataRegionVIewModel.cs

@@ -241,7 +241,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 
         public DelegateCommand LoginPasswordChangedCommand { get; set; }
         public DelegateCommand LoginPasswordChanged2Command { get; set; }
-        public DelegateCommand CloseDialogCommand { get; set; }
+
         PasswordUpdataRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
             dialogs = dialogService;
@@ -251,18 +251,11 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             PasswordUpdataCommand = new DelegateCommand(PasswordUpdata);
             LoginPasswordChangedCommand = new DelegateCommand(LoginPasswordChanged);
             LoginPasswordChanged2Command = new DelegateCommand(LoginPasswordChanged2);
-            CloseDialogCommand = new DelegateCommand(CloseDialog);
-
-        }
 
 
-        private void CloseDialog()
-        {
-
-           LoginDialogViewModel.Close();
-
         }
 
+
         private void LoginPasswordChanged()
         {
 

PDF Office/ViewModels/Dialog/ServiceDialog/RegisterOKRegionViewModel.cs

@@ -41,7 +41,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         }
 
         public DelegateCommand RegisterGetStartCommand { get; set; }
-        public DelegateCommand CloseDialogCommand { get; set; }
 
         public RegisterOKRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
@@ -50,12 +49,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         
             dialogs = dialogService;
             RegisterGetStartCommand = new DelegateCommand(RegisterGetStart);
-            CloseDialogCommand = new DelegateCommand(CloseDialog);
-        }
-        private void CloseDialog()
-        {
-
-            RegisterDialogViewModel.Close();
 
         }
 

PDF Office/ViewModels/Dialog/ServiceDialog/RegisterRegionViewModel.cs

@@ -221,7 +221,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         
         public DelegateCommand<object> DisplayPasswordCommand { get; set; }
         public DelegateCommand LinkPolicyCommand { get; set; }
-        public DelegateCommand CloseDialogCommand { get; set; }
         public DelegateCommand RegisterNextCommand { get; set; }
         public DelegateCommand GoLoginCommand { get; set; }
         public DelegateCommand RegisterPasswordChangedCommand { get; set; }
@@ -235,7 +234,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             LinkLicenseCommand = new DelegateCommand(LinkLicense);
             GoLoginCommand = new DelegateCommand(GoLogin);
             RegisterNextCommand = new DelegateCommand(RegisterNext);
-            CloseDialogCommand = new DelegateCommand(CloseDialog);
             RegisterPasswordChangedCommand = new DelegateCommand(RegisterPasswordChanged);
             
         }
@@ -276,14 +274,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             }
         }
 
-        private void CloseDialog()
-        {
-
-            RegisterDialogViewModel.Close();
-         
-        }
-
-
         private void RegisterNext()
         {
             

PDF Office/ViewModels/Dialog/ServiceDialog/UserDialogViewModel.cs

@@ -64,7 +64,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 
         public DelegateCommand UserOutCommand { get; set; }
         public DelegateCommand LogOutCommand { get; set; }
-        public DelegateCommand CloseDialogCommand { get; set; }
 
         UserDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
@@ -72,18 +71,11 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             UserRegionName = Guid.NewGuid().ToString();
             UserOutCommand = new DelegateCommand(UserOut);
             LogOutCommand = new DelegateCommand(LogOut);
-            CloseDialogCommand = new DelegateCommand(CloseDialog);
             if (ServiceHelper.ALLEmail!="")
             {
                 UserEmail = ServiceHelper.ALLEmail;
             }
         }
-        private void CloseDialog()
-        {
-
-           this.Close();
-
-        }
         public void UserOut()
         {
             AlertsMessage alertsMessage = new AlertsMessage();

PDF Office/ViewModels/Dialog/ServiceDialog/UserOutCodeRegionViewModel.cs

@@ -178,8 +178,6 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
         public DelegateCommand Code6ChangedCommand { get; set; }
         public DelegateCommand UserOutCommand { get; set; }
 
-        public DelegateCommand CloseDialogCommand { get; set; }
-
         public UserOutCodeRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
 
@@ -190,14 +188,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
             CodetooCommand = new DelegateCommand(Codetoo);
             Code6ChangedCommand = new DelegateCommand(Code6Changed);
             UserOutCommand = new DelegateCommand(UserOut);
-            CloseDialogCommand = new DelegateCommand(CloseDialog);
-
-
-        }
-        private void CloseDialog()
-        {
 
-            UserDialogViewModel.Close();
 
         }
 
@@ -224,6 +215,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
                         if (ServiceHelper.Usergout(Codesum) == "success")
                         {
                         Settings.Default.AppProperties.LoginToken = "";
+                        App.IsLogin =false;
                         Settings.Default.Save();
                         App.mainWindowViewModel.UserVis = Visibility.Collapsed;
                         App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
@@ -277,6 +269,7 @@ namespace PDF_Office.ViewModels.Dialog.ServiceDialog
 
                         if (ServiceHelper.Usergout(Codesum) == "success")
                         {
+                            App.IsLogin = false;
                             UserDialogViewModel.Close();
                         }
                         else

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -93,6 +93,25 @@ namespace PDF_Office.ViewModels
             }
         }
 
+
+
+
+        /// <summary>
+        ///提示登录高级功能
+        /// </summary>
+        private Visibility _OphVis = Visibility.Collapsed;
+
+        public Visibility OphVis
+        {
+            get { return _OphVis; }
+            set
+            {
+                SetProperty(ref _OphVis, value);
+            }
+        }
+
+
+
         private Visibility _RegisterVis = Visibility.Collapsed;
 
         public Visibility RegisterVis
@@ -104,6 +123,8 @@ namespace PDF_Office.ViewModels
             }
         }
 
+
+
         private Visibility _LoginVis = Visibility.Collapsed;
 
         public Visibility LoginVis
@@ -244,11 +265,24 @@ namespace PDF_Office.ViewModels
                 App.IsFirstOpen = false;
                 if (Settings.Default.AppProperties.LoginToken != "")
                 {
-                    UserVis = Visibility.Visible;
+                    
+                    if(ServiceHelper.GetUser()=="false")
+                    {
+                       
+                        LoginVis = Visibility.Visible;
+                        OphVis = Visibility.Visible;
+
+                    }
+                    else
+                    {
+
+                        UserVis = Visibility.Visible;
+                    }
                 }
                 else
                 {
                     LoginVis = Visibility.Visible;
+                    OphVis = Visibility.Visible;
                 }
 
 

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -1534,6 +1534,8 @@ namespace PDF_Office.ViewModels
             if (isOpenFile)
                 return;
 
+            App.mainWindowViewModel.OphVis = Visibility.Collapsed;
+
             var mainVM = navigationContext.Parameters[ParameterNames.MainViewModel] as MainContentViewModel;
             if (mainVM != null)
             {

PDF Office/Views/Dialog/ServiceDialog/UserOut.xaml

@@ -57,7 +57,7 @@
                     Background="#1770F4"
                     Click="Button_Click"
                     Content="OK"
-                    Foreground="White" />
+                    Foreground="White" IsDefault="True" />
             </StackPanel>
         </Grid>
     </Grid>

PDF Office/Views/MainWindow.xaml

@@ -234,7 +234,7 @@
             Orientation="Horizontal"
             WindowChrome.IsHitTestVisibleInChrome="True">
 
-            <Grid Visibility="{Binding ElementName=Btn_Login, Path=Visibility}">
+            <Grid x:Name="Grid_Openhight" Visibility="{Binding OphVis,Mode=OneWay}">
                 <Border VerticalAlignment="Center">
                     <Path Data="M0 4C0 1.79086 1.79086 0 4 0H132C134.209 0 136 1.79086 136 4V10.323C136 10.7319 136.249 11.0996 136.629 11.2514L141.179 13.0715C142.017 13.4068 142.017 14.5932 141.179 14.9285L136.629 16.7486C136.249 16.9004 136 17.2681 136 17.677V24C136 26.2091 134.209 28 132 28H4C1.79086 28 0 26.2091 0 24V4Z" Fill="#FFCF52" />
                 </Border>
@@ -242,7 +242,6 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="12"
-                    LineHeight="19.6"
                     Text="登录解锁高级功能" />
             </Grid>