Insider

.github/workflows/msbuild.yml

@@ -293,6 +293,7 @@ jobs:
 
       - name: 提交给 SignPath 签名
         id: signpath
+        timeout-minutes: 30
         uses: signpath/github-action-submit-signing-request@v1.1
         with:
           api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
@@ -409,7 +410,7 @@ jobs:
           $size3 = (Get-Item $uploadFile3).Length
 
           $content = @"
-            "Insider": {
+            "${{ steps.softwareChannel.outputs.VALUE }}": {
             "edition_date": "${{ steps.softwareDate.outputs.VALUE }}",
             "edition_code": "",
             "hash": {
@@ -606,6 +607,8 @@ jobs:
 
       - name: Upload to WebDAV with rclone
         id: upload_webdav
+        timeout-minutes: 60
+        continue-on-error: true
         shell: pwsh
         run: |
           if ("${{ secrets.WEBDAV_API_TOKEN }}" -ne "")
@@ -618,7 +621,7 @@ jobs:
             # 开始上传
             Write-Host "开始上传到 WebDAV..."
             Write-Host "进度将每 10 秒更新一次"
-            Write-Host "超时时间: 5 分钟"
+            Write-Host "超时时间: 15 分钟"
             Write-Host "目标路径: /Inkeys/PackageHistory/$Env:GITHUB_REF_NAME"
             Write-Host ""
 
@@ -629,7 +632,7 @@ jobs:
                 --progress `
                 --transfers 1 `
                 --checkers 1 `
-                --timeout 5m `
+                --timeout 30s `
                 --contimeout 30s `
                 --retries 3 `
                 --retries-sleep 5s `

PptCOM/PptCOM.cs

@@ -71,7 +71,7 @@ public class PptCOMServer : IPptCOMServer
         private unsafe int* pptTotalPage;
         private unsafe int* pptCurrentPage;
 
-        private int polling = 0; // 结束界面轮询
+        private int polling = 0; // 结束界面轮询（0正常页 1/2末页或结束放映页）（2设定为运行一次不被检查的翻页，虽然我也不知道当时写这个是为了特判什么情况Hhh）
         private DateTime updateTime; // 更新时间点
         private bool bindingEvents;
 
@@ -98,7 +98,7 @@ public unsafe bool Initialization(int* TotalPage, int* CurrentPage, bool autoClo
         }
         public string CheckCOM()
         {
-            string ret = "20250508a";
+            string ret = "20250714a";
 
             try
             {
@@ -124,23 +124,39 @@ private unsafe void SlideShowChange(Microsoft.Office.Interop.PowerPoint.SlideSho
         {
             updateTime = DateTime.Now;
 
-            if (pptActWindow.View.Slide.SlideIndex >= pptActDoc.Slides.Count) polling = 1;
-            else polling = 0;
+            try
+            {
+                *pptCurrentPage = pptActWindow.View.Slide.SlideIndex;
 
-            *pptCurrentPage = pptActWindow.View.Slide.SlideIndex;
+                if (pptActWindow.View.Slide.SlideIndex >= pptActDoc.Slides.Count) polling = 1;
+                else polling = 0;
+            }
+            catch
+            {
+                *pptCurrentPage = -1;
+                polling = 1;
+            }
         }
 
         private unsafe void SlideShowBegin(Microsoft.Office.Interop.PowerPoint.SlideShowWindow Wn)
         {
             updateTime = DateTime.Now;
             pptActWindow = Wn;
 
-            if (pptActWindow.View.Slide.SlideIndex >= pptActDoc.Slides.Count) polling = 1;
-            else polling = 0;
+            try
+            {
+                if (pptActWindow.View.Slide.SlideIndex >= pptActDoc.Slides.Count) polling = 1;
+                else polling = 0;
+            }
+            catch
+            {
+                // Begin 事件定在结束放映页的小丑情况（虽然不可能有这种情况）
+                polling = 1;
+            }
 
             // 获取页数
-            *pptCurrentPage = pptActWindow.View.Slide.SlideIndex;
             *pptTotalPage = pptActDoc.Slides.Count;
+            *pptCurrentPage = pptActWindow.View.Slide.SlideIndex;
         }
 
         private unsafe void SlideShowShowEnd(Microsoft.Office.Interop.PowerPoint.Presentation Wn)
@@ -407,7 +423,10 @@ public unsafe void NextSlideShow(int check)
                 // 下一页
                 if (polling != 0)
                 {
-                    if (polling == 2) pptActWindow.View.Next();
+                    if (polling == 2)
+                    {
+                        pptActWindow.View.Next();
+                    }
                     else if (polling == 1)
                     {
                         int currentPageTemp = -1;
@@ -419,11 +438,17 @@ public unsafe void NextSlideShow(int check)
                         {
                             currentPageTemp = -1;
                         }
-                        if (currentPageTemp != -1) pptActWindow.View.Next();
+                        if (currentPageTemp != -1)
+                        {
+                            pptActWindow.View.Next();
+                        }
                     }
                     polling = 1;
                 }
-                else pptActWindow.View.Next();
+                else
+                {
+                    pptActWindow.View.Next();
+                }
             }
             catch
             {

README_EN.md

@@ -1,7 +1,4 @@
 <div align="center">
-
-We are sorry to inform you that the internationalization language of the program itself is not yet complete and has not been added to the program.  
-**We will complete it as soon as possible!**  
 
 **Copyright(©) 2023-2025 AlanCRL(Chen YunLam) Studio**  
 
@@ -15,7 +12,7 @@ The backup repository is located at [GitCode](https://gitcode.com/alan16356/Inke
 # 智绘教Inkeys
 [简体中文](README.md) | **English**  
 
-[Download from Github Release Assets](https://github.com/Alan-CRL/IDT/releases) | **[Official Website(Chinese)](https://www.inkeys.top)** | FAQ
+[Download from Github Release Assets](https://github.com/Alan-CRL/IDT/releases) | **[Official Website](https://en.inkeys.top)** | FAQ
 
 [![Communication Group](https://img.shields.io/badge/-QQ%20Group%20618720802-blue?style=flat&logo=TencentQQ)](https://qm.qq.com/cgi-bin/qm/qr?k=9V2l83dc0yP4UYeDF-NkTX0o7_TcYqlh&jump_from=webapi&authKey=LsLLUhb1KSzHYbc8k5nCQDqTtRcRUCEE3j+DdR9IgHaF/7JF7LLpY191hsiYEBz6)  ![GitHub issues](https://img.shields.io/github/issues/Alan-CRL/IDT?logo=github&color=green)  ![GitHub stars](https://img.shields.io/github/stars/Alan-CRL/IDT)
 

智绘教/IdtConfiguration.cpp

@@ -117,8 +117,8 @@ bool ReadSetting()
 				setlist.configurationSetting.enable = setlistVal["ConfigurationSetting"]["Enable"].asBool();
 		}
 
-		if (setlistVal.isMember("SelectLanguage") && setlistVal["SelectLanguage"].isBool())
-			setlist.selectLanguage = setlistVal["SelectLanguage"].asBool();
+		if (setlistVal.isMember("SelectLanguage") && setlistVal["SelectLanguage"].isInt())
+			setlist.selectLanguage = setlistVal["SelectLanguage"].asInt();
 		if (setlistVal.isMember("StartUp") && setlistVal["StartUp"].isBool())
 			setlist.startUp = setlistVal["StartUp"].asBool();
 		if (setlistVal.isMember("SettingGlobalScale") && setlistVal["SettingGlobalScale"].isDouble())
@@ -184,8 +184,8 @@ bool ReadSetting()
 			if (setlistVal["Performance"].isMember("PreparationQuantity") && setlistVal["Performance"]["PreparationQuantity"].isInt())
 				setlist.performanceSetting.preparationQuantity = setlistVal["Performance"]["PreparationQuantity"].asInt();
 
-			if (setlistVal["Performance"].isMember("SuperDrawBeta") && setlistVal["Performance"]["SuperDrawBeta"].isBool())
-				setlist.performanceSetting.superDraw = setlistVal["Performance"]["SuperDrawBeta"].asBool();
+			if (setlistVal["Performance"].isMember("SuperDrawBeta2") && setlistVal["Performance"]["SuperDrawBeta2"].isBool())
+				setlist.performanceSetting.superDraw = setlistVal["Performance"]["SuperDrawBeta2"].asBool();
 		}
 		if (setlistVal.isMember("Preset") && setlistVal["Preset"].isObject())
 		{
@@ -421,7 +421,7 @@ bool WriteSetting()
 		{
 			setlistVal["Performance"]["PreparationQuantity"] = Json::Value(setlist.performanceSetting.preparationQuantity);
 
-			setlistVal["Performance"]["SuperDrawBeta"] = Json::Value(setlist.performanceSetting.superDraw);
+			setlistVal["Performance"]["SuperDrawBeta2"] = Json::Value(setlist.performanceSetting.superDraw);
 		}
 		{
 			setlistVal["Preset"]["MemoryWidth"] = Json::Value(setlist.presetSetting.memoryWidth);

智绘教/IdtConfiguration.h

@@ -22,6 +22,9 @@ struct SetListStruct
 
 #pragma region 常规
 	int selectLanguage;
+	// en-US 0
+	// zh-CN 1
+	// zh-TW 2
 
 	bool startUp;
 

智绘教/IdtD2DPreparation.cpp

@@ -11,7 +11,7 @@ void D2DStarup()
 	// 创建 D2D 工厂
 	D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED, &D2DFactory);
 
-	// 创建 DC Render 并指定软件加速（因为比硬件加速快，不知道为啥）
+	// 创建 DC Render 并指定软件加速（因为比硬件加速快，不知道为啥，现在知道了qaq）
 	D2DProperty = D2D1::RenderTargetProperties(D2D1_RENDER_TARGET_TYPE::D2D1_RENDER_TARGET_TYPE_SOFTWARE,
 		D2D1::PixelFormat(
 			DXGI_FORMAT_B8G8R8A8_UNORM,