翻页页面-不规则页判断

PDF Office/MultilingualResources/PDF Office.zh-Hant.xlf

@@ -1980,8 +1980,8 @@ form</target>
           <target state="new">Reset All</target>
         </trans-unit>
         <trans-unit id="WritableComboBox_CustomRangeEge" translate="yes" xml:space="preserve">
-          <source>ege : 1,3-5,10</source>
-          <target state="new">ege : 1,3-5,10</target>
+          <source>ege :  1,3-5, 10</source>
+          <target state="new">ege :  1,3-5, 10</target>
         </trans-unit>
       </group>
     </body>

PDF Office/ViewModels/BottomToolContentViewModel.cs

@@ -469,7 +469,23 @@ namespace PDF_Master.ViewModels
         {
             if (PDFViewer != null)
             {
-                PDFViewer.GoToPage(PDFViewer.CurrentIndex - 1);
+                if (PDFViewer.RenderPageStart == PDFViewer.CurrentIndex)
+                {
+
+                    PDFViewer.GoToPage(PDFViewer.CurrentIndex - 1);
+                }
+                else
+                {
+                    if ((PDFViewer.RenderPageStart - 1) > 0)
+                    {
+                        PDFViewer.GoToPage(PDFViewer.RenderPageStart - 1);
+                    }
+                    else
+                    {
+                        PDFViewer.GoToPage(PDFViewer.CurrentIndex - 1);
+                    }
+                }
+
             }
         }
 

PDF Office/ViewModels/PropertyPanel/ViewModular/PageContentViewModel.cs

@@ -8,6 +8,7 @@ using Prism.Regions;
 using Prism.Services.Dialogs;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -48,8 +49,22 @@ namespace PDF_Master.ViewModels.PropertyPanel.ViewModular
         {
             if (PDFViewer != null)
             {
-                PDFViewer.GoToPage(PDFViewer.CurrentIndex - 1);
-               
+                if (PDFViewer.RenderPageStart == PDFViewer.CurrentIndex)
+                {
+
+                    PDFViewer.GoToPage(PDFViewer.CurrentIndex - 1);
+                }
+                else
+                {
+                    if ((PDFViewer.RenderPageStart - 1) > 0)
+                    {
+                        PDFViewer.GoToPage(PDFViewer.RenderPageStart - 1);
+                    }
+                    else
+                    {
+                        PDFViewer.GoToPage(PDFViewer.CurrentIndex - 1);
+                    }
+                }
             }
         }
 

PDF Office/ViewModels/PropertyPanel/ViewModular/ReadModeContentViewModel.cs

@@ -148,9 +148,25 @@ namespace PDF_Master.ViewModels.PropertyPanel.ViewModular
         /// <param name="obj"></param>
         private void PrePageEvent()
         {
-            int currentindex= PDFViewer.CurrentIndex;
-            PDFViewer.GoToPage(PDFViewer.CurrentIndex - 1);
-           
+            if (PDFViewer.RenderPageStart == PDFViewer.CurrentIndex)
+            {
+
+                PDFViewer.GoToPage(PDFViewer.CurrentIndex - 1);
+            }
+            else
+            {
+                if ((PDFViewer.RenderPageStart - 1) > 0)
+                {
+                    PDFViewer.GoToPage(PDFViewer.RenderPageStart - 1);
+                }
+                else
+                {
+                    PDFViewer.GoToPage(PDFViewer.CurrentIndex - 1);
+                }
+            }
+            Trace.WriteLine("当前" + PDFViewer.CurrentIndex);
+            Trace.WriteLine("结束" + PDFViewer.RenderPageEnd);
+            Trace.WriteLine("开始" + PDFViewer.RenderPageStart);
         }
 
         /// <summary>