Merge pull request #22 from awesome-iwb/beta

ICC CE 1.4.7 （Beta1.4.14）

AutomaticUpdateVersionControl.txt

@@ -1 +1 @@
-5.0.1
+1.4.7

Ink Canvas/Helpers/LogHelper.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Diagnostics;
 using System.IO;
+using System.Threading;
 
 namespace Ink_Canvas.Helpers
 {
@@ -14,24 +16,19 @@ namespace Ink_Canvas.Helpers
 
         public static void NewLog(Exception ex)
         {
-
+            if (ex == null) return;
+            var stackTrace = ex.StackTrace ?? "<no stack trace>";
+            var msg = $"[Exception] Type: {ex.GetType().FullName}\nMessage: {ex.Message}\nStackTrace: {stackTrace}";
+            if (ex.InnerException != null)
+            {
+                msg += $"\nInnerException: {ex.InnerException.GetType().FullName} - {ex.InnerException.Message}\n{ex.InnerException.StackTrace}";
+            }
+            WriteLogToFile(msg, LogType.Error);
         }
 
         public static void WriteLogToFile(string str, LogType logType = LogType.Info)
         {
-            string strLogType = "Info";
-            switch (logType)
-            {
-                case LogType.Event:
-                    strLogType = "Event";
-                    break;
-                case LogType.Trace:
-                    strLogType = "Trace";
-                    break;
-                case LogType.Error:
-                    strLogType = "Error";
-                    break;
-            }
+            string strLogType = logType.ToString();
             try
             {
                 var file = App.RootPath + LogFile;
@@ -39,16 +36,30 @@ namespace Ink_Canvas.Helpers
                 {
                     Directory.CreateDirectory(App.RootPath);
                 }
-                StreamWriter sw = new StreamWriter(file, true);
-                sw.WriteLine(string.Format("{0} [{1}] {2}", DateTime.Now.ToString("O"), strLogType, str));
-                sw.Close();
+                var threadId = Thread.CurrentThread.ManagedThreadId;
+                var callingMethod = new StackTrace(2, true).GetFrame(0);
+                string callerInfo = "<unknown>";
+                if (callingMethod != null)
+                {
+                    var method = callingMethod.GetMethod();
+                    if (method != null)
+                    {
+                        var className = method.DeclaringType != null ? method.DeclaringType.FullName : "<no class>";
+                        callerInfo = $"{className}.{method.Name}";
+                    }
+                }
+                string logLine = string.Format("{0} [T{1}] [{2}] [{3}] {4}", DateTime.Now.ToString("O"), threadId, strLogType, callerInfo, str);
+                using (StreamWriter sw = new StreamWriter(file, true))
+                {
+                    sw.WriteLine(logLine);
+                }
             }
             catch { }
         }
 
         internal static void WriteLogToFile(string v, object warning)
         {
-            throw new NotImplementedException();
+            WriteLogToFile($"[Warning] {v}", LogType.Warning);
         }
 
         public enum LogType

Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs

@@ -485,7 +485,7 @@ namespace Ink_Canvas {
                 RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
                 RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                //进入黑板
+                //進入黑板
 
                 /*
                 if (Not_Enter_Blackboard_fir_Mouse_Click) {// BUG-Fixed_tmp：程序启动后直接进入白板会导致后续撤销功能、退出白板无法恢复墨迹
@@ -501,7 +501,6 @@ namespace Ink_Canvas {
                     Application.Current.Dispatcher.Invoke(() => { ViewboxFloatingBarMarginAnimation(60); });
                 })).Start();
 
-                HideSubPanels();
                 if (GridTransparencyFakeBackground.Background == Brushes.Transparent)
                 {
                     if (currentMode == 1)
@@ -514,6 +513,11 @@ namespace Ink_Canvas {
                     }
 
                     BtnHideInkCanvas_Click(BtnHideInkCanvas, null);
+                    HideSubPanels();
+                }
+                else
+                {
+                    HideSubPanels();
                 }
 
                 if (Settings.Gesture.AutoSwitchTwoFingerGesture) // 自动关闭多指书写、开启双指移动
@@ -574,6 +578,15 @@ namespace Ink_Canvas {
                     if (dopsc[2] == '2' && isDisplayingOrHidingBlackboard == false) AnimationsHelper.ShowWithFadeIn(LeftSidePanelForPPTNavigation);
                     if (dopsc[3] == '2' && isDisplayingOrHidingBlackboard == false) AnimationsHelper.ShowWithFadeIn(RightSidePanelForPPTNavigation);
                 }
+                // 修复PPT放映时点击白板按钮后翻页按钮不显示的问题
+                if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
+                {
+                    // 强制显示PPT翻页按钮
+                    LeftBottomPanelForPPTNavigation.Visibility = Visibility.Visible;
+                    RightBottomPanelForPPTNavigation.Visibility = Visibility.Visible;
+                    LeftSidePanelForPPTNavigation.Visibility = Visibility.Visible;
+                    RightSidePanelForPPTNavigation.Visibility = Visibility.Visible;
+                }
 
                 if (Settings.Automation.IsAutoSaveStrokesAtClear &&
                     inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) SaveScreenShot(true);

Ink Canvas/Windows/RandWindow.xaml

@@ -106,7 +106,7 @@
                             <Viewbox Margin="0,10">
                                 <ui:SymbolIcon Symbol="Globe" Foreground="White"/>
                             </Viewbox>
-                            <TextBlock Text="调用外部点名" Foreground="White" FontSize="22" Margin="-1,-1,4,0" VerticalAlignment="Center"/>
+                            <TextBlock Text="ClassIsland点名" Foreground="White" FontSize="18" Margin="-1,-1,4,0" VerticalAlignment="Center"/>
                         </ui:SimpleStackPanel>
                     </Border>
                 </ui:SimpleStackPanel>

Ink Canvas/Windows/RandWindow.xaml.cs

@@ -207,8 +207,21 @@ namespace Ink_Canvas {
             Close();
         }
 
+        // 将 isIslandCallerFirstClick 设为静态字段，实现全局记录
+        private static bool isIslandCallerFirstClick = true;
+
         private void BorderBtnIslandCaller_MouseUp(object sender, MouseButtonEventArgs e)
         {
+            if (isIslandCallerFirstClick)
+            {
+                MessageBox.Show(
+                    "首次使用ClassIsland点名功能，请确保已安装ClassIsland和Island caller插件。\n" +
+                    "如未安装，请前往官网下载并安装后再使用。如果安装请再次点击此按钮。",
+                    "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                isIslandCallerFirstClick = false;
+                return;
+            }
+
             try
             {
                 System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo

Ink Canvas/dist/InkCanvasForClass.exe.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
+</configuration>

Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-cfae595a93b6c81be8a910a33f627301d3c3cf05ca24ac0f4e2d65c6094a6d68
+873bc7f43d75c362dfce6f35fc846d3cca2ed3663fa31937587b7276c474772f

Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache

@@ -13,7 +13,7 @@ E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml
 13173459795
 
 56-1167124909
-461490143614
+46-47806484
 MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\CountdownTimerWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml;
 
 False

Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "695B3561F1F2C3284724BFAA9122C85C2EF5221A"
+#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A29F1514A9DC6332F074303F230464CD5C24A898"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "695B3561F1F2C3284724BFAA9122C85C2EF5221A"
+#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A29F1514A9DC6332F074303F230464CD5C24A898"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。