OYXH\oyxh 2 éve
szülő
commit
de67fff763

+ 8 - 8
PDF Office/ViewModels/BottomToolContentViewModel.cs

@@ -168,7 +168,7 @@ namespace PDF_Office.ViewModels
 
         public CPDFViewer PDFViewer { get; set; }
 
-        private ViewContentViewModel viewContentViewModel { get; set; }
+        public ViewContentViewModel ViewContentViewModel { get; set; }
 
         private IRegionManager region;
 
@@ -195,9 +195,9 @@ namespace PDF_Office.ViewModels
 
         private void ShowViewModularEvent(object obj)
         {
-            if (viewContentViewModel.IsPropertyOpen == false)
+            if (ViewContentViewModel.IsPropertyOpen == false)
             {
-                viewContentViewModel.IsPropertyOpen = true;
+                ViewContentViewModel.IsPropertyOpen = true;
 
                 NavigationParameters param = new NavigationParameters();
                 param.Add(ParameterNames.PDFViewer, PDFViewer);
@@ -206,9 +206,9 @@ namespace PDF_Office.ViewModels
             }
             else
             {
-                viewContentViewModel.IsPropertyOpen = false;
+                ViewContentViewModel.IsPropertyOpen = false;
             }
-            IsShowViewModular = viewContentViewModel.IsPropertyOpen;
+            IsShowViewModular = ViewContentViewModel.IsPropertyOpen;
         }
 
         /// <summary>
@@ -342,7 +342,7 @@ namespace PDF_Office.ViewModels
             {
                 PDFViewer.GoToPage(PDFViewer.CurrentIndex + 1);
                 //双页模式 一次性跳两页
-                if (((int)PDFViewer.ModeView>2))
+                if (((int)PDFViewer.ModeView > 2))
                 {
                     PDFViewer.GoToPage(PDFViewer.CurrentIndex + 2);
                 }
@@ -462,7 +462,7 @@ namespace PDF_Office.ViewModels
         {
             if (e.Key == "PageNum")
             {
-                RenderData renderData=e.Value as RenderData;
+                RenderData renderData = e.Value as RenderData;
                 if (renderData != null)
                 {
                     CurrentPage = renderData.PageIndex;
@@ -564,7 +564,7 @@ namespace PDF_Office.ViewModels
             var viewContentViewModel = navigationContext.Parameters[ParameterNames.ViewContentViewModel] as ViewContentViewModel;
             if (viewContentViewModel != null)
             {
-                this.viewContentViewModel = viewContentViewModel;
+                this.ViewContentViewModel = viewContentViewModel;
                 IsShowViewModular = viewContentViewModel.IsPropertyOpen;
             }
 

+ 344 - 358
PDF Office/ViewModels/PropertyPanel/ViewModular/ViewModularContentViewModel.cs

@@ -3,6 +3,7 @@ using ComPDFKitViewer.PdfViewer;
 using Microsoft.Office.Interop.Word;
 using PDF_Office.Helper;
 using PDF_Office.Model;
+using PDF_Office.ViewModels.BOTA;
 using PDF_Office.Views;
 using PDFSettings.Settings;
 using Prism.Commands;
@@ -19,365 +20,350 @@ using System.Windows.Forms;
 
 namespace PDF_Office.ViewModels.PropertyPanel.ViewModular
 {
-public class ViewModularContentViewModel : BindableBase, INavigationAware
-{
-private IRegionManager region;
-
-private IDialogService dialogs;
-
-//记录 单页 双页  书本模式
-private ViewMode viewmode = ViewMode.Single;
-
-public CPDFViewer PDFViewer { get; set; }
-public BottomToolContentViewModel BottomToolContentViewModel { get; set; }
-public ViewContentViewModel ViewContentViewModel { get; set; }
-public string SplitScreenViewRegionName { get; set; }
-public string ThemesContentName { get; set; }
-private Visibility splitScreenViewVisible = Visibility.Collapsed;
-
-/// <summary>
-    /// 控制Content的显示 用于显示分屏的模块
-/// </summary>
-public Visibility SplitScreenViewVisible
-{
-get { return splitScreenViewVisible; }
-set
-{
-SetProperty(ref splitScreenViewVisible, value);
-}
-}
-
-private bool isContinue;
-
-public bool IsContinue
-{
-get { return isContinue; }
-set
-{
-SetProperty(ref isContinue, value);
-if (value)
-{
-SetModeView();
-}
-}
-}
-
-private bool isPagesBreak = true;
-
-public bool IsPagesBreak
-{
-get { return isPagesBreak; }
-set
-{
-SetProperty(ref isPagesBreak, value);
-}
-}
-
-private bool isSingleView;
-
-public bool IsSingleView
-{
-get { return isSingleView; }
-set
-{
-SetProperty(ref isSingleView, value);
-if (value)
-{
-SetModeView();
-}
-}
-}
-
-private bool isTwoPageView;
-
-public bool IsTwoPageView
-{
-get { return isTwoPageView; }
-set
-{
-SetProperty(ref isTwoPageView, value);
-if (value)
-{
-SetModeView();
-}
-}
-}
-
-private bool isBookModeView;
-
-public bool IsBookModeView
-{
-get { return isBookModeView; }
-set
-{
-SetProperty(ref isBookModeView, value);
-if (value)
-{
-SetModeView();
-}
-}
-}
-
-public DelegateCommand<object> SplitScreenCommand { get; set; }
-    public DelegateCommand<object> DisableCommand { get; set; }
+    public class ViewModularContentViewModel : BindableBase, INavigationAware
+    {
+        private IRegionManager region;
+
+        private IDialogService dialogs;
+
+        //记录 单页 双页  书本模式
+        private ViewMode viewmode = ViewMode.Single;
+
+        public CPDFViewer PDFViewer { get; set; }
+        public BottomToolContentViewModel BottomToolContentViewModel { get; set; }
+        public ViewContentViewModel ViewContentViewModel { get; set; }
+        public string SplitScreenViewRegionName { get; set; }
+        public string ThemesContentName { get; set; }
+        private Visibility splitScreenViewVisible = Visibility.Collapsed;
+
+        /// <summary>
+        /// 控制Content的显示 用于显示分屏的模块
+        /// </summary>
+        public Visibility SplitScreenViewVisible
+        {
+            get { return splitScreenViewVisible; }
+            set
+            {
+                SetProperty(ref splitScreenViewVisible, value);
+            }
+        }
+
+        private bool isContinue;
+
+        public bool IsContinue
+        {
+            get { return isContinue; }
+            set
+            {
+                SetProperty(ref isContinue, value);
+                if (value)
+                {
+                    SetModeView();
+                }
+            }
+        }
+
+        private bool isPagesBreak = true;
+
+        public bool IsPagesBreak
+        {
+            get { return isPagesBreak; }
+            set
+            {
+                SetProperty(ref isPagesBreak, value);
+            }
+        }
+
+        private bool isSingleView;
+
+        public bool IsSingleView
+        {
+            get { return isSingleView; }
+            set
+            {
+                SetProperty(ref isSingleView, value);
+                if (value)
+                {
+                    SetModeView();
+                }
+            }
+        }
+
+        private bool isTwoPageView;
+
+        public bool IsTwoPageView
+        {
+            get { return isTwoPageView; }
+            set
+            {
+                SetProperty(ref isTwoPageView, value);
+                if (value)
+                {
+                    SetModeView();
+                }
+            }
+        }
+
+        private bool isBookModeView;
+
+        public bool IsBookModeView
+        {
+            get { return isBookModeView; }
+            set
+            {
+                SetProperty(ref isBookModeView, value);
+                if (value)
+                {
+                    SetModeView();
+                }
+            }
+        }
+
+        public DelegateCommand<object> SplitScreenCommand { get; set; }
+        public DelegateCommand<object> DisableCommand { get; set; }
 
         public DelegateCommand SetViewModeCommand { get; set; }
         public DelegateCommand<object> ContinueCommand { get; set; }
-            public DelegateCommand<object> PagesBreakCommand { get; set; }
-
-                public DelegateCommand<object> RotateCommand { get; set; }
-
-                    public ViewModularContentViewModel(IRegionManager regionManager, IDialogService dialogService)
+        public DelegateCommand<object> PagesBreakCommand { get; set; }
+
+        public DelegateCommand<object> RotateCommand { get; set; }
+
+        public ViewModularContentViewModel(IRegionManager regionManager, IDialogService dialogService)
+        {
+            region = regionManager;
+            dialogs = dialogService;
+            //未显示时无法注册上Region名称,所以需要短暂显示
+            //SplitScreenViewVisible = Visibility.Visible;
+            //SplitScreenViewRegionName = RegionNames.SplitScreenViewRegionName;
+            ThemesContentName = RegionNames.ThemesContentName;
+            //SplitScreenViewVisible = Visibility.Collapsed;
+
+            SplitScreenCommand = new DelegateCommand<object>(SplitScreenEvent);
+            DisableCommand = new DelegateCommand<object>(DisableEvent);
+            SetViewModeCommand = new DelegateCommand(SetModeView);
+            ContinueCommand = new DelegateCommand<object>(ContinueEvent);
+            PagesBreakCommand = new DelegateCommand<object>(PagesBreakEvent);
+            RotateCommand = new DelegateCommand<object>(RotateEvent);
+
+            //在构造函数中使用Region需要借助Dispatcher 确保UI已经加载完成,加载BOTA区域
+            System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+            {
+                NavigationParameters parameters = new NavigationParameters();
+                parameters.Add(ParameterNames.PDFViewer, PDFViewer);
+                region.RequestNavigate(RegionNames.ThemesContentName, "ThemesContent", parameters);
+            }
+            ));
+        }
+
+        /// <summary>
+        /// 旋转
+        /// </summary>
+        /// <param name="obj"></param>
+        private void RotateEvent(object obj)
+        {
+            bool right = Convert.ToBoolean(obj);
+
+            PDFViewer.RotatePage(PageRotate.Rotate90, right, PDFViewer.CurrentIndex);
+
+            //后续需要添加,缩略图旋转改变
+
+            PDFViewer.UndoManager.CanSave = true;
+        }
+
+        /// <summary>
+        /// 分页符
+        /// </summary>
+        /// <param name="obj"></param>
+        private void PagesBreakEvent(object obj)
+        {
+            if (IsPagesBreak)
+            {
+                PDFViewer.SetPageSpacing(8);
+                IsPagesBreak = true;
+            }
+            else
+            {
+                PDFViewer.SetPageSpacing(0);
+                IsPagesBreak = false;
+            }
+            SaveMode(IsPagesBreak);
+        }
+
+        /// <summary>
+        /// 设置显示模式
+        /// </summary>
+        private void SetModeView()
+        {
+            if (PDFViewer != null)
+            {
+                if (IsContinue)
+                {
+                    if (IsSingleView)
+                    {
+                        PDFViewer.ChangeViewMode(ViewMode.SingleContinuous);
+                    }
+                    else if (IsTwoPageView)
+                    {
+                        PDFViewer.ChangeViewMode(ViewMode.DoubleContinuous);
+                    }
+                    else
+                    {
+                        PDFViewer.ChangeViewMode(ViewMode.BookContinuous);
+                    }
+                }
+                else
+                {
+                    if (IsSingleView)
+                    {
+                        PDFViewer.ChangeViewMode(ViewMode.Single);
+                    }
+                    else if (IsTwoPageView)
+                    {
+                        PDFViewer.ChangeViewMode(ViewMode.Double);
+                    }
+                    else
                     {
-                    region = regionManager;
-                    dialogs = dialogService;
-                    //未显示时无法注册上Region名称,所以需要短暂显示
-                    SplitScreenViewVisible = Visibility.Visible;
-                    SplitScreenViewRegionName = RegionNames.SplitScreenViewRegionName;
-                    ThemesContentName = RegionNames.ThemesContentName;
-                    SplitScreenViewVisible = Visibility.Collapsed;
-
-                    SplitScreenCommand = new DelegateCommand<object>(SplitScreenEvent);
-                        DisableCommand = new DelegateCommand<object>(DisableEvent);
-                            SetViewModeCommand = new DelegateCommand(SetModeView);
-                            ContinueCommand = new DelegateCommand<object>(ContinueEvent);
-                                PagesBreakCommand = new DelegateCommand<object>(PagesBreakEvent);
-                                    RotateCommand = new DelegateCommand<object>(RotateEvent);
-
-                                        //在构造函数中使用Region需要借助Dispatcher 确保UI已经加载完成,加载BOTA区域
-System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
-                                            {
-                                            NavigationParameters parameters = new NavigationParameters();
-                                            parameters.Add(ParameterNames.PDFViewer, PDFViewer);
-                                            region.RequestNavigate(RegionNames.ThemesContentName, "ThemesContent", parameters);
-                                            }
-                                            ));
-                                            }
-
-                                            /// <summary>
-                                                /// 旋转
-                                            /// </summary>
-                                            /// <param name="obj"></param>
-                                            private void RotateEvent(object obj)
-                                            {
-                                            bool right = Convert.ToBoolean(obj);
-
-                                            PDFViewer.RotatePage(PageRotate.Rotate90, right, PDFViewer.CurrentIndex);
-
-                                            //后续需要添加,缩略图旋转改变
-
-                                            PDFViewer.UndoManager.CanSave = true;
-                                            }
-
-                                            /// <summary>
-                                                /// 分页符
-                                            /// </summary>
-                                            /// <param name="obj"></param>
-                                            private void PagesBreakEvent(object obj)
-                                            {
-                                            if (IsPagesBreak)
-                                            {
-                                            PDFViewer.SetPageSpacing(8);
-                                            IsPagesBreak = true;
-                                            }
-                                            else
-                                            {
-                                            PDFViewer.SetPageSpacing(0);
-                                            IsPagesBreak = false;
-                                            }
-                                            SaveMode(IsPagesBreak);
-                                            }
-
-                                            /// <summary>
-                                                /// 设置显示模式
-                                            /// </summary>
-                                            private void SetModeView()
-                                            {
-                                            if (PDFViewer != null)
-                                            {
-                                            if (IsContinue)
-                                            {
-                                            if (IsSingleView)
-                                            {
-                                            PDFViewer.ChangeViewMode(ViewMode.SingleContinuous);
-                                            }
-                                            else if (IsTwoPageView)
-                                            {
-                                            PDFViewer.ChangeViewMode(ViewMode.DoubleContinuous);
-                                            }
-                                            else
-                                            {
-                                            PDFViewer.ChangeViewMode(ViewMode.BookContinuous);
-                                            }
-                                            }
-                                            else
-                                            {
-                                            if (IsSingleView)
-                                            {
-                                            PDFViewer.ChangeViewMode(ViewMode.Single);
-                                            }
-                                            else if (IsTwoPageView)
-                                            {
-                                            PDFViewer.ChangeViewMode(ViewMode.Double);
-                                            }
-                                            else
-                                            {
-                                            PDFViewer.ChangeViewMode(ViewMode.Book);
-                                            }
-                                            }
-                                            }
-                                            SaveMode(PDFViewer.ModeView);
-                                            }
-
-                                            /// <summary>
-                                                /// 连续滚动
-                                            /// </summary>
-                                            /// <param name="obj"></param>
-                                            private void ContinueEvent(object obj)
-                                            {
-                                            SetModeView();
-                                            }
-
-                                            /// <summary>
-                                                /// 保存模式到本地
-                                            /// </summary>
-                                            /// <param name="modeView"></param>
-                                            private void SaveMode(object modeView)
-                                            {
-                                            OpenFileInfo fileInfo = SettingHelper.GetFileInfo(PDFViewer.Document.FilePath);
-                                            if (fileInfo != null)
-                                            {
-                                            if (modeView is SplitMode)
-                                            {
-                                            fileInfo.LastSplitMode = PDFViewer.Mode;
-                                            }
-                                            else if (modeView is ViewMode)
-                                            {
-                                            fileInfo.LastViewMode = PDFViewer.ModeView;
-                                            }
-                                            else if (modeView is bool)
-                                            {
-                                            fileInfo.LastPageSpace = (bool)modeView;
-                                            }
-                                            SettingHelper.SetFileInfo(fileInfo);
-                                            }
-                                            }
-
-                                            /// <summary>
-                                                /// 分屏视图-单屏
-                                            /// </summary>
-                                            /// <param name="obj"></param>
-                                            private void DisableEvent(object obj)
-                                            {
-                                            SplitScreenViewVisible = Visibility.Collapsed;
-                                            }
-
-                                            /// <summary>
-                                                /// 分屏视图-垂直
-                                            /// </summary>
-                                            /// <param name="obj"></param>
-                                            private void SplitScreenEvent(object obj)
-                                            {
-                                            //SplitScreenViewVisible = Visibility.Visible;
-                                            //NavigationParameters param = new NavigationParameters();
-                                            //param.Add(ParameterNames.PDFViewer, PDFViewer);
-                                            //region.RequestNavigate(RegionNames.SplitScreenViewRegionName, "SplitScreenContent", param);
-                                            PDFViewer.SetSplitMode(SplitMode.Horizontal);
-
-                                            OpenFileInfo fileInfo = SettingHelper.GetFileInfo(PDFViewer.Document.FilePath);
-                                            if (fileInfo != null)
-                                            {
-                                            //if (Mode is SplitMode)
-                                            fileInfo.LastSplitMode = PDFViewer.Mode;
-                                            //else if (Mode is ViewMode)
-                                            //    fileInfo.LastViewMode = PDFViewer.ModeView;
-                                            //else if (Mode is bool)
-                                            //    fileInfo.LastPageSpace = (bool)Mode;
-                                            SettingHelper.SetFileInfo(fileInfo);
-                                            }
-                                            }
-
-                                            public bool IsNavigationTarget(NavigationContext navigationContext)
-                                            {
-                                            return true;
-                                            }
-
-                                            public void OnNavigatedFrom(NavigationContext navigationContext)
-                                            {
-                                            }
-
-                                            public void OnNavigatedTo(NavigationContext navigationContext)
-                                            {
-                                            CPDFViewer pdfview = navigationContext.Parameters[ParameterNames.PDFViewer] as CPDFViewer;
-                                            BottomToolContentViewModel btnTool = navigationContext.Parameters["BottomToolContentViewModel"] as BottomToolContentViewModel;
-                                            if (pdfview != null && btnTool != null)
-                                            {
-                                            BottomToolContentViewModel = btnTool;
-                                            PDFViewer = pdfview;
-                                            }
-                                            else
-                                            {
-                                            return;
-                                            }
-
-                                            IsSingleView = BottomToolContentViewModel.IsSingleView;
-                                            IsTwoPageView = BottomToolContentViewModel.IsDoubleView;
-                                            IsBookModeView = BottomToolContentViewModel.IsBookMode;
-                                            IsContinue = BottomToolContentViewModel.IsContinue;
-                                            PDFViewer.InfoChanged += PDFViewer_InfoChanged;
-                                            }
-
-                                            /// <summary>
-                                                /// 和底部工具栏联动
-                                            /// </summary>
-                                            /// <param name="sender"></param>
-                                            /// <param name="e"></param>
-                                            private void PDFViewer_InfoChanged(object sender, KeyValuePair<string, object> e)
-                                                {
-                                                if (e.Key == "ViewMode")
-                                                {
-                                                GetModeView((ViewMode)e.Value);
-                                                }
-                                                }
-
-                                                private void GetModeView(ViewMode mode)
-                                                {
-                                                if ((int)mode % 2 == 0)
-                                                {
-                                                if (!IsContinue)
-                                                {
-                                                IsContinue = true;
-                                                }
-                                                }
-                                                else
-                                                {
-                                                if (IsContinue)
-                                                {
-                                                IsContinue = false;
-                                                }
-                                                }
-
-                                                if ((int)mode <= 2)
-                                                   {
-                                                   if (!isSingleView)
-                                                   {
-                                                   IsSingleView = true;
-                                                   }
-                                                   }
-                                                else if ((int)mode <= 4)
-                                                   {
-                                                   if (!isTwoPageView)
-                                                   {
-                                                   IsTwoPageView = true;
-                                                   }
-                                                   }
-                                                   else
-                                                   {
-                                                   if (!isBookModeView)
-                                                   {
-                                                   IsBookModeView = true;
-                                                   }
-                                                   }
-                                                   }
-                                                   }
-                                                   }
+                        PDFViewer.ChangeViewMode(ViewMode.Book);
+                    }
+                }
+            }
+            SaveMode(PDFViewer.ModeView);
+        }
+
+        /// <summary>
+        /// 连续滚动
+        /// </summary>
+        /// <param name="obj"></param>
+        private void ContinueEvent(object obj)
+        {
+            SetModeView();
+        }
+
+        /// <summary>
+        /// 保存模式到本地
+        /// </summary>
+        /// <param name="modeView"></param>
+        private void SaveMode(object modeView)
+        {
+            OpenFileInfo fileInfo = SettingHelper.GetFileInfo(PDFViewer.Document.FilePath);
+            if (fileInfo != null)
+            {
+                if (modeView is SplitMode)
+                {
+                    fileInfo.LastSplitMode = PDFViewer.Mode;
+                }
+                else if (modeView is ViewMode)
+                {
+                    fileInfo.LastViewMode = PDFViewer.ModeView;
+                }
+                else if (modeView is bool)
+                {
+                    fileInfo.LastPageSpace = (bool)modeView;
+                }
+                SettingHelper.SetFileInfo(fileInfo);
+            }
+        }
+
+        /// <summary>
+        /// 分屏视图-单屏
+        /// </summary>
+        /// <param name="obj"></param>
+        private void DisableEvent(object obj)
+        {
+            SplitScreenViewVisible = Visibility.Collapsed;
+        }
+
+        /// <summary>
+        /// 分屏视图-垂直
+        /// </summary>
+        /// <param name="obj"></param>
+        private void SplitScreenEvent(object obj)
+        {
+            ViewContentViewModel.EnterSplitMode(EventAggregators.SplitMode.Vertical);
+        }
+
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+        }
+
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            CPDFViewer pdfview = navigationContext.Parameters[ParameterNames.PDFViewer] as CPDFViewer;
+            BottomToolContentViewModel btnTool = navigationContext.Parameters["BottomToolContentViewModel"] as BottomToolContentViewModel;
+            if (pdfview != null && btnTool != null)
+            {
+                BottomToolContentViewModel = btnTool;
+                PDFViewer = pdfview;
+                ViewContentViewModel = BottomToolContentViewModel.ViewContentViewModel;
+            }
+            else
+            {
+                return;
+            }
+
+            IsSingleView = BottomToolContentViewModel.IsSingleView;
+            IsTwoPageView = BottomToolContentViewModel.IsDoubleView;
+            IsBookModeView = BottomToolContentViewModel.IsBookMode;
+            IsContinue = BottomToolContentViewModel.IsContinue;
+            PDFViewer.InfoChanged += PDFViewer_InfoChanged;
+        }
+
+        /// <summary>
+        /// 和底部工具栏联动
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PDFViewer_InfoChanged(object sender, KeyValuePair<string, object> e)
+        {
+            if (e.Key == "ViewMode")
+            {
+                GetModeView((ViewMode)e.Value);
+            }
+        }
+
+        private void GetModeView(ViewMode mode)
+        {
+            if ((int)mode % 2 == 0)
+            {
+                if (!IsContinue)
+                {
+                    IsContinue = true;
+                }
+            }
+            else
+            {
+                if (IsContinue)
+                {
+                    IsContinue = false;
+                }
+            }
+
+            if ((int)mode <= 2)
+            {
+                if (!isSingleView)
+                {
+                    IsSingleView = true;
+                }
+            }
+            else if ((int)mode <= 4)
+            {
+                if (!isTwoPageView)
+                {
+                    IsTwoPageView = true;
+                }
+            }
+            else
+            {
+                if (!isBookModeView)
+                {
+                    IsBookModeView = true;
+                }
+            }
+        }
+    }
+}

+ 4 - 5
PDF Office/ViewModels/ViewContentViewModel.cs

@@ -404,7 +404,6 @@ namespace PDF_Office.ViewModels
             }
         }
 
-
         #endregion 属性、变量
 
         #region 命令
@@ -675,7 +674,6 @@ namespace PDF_Office.ViewModels
             IsLoading = Visibility.Collapsed;
         }
 
-
         #region PDFViewer鼠标滚轮缩放事件
 
         public void PdfViewer_MouseWheelZoomHandler(object sender, bool e)
@@ -749,13 +747,14 @@ namespace PDF_Office.ViewModels
         #endregion Navigate
 
         #region 方法
+
         /// <summary>
         /// 视图面板  切换分屏模式
         /// </summary>
         /// <param name="mode"></param>
         public void EnterSplitMode(SplitMode mode)
         {
-            if(mode == SplitMode.Single)
+            if (mode == SplitMode.Single)
             {
                 //单屏时清空分屏区域内容
                 region.Regions[SplitViewerRegionName].RemoveAll();
@@ -764,7 +763,6 @@ namespace PDF_Office.ViewModels
             this.events.GetEvent<SplitEvent>().Publish(new SplitEventArgs() { Unicode = unicode, Mode = mode });
         }
 
-
         private void Undo()
         {
             if (isInPageEdit)
@@ -803,6 +801,7 @@ namespace PDF_Office.ViewModels
                       region.RequestNavigate(BOTARegionName, "BOTAContent", parameters);
                       region.RequestNavigate(BottomToolRegionName, "BottomToolContent", parameters);
                       region.RequestNavigate(ReadModeRegionName, "ReadModeContent", parameters);
+                      region.RequestNavigate(SplitViewerRegionName, "SplitScreenContent", parameters);
 
                       //TODO 根据上一次关闭记录的菜单,选中TabItem
                       EnterSelectedBar("TabItemAnnotation");
@@ -961,7 +960,7 @@ namespace PDF_Office.ViewModels
             if (dlg.ShowDialog() == true && !string.IsNullOrEmpty(dlg.FileName))
             {
                 bool result = false;
-                if(isFromRedaction)
+                if (isFromRedaction)
                 {
                     //应用标记密文并另存为保存
                     try

+ 1 - 1
PDF Office/Views/PropertyPanel/ViewModular/SplitScreenContent.xaml

@@ -14,7 +14,7 @@
     d:DesignHeight="700"
     d:DesignWidth="500"
     prism:ViewModelLocator.AutoWireViewModel="True"
-    mc:Ignorable="d">
+    mc:Ignorable="d" Background="Red">
     <Grid>
         <StackPanel
             HorizontalAlignment="Center"

+ 2 - 2
PDF Office/Views/PropertyPanel/ViewModular/ViewModularContent.xaml

@@ -142,7 +142,7 @@
                     Name="RBtnFullScreen"
                     Margin="4,0,4,0"
                     GroupName="DisplayMode"
-                    IsChecked="{Binding IsTwoPageView}"
+
                     Style="{StaticResource ViewModeViewRadioBtn}">
                     <StackPanel Margin="0,0,3,0">
                         <Path
@@ -160,7 +160,7 @@
                     Name="RBtnSlide"
                     Margin="0,0,4,0"
                     GroupName="DisplayMode"
-                    IsChecked="{Binding IsBookModeView}"
+
                     Style="{StaticResource ViewModeViewRadioBtn}">
                     <StackPanel Margin="0,0,3,0">
                         <Grid

+ 1 - 1
PDF Office/Views/ViewContent.xaml

@@ -305,7 +305,7 @@
                     Name="HorizontalSplitter"
                     Grid.Column="1"
                     Height="12" />
-                <ContentControl Name="SplitPDFViewer" prism:RegionManager.RegionName="{Binding SplitViewerRegionName}" />
+                <ContentControl   Name="SplitPDFViewer" prism:RegionManager.RegionName="{Binding SplitViewerRegionName}" />
             </Grid>
             <ScrollViewer
                 Name="Scroller"

+ 5 - 4
PDF Office/Views/ViewContent.xaml.cs

@@ -33,7 +33,7 @@ namespace PDF_Office.Views
             viewModel = (ViewContentViewModel)this.DataContext;
         }
 
-        public ViewContent(IEventAggregator eventAggregator) :this()
+        public ViewContent(IEventAggregator eventAggregator) : this()
         {
             eventAggregator.GetEvent<SplitEvent>().Subscribe(ChangeSplitModeUI, e => e.Unicode == unicode);
         }
@@ -52,9 +52,10 @@ namespace PDF_Office.Views
                     HorizontalSplitter.Visibility = Visibility.Collapsed;
                     VerticalSplitter.Visibility = Visibility.Visible;
                     RowRight.Height = new GridLength(0);
-                    ColumnBottom.Width = new GridLength(0,GridUnitType.Star);
-                    Grid.SetColumn(SplitPDFViewer,0);
-                    Grid.SetRow(SplitPDFViewer,2);
+                    ColumnBottom.Width = new GridLength(0, GridUnitType.Star);
+                    Grid.SetColumn(SplitPDFViewer, 0);
+                    Grid.SetRow(SplitPDFViewer, 2);
+
                     break;
                 case EventAggregators.SplitMode.Horizontal:
                     HorizontalSplitter.Visibility = Visibility.Visible;