From 25e11fa9de3f39ddbac4cba3e4f1c7c4fa8381f6 Mon Sep 17 00:00:00 2001
From: unknown <2564608840@qq.com>
Date: Sun, 20 Jul 2025 00:09:48 +0800
Subject: [PATCH] =?UTF-8?q?improve:=E8=81=94=E5=8A=A8=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml         | 35 +++++++++++++++++++++++++++++-
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 22 ++++++++++---------
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index f663fae4..88eb0583 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -178,7 +178,40 @@
     </Window.CommandBindings>
 
     <Grid x:Name="Main_Grid">
-
+        <!-- 等待COM组件加载动画 -->
+        <Grid x:Name="LoadingMask" Background="#80000000" Visibility="Collapsed" Panel.ZIndex="10000">
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" >
+                <!-- 圆形旋转动画 -->
+                <Grid Width="60" Height="60">
+                    <Ellipse Width="60" Height="60" Stroke="#40FFFFFF" StrokeThickness="6"/>
+                    <Ellipse Width="60" Height="60" Stroke="White" StrokeThickness="6"
+                             StrokeDashArray="0,1.5"
+                             RenderTransformOrigin="0.5,0.5">
+                        <Ellipse.RenderTransform>
+                            <RotateTransform x:Name="SpinnerRotate"/>
+                        </Ellipse.RenderTransform>
+                        <Ellipse.Triggers>
+                            <EventTrigger RoutedEvent="FrameworkElement.Loaded">
+                                <BeginStoryboard>
+                                    <Storyboard RepeatBehavior="Forever">
+                                        <DoubleAnimation
+                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                            From="0" To="360" Duration="0:0:1"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </EventTrigger>
+                        </Ellipse.Triggers>
+                    </Ellipse>
+                </Grid>
+                <TextBlock Text="正在连接 PowerPoint..." 
+                           Foreground="White" 
+                           Margin="0,20,0,0" 
+                           HorizontalAlignment="Center"
+                           FontSize="18"
+                           FontWeight="Bold"
+                           Opacity="0.9"/>
+            </StackPanel>
+        </Grid>
         <!--// 设置界面 //-->
         <Grid Panel.ZIndex="999" x:Name="BorderSettingsMask" MouseDown="SettingsOverlayClick" IsHitTestVisible="True"
               Margin="0,0,0,0">
diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 1cfdd349..0086c86c 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -28,6 +28,8 @@ namespace Ink_Canvas {
 
         private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) {
             try {
+                // 显示加载动画
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
                 pptApplication =
                     (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
                 //pptApplication.SlideShowWindows[1].View.Next();
@@ -67,6 +69,10 @@ namespace Ink_Canvas {
                 RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 MessageBox.Show("未找到幻灯片");
             }
+            finally {
+                // 隐藏加载动画
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
+            }
         }
 
         private void ToggleSwitchSupportWPS_Toggled(object sender, RoutedEventArgs e) {
@@ -85,16 +91,8 @@ namespace Ink_Canvas {
         private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) {
             if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) return;
             try {
-                //var processes = Process.GetProcessesByName("wpp");
-                //if (processes.Length > 0 && !isWPSSupportOn) return;
-
-                //使用下方提前创建 PowerPoint 实例，将导致 PowerPoint 不再有启动界面
-                //pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance(Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B")));
-                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowBegin").AddEventHandler(pptApplication, new EApplication_SlideShowBeginEventHandler(this.PptApplication_SlideShowBegin));
-                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowEnd").AddEventHandler(pptApplication, new EApplication_SlideShowEndEventHandler(this.PptApplication_SlideShowEnd));
-                //new ComAwareEventInfo(typeof(EApplication_Event), "SlideShowNextSlide").AddEventHandler(pptApplication, new EApplication_SlideShowNextSlideEventHandler(this.PptApplication_SlideShowNextSlide));
-                //ConfigHelper.Instance.IsInitApplicationSuccessful = true;
-
+                // 显示加载动画
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Visible; });
                 pptApplication =
                     (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
 
@@ -142,6 +140,10 @@ namespace Ink_Canvas {
                 Application.Current.Dispatcher.Invoke(() => { BtnPPTSlideShow.Visibility = Visibility.Collapsed; });
                 timerCheckPPT.Start();
             }
+            finally {
+                // 隐藏加载动画
+                Application.Current.Dispatcher.Invoke(() => { LoadingMask.Visibility = Visibility.Collapsed; });
+            }
         }
 
         private void PptApplication_PresentationOpen(Presentation Pres) {