From 3bb9c4760524d0aa4bb292dff3ecd30393655130 Mon Sep 17 00:00:00 2001 From: niusibao <827791796@qq.com> Date: Thu, 1 Mar 2018 14:28:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F=E4=B8=8E?= =?UTF-8?q?=E6=98=9F=E6=9C=9F=E5=AF=B9=E5=BA=94=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calendar/src/main/java/com/ldf/calendar/Utils.java | 2 +- .../java/com/ldf/calendar/component/CalendarAttr.java | 2 +- .../com/ldf/calendar/component/CalendarRenderer.java | 2 +- .../ldf/calendar/component/CalendarViewAdapter.java | 10 +++++----- .../com/hqyxjy/ldf/supercalendar/SyllabusActivity.java | 5 ++--- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/calendar/src/main/java/com/ldf/calendar/Utils.java b/calendar/src/main/java/com/ldf/calendar/Utils.java index 997b869..69d5e8c 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/CalendarAttr.java b/calendar/src/main/java/com/ldf/calendar/component/CalendarAttr.java index d0fcb46..35acbef 100644 --- a/calendar/src/main/java/com/ldf/calendar/component/CalendarAttr.java +++ b/calendar/src/main/java/com/ldf/calendar/component/CalendarAttr.java @@ -60,7 +60,7 @@ public void setCellWidth(int cellWidth) { } public enum WeekArrayType { - Sunday, Monday + Monday, Sunday } public enum CalendarType { 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 3b9fadc..6f52d02 100755 --- a/calendar/src/main/java/com/ldf/calendar/component/CalendarViewAdapter.java +++ b/calendar/src/main/java/com/ldf/calendar/component/CalendarViewAdapter.java @@ -86,7 +86,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)); @@ -197,7 +197,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)); @@ -207,7 +207,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)); @@ -240,7 +240,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)); @@ -249,7 +249,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 812aa32..b4fb02f 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; @@ -174,8 +173,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);