diff --git a/calendar/src/main/java/com/ldf/calendar/Utils.java b/calendar/src/main/java/com/ldf/calendar/Utils.java index 683b290..96156f2 100755 --- a/calendar/src/main/java/com/ldf/calendar/Utils.java +++ b/calendar/src/main/java/com/ldf/calendar/Utils.java @@ -84,7 +84,7 @@ public static int getFirstDayWeekPosition(int year, int month, CalendarAttr.Week Calendar cal = Calendar.getInstance(); cal.setTime(getDateFromString(year, month)); int week_index = cal.get(Calendar.DAY_OF_WEEK) - 1; - if (type == CalendarAttr.WeekArrayType.Sunday) { + if (type == CalendarAttr.WeekArrayType.Monday) { return week_index; } else { week_index = cal.get(Calendar.DAY_OF_WEEK) + 5; diff --git a/calendar/src/main/java/com/ldf/calendar/component/CalendarRenderer.java b/calendar/src/main/java/com/ldf/calendar/component/CalendarRenderer.java index 97a8928..6177e55 100644 --- a/calendar/src/main/java/com/ldf/calendar/component/CalendarRenderer.java +++ b/calendar/src/main/java/com/ldf/calendar/component/CalendarRenderer.java @@ -96,7 +96,7 @@ public void onClickDate(int col, int row) { */ public void updateWeek(int rowIndex) { CalendarDate currentWeekLastDay; - if (attr.getWeekArrayType() == CalendarAttr.WeekArrayType.Sunday) { + if (attr.getWeekArrayType() == CalendarAttr.WeekArrayType.Monday) { currentWeekLastDay = Utils.getSaturday(seedDate); } else { currentWeekLastDay = Utils.getSunday(seedDate); diff --git a/calendar/src/main/java/com/ldf/calendar/component/CalendarViewAdapter.java b/calendar/src/main/java/com/ldf/calendar/component/CalendarViewAdapter.java index dc9cf91..eb91a87 100755 --- a/calendar/src/main/java/com/ldf/calendar/component/CalendarViewAdapter.java +++ b/calendar/src/main/java/com/ldf/calendar/component/CalendarViewAdapter.java @@ -92,7 +92,7 @@ public Object instantiateItem(ViewGroup container, int position) { calendar.showDate(current); } else { CalendarDate current = seedDate.modifyWeek(position - MonthPager.CURRENT_DAY_INDEX); - if (weekArrayType == CalendarAttr.WeekArrayType.Sunday) { + if (weekArrayType == CalendarAttr.WeekArrayType.Monday) { calendar.showDate(Utils.getSaturday(current)); } else { calendar.showDate(Utils.getSunday(current)); @@ -208,7 +208,7 @@ public void switchToWeek(int rowIndex) { Calendar v2 = calendars.get((currentPosition - 1) % 3); v2.switchCalendarType(CalendarAttr.CalendarType.WEEK); CalendarDate last = seedDate.modifyWeek(-1); - if (weekArrayType == CalendarAttr.WeekArrayType.Sunday) { + if (weekArrayType == CalendarAttr.WeekArrayType.Monday) { v2.showDate(Utils.getSaturday(last)); } else { v2.showDate(Utils.getSunday(last)); @@ -218,7 +218,7 @@ public void switchToWeek(int rowIndex) { Calendar v3 = calendars.get((currentPosition + 1) % 3); v3.switchCalendarType(CalendarAttr.CalendarType.WEEK); CalendarDate next = seedDate.modifyWeek(1); - if (weekArrayType == CalendarAttr.WeekArrayType.Sunday) { + if (weekArrayType == CalendarAttr.WeekArrayType.Monday) { v3.showDate(Utils.getSaturday(next)); } else { v3.showDate(Utils.getSunday(next)); @@ -251,7 +251,7 @@ private void refreshCalendar() { Calendar v2 = calendars.get((currentPosition - 1) % 3); CalendarDate last = seedDate.modifyWeek(-1); - if (weekArrayType == CalendarAttr.WeekArrayType.Sunday) { + if (weekArrayType == CalendarAttr.WeekArrayType.Monday) { v2.showDate(Utils.getSaturday(last)); } else { v2.showDate(Utils.getSunday(last)); @@ -260,7 +260,7 @@ private void refreshCalendar() { Calendar v3 = calendars.get((currentPosition + 1) % 3); CalendarDate next = seedDate.modifyWeek(1); - if (weekArrayType == CalendarAttr.WeekArrayType.Sunday) { + if (weekArrayType == CalendarAttr.WeekArrayType.Monday) { v3.showDate(Utils.getSaturday(next)); } else { v3.showDate(Utils.getSunday(next)); diff --git a/example/src/main/java/com/hqyxjy/ldf/supercalendar/SyllabusActivity.java b/example/src/main/java/com/hqyxjy/ldf/supercalendar/SyllabusActivity.java index ca2ec5d..ea31956 100644 --- a/example/src/main/java/com/hqyxjy/ldf/supercalendar/SyllabusActivity.java +++ b/example/src/main/java/com/hqyxjy/ldf/supercalendar/SyllabusActivity.java @@ -12,7 +12,6 @@ import android.util.Log; import android.view.View; import android.widget.TextView; -import android.widget.Toast; import com.ldf.calendar.Utils; import com.ldf.calendar.component.CalendarAttr; @@ -183,8 +182,8 @@ public void onCalendarTypeChanged(CalendarAttr.CalendarType type) { */ private void initMarkData() { HashMap markData = new HashMap<>(); - markData.put("2017-8-9", "1"); - markData.put("2017-7-9", "0"); + markData.put("2018-3-3", "1"); + markData.put("2018-3-2", "0"); markData.put("2017-6-9", "1"); markData.put("2017-6-10", "0"); calendarAdapter.setMarkData(markData);