Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Common/Data/QuestionHelper.cs

@@ -266,11 +266,27 @@ namespace Edu.Common.Data
                 {
                     model.QuestionTypeName = "多选题";
                 }
+                if (model.QuestionAnswer == "Ａ")
+                {
+                    model.QuestionAnswer = "A";
+                }
+                if (model.QuestionAnswer == "Ｂ")
+                {
+                    model.QuestionAnswer = "B";
+                }
+                if (model.QuestionAnswer == "Ｃ")
+                {
+                    model.QuestionAnswer = "C";
+                }
+                if (model.QuestionAnswer == "Ｄ")
+                {
+                    model.QuestionAnswer = "D";
+                }
                 int index = 0;
                 int chooseCount = 0;
                 foreach (var item in tempArray)
                 {
-                    string pattern = @"[ABCDEFGHI][.、]";
+                    string pattern = @"[ABCDEFGHIＡＢＣＤ][.、]";
                     var tempArray2 = Regex.Split(item, pattern);
                     if (tempArray2 != null && tempArray2.Length == 2)
                     {

Edu.Common/Plugin/StringHelper.cs

@@ -1411,7 +1411,12 @@ namespace Edu.Common.Plugin
         /// <returns></returns>
         public static bool IsUpperLetter(string str)
         {
-           return System.Text.RegularExpressions.Regex.IsMatch(str, @"^[A-Z]+$");
+            bool flag = System.Text.RegularExpressions.Regex.IsMatch(str, @"^[A-Z]+$");
+            if (!flag)
+            {
+                flag = (str.Contains("Ａ") || str.Contains("Ｂ") || str.Contains("Ｃ") || str.Contains("Ｄ"));
+            }
+            return flag;
         }
     }
 }

Edu.Common/Plugin/WordHelper.cs

@@ -69,7 +69,11 @@ namespace Edu.Common.Plugin
                     {
                         if (!string.IsNullOrEmpty(item))
                         {
-                            list.Add(AnalysisQuestionCategory(item, imageList, isBigType: true));
+                            var model = AnalysisQuestionCategory(item, imageList, isBigType: true);
+                            if (model != null && !string.IsNullOrEmpty(model.BigTitle))
+                            {
+                                list.Add(model);
+                            }
                         }
                     }
                 }