Merge pull request #18 from zfman/dev

v2.0.5完善课程过滤算法
zfman · Sep 3, 2018 · ed8324b · ed8324b
2 parents a21d2fd + fc87507
commit ed8324b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/AndroidTimetableView/.idea/caches/build_file_checksums.ser b/AndroidTimetableView/.idea/caches/build_file_checksums.ser
diff --git a/AndroidTimetableView/TimetableView/build.gradle b/AndroidTimetableView/TimetableView/build.gradle
@@ -55,7 +55,7 @@ publish {
     repoName='Maven'
     groupId = 'com.zhuangfei'//jcenter上的路径
     artifactId = 'TimetableView'//项目名称
-    publishVersion = '2.0.4'//版本号
+    publishVersion = '2.0.5'//版本号
     desc = 'A beautiful Android based curriculum schedule widget'//描述，不重要
     website = 'https://github.com/zfman/TimetableView'//网站，不重要；尽量模拟github上的地址，例如我这样的；当然你有地址最好了
 }
diff --git a/AndroidTimetableView/TimetableView/src/com/zhuangfei/timetable/model/ScheduleSupport.java b/AndroidTimetableView/TimetableView/src/com/zhuangfei/timetable/model/ScheduleSupport.java
@@ -320,24 +320,34 @@ public static boolean isThisWeek(Schedule subject, int cur_week) {
     public static List<Schedule> fliterSchedule(List<Schedule> data, int curWeek, boolean isShowNotCurWeek) {
         if (data == null) return new ArrayList<>();
         Set<Schedule> result = new HashSet<>();
-        if (data.size() >= 1) {
+
+        if(!isShowNotCurWeek){
+            List<Schedule> filter=new ArrayList<>();
+            for(int i=0;i<data.size();i++){
+                Schedule s=data.get(i);
+                if(ScheduleSupport.isThisWeek(s,curWeek)) filter.add(s);
+            }
+            data=filter;
+        }
+        if(data.size()>=1){
             result.add(data.get(0));
         }
         for (int i = 1; i < data.size(); i++) {
             Schedule s = data.get(i);
+            boolean is=true;
             for (int j = 0; j < i; j++) {
                 Schedule s2 = data.get(j);
-                if (s.getStart() <= (s2.getStart() + s2.getStep() - 1)) {
-                    if (!ScheduleSupport.isThisWeek(s2, curWeek)) {
-                        if (ScheduleSupport.isThisWeek(s, curWeek)) {
-                            result.remove(s2);
-                            result.add(s);
-                        }
+                if(s.getStart()>=s2.getStart()&&s.getStart()<=(s2.getStart()+s2.getStep()-1)){
+                    is=false;
+                    if(isThisWeek(s2,curWeek)){
+                        break;
+                    }else if(isThisWeek(s,curWeek)){
+                        result.remove(s2);
+                        result.add(s);
                     }
-                } else {
-                    result.add(s);
                 }
             }
+            if(is) result.add(s);
         }
         List<Schedule> list = new ArrayList<>(result);
         sortList(list);

diff --git a/AndroidTimetableView/TimetableView/src/com/zhuangfei/timetable/operater/SimpleOperater.java b/AndroidTimetableView/TimetableView/src/com/zhuangfei/timetable/operater/SimpleOperater.java
@@ -231,9 +231,11 @@ private void addToLayout(LinearLayout layout, final List<Schedule> data, int cur
         layout.removeAllViews();
 
         //遍历
-        Schedule pre = data.get(0);
         List<Schedule> filter = ScheduleSupport.fliterSchedule(data, curWeek,mView.isShowNotCurWeek());
-        layout.setTag(filter.size());
+        Schedule pre=null;
+        if(filter.size()>0){
+            pre = filter.get(0);
+        }
         for (int i = 0; i < filter.size(); i++) {
             final Schedule subject = filter.get(i);
             View view = newItemView(data,filter, subject, pre, i, curWeek);
@@ -358,6 +360,7 @@ public void showView() {
             initPanel();
         }
 
+        mView.hideFlaglayout();
         LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(mView.monthWidth(), LinearLayout.LayoutParams.MATCH_PARENT);
         weekPanel.setLayoutParams(lp);
         flagLayout.setBackgroundColor(mView.flagBgcolor());

diff --git a/AndroidTimetableView/app/release/app-release.apk b/AndroidTimetableView/app/release/app-release.apk