Skip to content

修改日期与星期对应错误 #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
niusibao wants to merge 2 commits into
base: master
Choose a base branch
from
Open

修改日期与星期对应错误 #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bb9c47
修改日期与星期对应错误
Mar 1, 2018
b0234fa
Merge branch 'master' into master
niusibao May 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion calendar/src/main/java/com/ldf/calendar/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion calendar/src/main/java/com/ldf/calendar/component/CalendarRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions calendar/src/main/java/com/ldf/calendar/component/CalendarViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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));
Expand All @@ -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));
Expand Down Expand Up @@ -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));
Expand All @@ -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));
Expand Down
5 changes: 2 additions & 3 deletions example/src/main/java/com/hqyxjy/ldf/supercalendar/SyllabusActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -183,8 +182,8 @@ public void onCalendarTypeChanged(CalendarAttr.CalendarType type) {
*/
private void initMarkData() {
HashMap<String, String> 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);
Expand Down