From 505126ae2aa320ff08062efddc3cb118c65dc1a9 Mon Sep 17 00:00:00 2001
From: Jacknic <jacknic@qq.com>
Date: Thu, 16 May 2019 19:13:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E4=B8=93?=
 =?UTF-8?q?=E4=B8=9A=E8=AF=BE=E7=A8=8B=E8=AF=BB=E5=8F=96=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  1 +
 .../com/jacknic/glut/model/CourseModel.java   | 57 ++++++++++---------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6d57d20..ab67b7a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,6 +16,7 @@ android {
         ndk {
 //            abiFilters 'armeabi-v7a'
         }
+        setProperty("archivesBaseName", "$applicationId-v$versionName")
     }
     packagingOptions {
         exclude 'project.properties'
diff --git a/app/src/main/java/com/jacknic/glut/model/CourseModel.java b/app/src/main/java/com/jacknic/glut/model/CourseModel.java
index a934dc6..74d2720 100644
--- a/app/src/main/java/com/jacknic/glut/model/CourseModel.java
+++ b/app/src/main/java/com/jacknic/glut/model/CourseModel.java
@@ -15,10 +15,8 @@
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Scanner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -30,6 +28,7 @@ public class CourseModel {
     private Document document;
     private ArrayList<CourseInfoEntity> courseInfoList = new ArrayList<>();
     private boolean read = false;//表示是否已解析过DOM
+    private final Pattern patternWeek = Pattern.compile("(\\d+)(-)?(\\d+)?(\\D)?");
 
     public CourseModel(String dom) {
         document = Jsoup.parse(dom);
@@ -81,7 +80,7 @@ public ArrayList<CourseEntity> getCourses() {
                 course.setCourseName(name);
                 courseList.add(course);
             } else {
-            /*有教学时间地点的情况*/
+                /*有教学时间地点的情况*/
                 for (Element tr : info) {
                     course = new CourseEntity();
                     course.setSchoolStartYear(year);
@@ -91,35 +90,39 @@ public ArrayList<CourseEntity> getCourses() {
                     String week = tr.child(0).text();
                     course.setWeek(week);
                     String dayOfWeek = tr.child(1).text();
-                    switch (dayOfWeek.charAt(dayOfWeek.length() - 1)) {
-                        case '一':
-                            dayOf = 1;
-                            break;
-                        case '二':
-                            dayOf = 2;
-                            break;
-                        case '三':
-                            dayOf = 3;
-                            break;
-                        case '四':
-                            dayOf = 4;
-                            break;
-                        case '五':
-                            dayOf = 5;
-                            break;
-                        case '六':
-                            dayOf = 6;
-                            break;
-                        case '日':
-                            dayOf = 7;
-                            break;
+                    if (!TextUtils.isEmpty(dayOfWeek)) {
+                        switch (dayOfWeek.charAt(dayOfWeek.length() - 1)) {
+                            case '一':
+                                dayOf = 1;
+                                break;
+                            case '二':
+                                dayOf = 2;
+                                break;
+                            case '三':
+                                dayOf = 3;
+                                break;
+                            case '四':
+                                dayOf = 4;
+                                break;
+                            case '五':
+                                dayOf = 5;
+                                break;
+                            case '六':
+                                dayOf = 6;
+                                break;
+                            case '日':
+                                dayOf = 7;
+                                break;
+                            default:
+                                dayOf = -1;
+                        }
+
                     }
                     course.setDayOfWeek(dayOf);
-                    Pattern p = Pattern.compile("(\\d+)(-)?(\\d+)?(\\D)?");
                     String[] week_details = week.split(",");
                     StringBuilder smp = new StringBuilder(" ");
                     for (String week_detail : week_details) {
-                        Matcher m = p.matcher(week_detail);
+                        Matcher m = patternWeek.matcher(week_detail);
                         if (m.find()) {
                             String start = m.group(1);
                             System.out.println("开始周：" + start);