Revert "improve:PPT翻页打断"

This reverts commit ddfa9c2676.

Ink Canvas/Helpers/PPTManager.cs

@@ -744,40 +744,41 @@ namespace Ink_Canvas.Helpers
                     {
                     }
 
-                    if (skipAnimations && currentPosition > 0 && totalSlides > 0 && currentPosition < totalSlides)
+                    try
                     {
+                        view.Next();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"调用下一页失败: {ex}", LogHelper.LogType.Warning);
+                    }
+
+                    if (skipAnimations && currentPosition > 0 && totalSlides > 0)
+                    {
+                        int positionAfterNext = currentPosition;
                         try
                         {
-                            view.GotoSlide(currentPosition + 1, MsoTriState.msoFalse);
+                            positionAfterNext = view.CurrentShowPosition;
-                            return true;
                         }
-                        catch (Exception ex)
+                        catch
+                        {
+                        }
+
+                        if (positionAfterNext == currentPosition && currentPosition < totalSlides)
                         {
-                            LogHelper.WriteLogToFile($"跳过转场动画跳转到下一页失败: {ex}", LogHelper.LogType.Warning);
                             try
                             {
-                                view.Next();
+                                view.GotoSlide(currentPosition + 1, MsoTriState.msoTrue);
                                 return true;
                             }
-                            catch
+                            catch (Exception ex)
                             {
-                                return false;
+                                LogHelper.WriteLogToFile($"强制跳转到下一页失败: {ex}", LogHelper.LogType.Warning);
                             }
                         }
                     }
-                    else
+
-                    {
+                    return true;
-                        try
-                        {
-                            view.Next();
-                            return true;
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"调用下一页失败: {ex}", LogHelper.LogType.Warning);
-                            return false;
-                        }
-                    }
                 }
                 return false;
             }

Ink Canvas/MainWindow.xaml

@@ -2251,7 +2251,7 @@
                                             TextWrapping="Wrap" Foreground="#a1a1aa" />
                                         <ui:SimpleStackPanel Orientation="Horizontal"
                                                              HorizontalAlignment="Left" Margin="0,6,0,0">
-                                            <TextBlock Foreground="#fafafa" Text="点击翻页时跳过转场动画，直接切到下一张"
+                                            <TextBlock Foreground="#fafafa" Text="点击翻页时跳过当前页动画，直接切到下一张"
                                                        VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
                                             <ui:ToggleSwitch OnContent="" OffContent=""
                                                              Name="ToggleSwitchSkipAnimationsWhenGoNext"
@@ -2260,7 +2260,7 @@
                                                              Toggled="ToggleSwitchSkipAnimationsWhenGoNext_OnToggled" />
                                         </ui:SimpleStackPanel>
                                         <TextBlock
-                                            Text="# 开启该选项后，点击下一页按钮时会跳过幻灯片之间的转场动画，直接跳转到下一张幻灯片。不会影响幻灯片内的元素动画。"
+                                            Text="# 开启该选项后，点击“下一页”按钮时如果仍停留在同一页，会强制直接切到下一张幻灯片，从而跳过该页的动画。"
                                             TextWrapping="Wrap" Foreground="#a1a1aa" />
                                     </ui:SimpleStackPanel>
                                     <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"