v1.1.3.624 修复了问题

merept · Jun 24, 2023 · caac9f7 · caac9f7
1 parent af5caaf
commit caac9f7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -38,7 +38,9 @@ public partial class MainWindow : Window {
         public readonly string helpText = "欢迎来到SWPU平均学分绩点计算器!\n" +
             "\n" +
             $"版本 {Version} 更新 \n" +
-            "修复了备份历史纪录时弹出额外窗口的问题\n" +
+            "1.修复了在全部成绩页面计算时会出现报错的问题\n" +
+            "2.修复了点击计算后若出现报错，仍将保存历史记录，且错\n" +
+            "误的历史记录无法删除的问题\n" +
             "\n" +
             "请在输入框输入您每科的学分及期末成绩，\n" +
             "可直接将教务系统成绩页的全部内容粘贴进输入框，\n" +
@@ -312,24 +314,26 @@ private void ShowResult(string[] datas, int count) {
                 for (int i = 0; i < datas.Length - 1; i += count) {
                     if (IsNotCount(datas[i], datas[i + nameIndex])) 
                         continue;
-                    if (IsDeferredExam(datas[i + count], datas[i + gradeIndex])) {
-                        i++;
-                        continue;
+                    if (count != 7) {
+                        if (IsDeferredExam(datas[i + count], datas[i + gradeIndex])) {
+                            i++;
+                            continue;
+                        }
                     }
                     if (!Regex.IsMatch(datas[i], @"\d{10}"))
                         i++;
                     gpa.Add(datas[i + nameIndex], Convert.ToDouble(datas[i + pointIndex]), Convert.ToDouble(datas[i + gradeIndex]));
                 }
+                var history = new History(gpa);
+                if (!Histories.Contains(history))
+                    Histories.Add(history);
+                if (MessageBoxShow(gpa)) {
+                    new ResultWindowWithNames(Histories.Last().GradePointAverage, Histories, Histories.IndexOf(Histories.Last())).Show();
+                } else return;
             } catch (Exception ex) {
                 //Log.Log(ex, "计算结果时出错");
                 Message.ShowError(ex.Message, ex.GetType().Name);
             }
-            var history = new History(gpa);
-            if (!Histories.Contains(history))
-                Histories.Add(history);
-            if (MessageBoxShow(gpa)) {
-                new ResultWindowWithNames(Histories.Last().GradePointAverage, Histories, Histories.IndexOf(Histories.Last())).Show();
-            } else return;
         }
 
         /// <summary>
@@ -362,7 +366,7 @@ private void BeginCalculate_Click(object sender, EventArgs e) {
                     var listT = strs.ToList(); //Edge下每一行去掉\r\n后剩下的两个数据间隔是/u0020，会导致分割错误，转为List以便重组数组
                     count = 0;
                     for (int i = 0; i < listT.Count; i++) { //重组数组
-                        if (Regex.IsMatch(listT[i], @"\d{2}.\d\u0020\d{10}")) { 
+                        if (Regex.IsMatch(listT[i], @"\d+.\d\u0020\d{10}")) { 
                             var str = Regex.Split(listT[i], @"\u0020");
                             listT[i] = str[0];
                             listT.Insert(i + 1, str[1]);

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.2.403")]
-[assembly: AssemblyFileVersion("1.1.2.0")]
+[assembly: AssemblyVersion("1.1.3.624")]
+[assembly: AssemblyFileVersion("1.1.3.0")]
diff --git a/README.md b/README.md
@@ -12,9 +12,10 @@
 
 ### 更新
 
-- [2023.2.5 更新 v1.1.2.403](https://github.com/merept/GradePointAverageCalulatorForSWPU/releases/latest)
+- [2023.6.24 更新 v1.1.3.624](https://github.com/merept/GradePointAverageCalulatorForSWPU/releases/latest)
 
-> 修复了备份历史纪录时弹出额外窗口的问题
+> 1.修复了在全部成绩页面计算时会出现报错的问题
+> 2.修复了点击计算后若出现报错，仍将保存历史记录，且错误的历史记录无法删除的问题
 
 - [更多历史版本更新内容](https://github.com/merept/GradePointAverageCalulatorForSWPU/releases)
 

diff --git a/update.xml b/update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config>
-  <version>1.1.2.403</version>
-  <download>https://gitee.com/merept/GradePointAverageCalulatorForSWPU/releases/download/v1.1.2/GPAC_Setup_1.1.2.403.exe</download>
-  <updateinfo>修复了备份历史纪录时弹出额外窗口的问题</updateinfo>
+  <version>1.1.3.624</version>
+  <download>https://gitee.com/merept/GradePointAverageCalulatorForSWPU/releases/download/v1.1.3/GPAC_Setup_1.1.3.624.exe</download>
+  <updateinfo>1.修复了在全部成绩页面计算时会出现报错的问题\n2.修复了点击计算后若出现报错，仍将保存历史记录，且错误的历史记录无法删除的问题</updateinfo>
 </config>