diff --git a/README.md b/README.md index 4e38d5b3..2a8aa877 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ allprojects { ## 加入依赖 ``` -implementation 'com.github.angcyo:CalendarView:3.7.1.33' +implementation 'com.github.angcyo:CalendarView:3.7.1.34' ``` ### `垂直滚动日历`使用方式 diff --git a/app/src/main/java/com/haibin/calendarviewproject/mark/MarkProperty.java b/app/src/main/java/com/haibin/calendarviewproject/mark/MarkProperty.java index 2a0edbae..4509df1b 100644 --- a/app/src/main/java/com/haibin/calendarviewproject/mark/MarkProperty.java +++ b/app/src/main/java/com/haibin/calendarviewproject/mark/MarkProperty.java @@ -89,7 +89,7 @@ public static int dpToPx(Context context, float dpValue) { boolean isInPriorityShowWeekMode(BaseView baseView, Calendar calendar) { long distance = CalendarUtil.distance(CalendarUtil.currentCalendar(), calendar); - return baseView.mDelegate.monthPriorityShowWeekMode && distance > 0 && + return baseView.mDelegate.monthPriorityShowWeekMode && distance >= 0 && distance < CalendarUtil.MONTH_PRIORITY_DAY; } diff --git a/calendarview/src/main/java/com/haibin/calendarview/CalendarUtil.java b/calendarview/src/main/java/com/haibin/calendarview/CalendarUtil.java index 286a07a6..83134c0e 100644 --- a/calendarview/src/main/java/com/haibin/calendarview/CalendarUtil.java +++ b/calendarview/src/main/java/com/haibin/calendarview/CalendarUtil.java @@ -911,7 +911,7 @@ public static boolean isCurrentMonth(int year, int month) { public static long distance(Calendar max, Calendar min) { long t1 = max.getTimeInMillis(); long t2 = min.getTimeInMillis(); - return (long) Math.floor((t1 - t2) * 1f / ONE_DAY); + return (long) Math.ceil((t1 - t2) * 1f / ONE_DAY); } /**