diff --git a/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java b/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java index c880069..0e3c04a 100644 --- a/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java @@ -93,7 +93,7 @@ public class DateFormatUtil { } break; case 2014: - if (year == yearCur) { + /* if (year == yearCur) { if (month == monthCur && weekInMonth == weekInMonthCur) { formatDate = getWeekDay(context, calendardate.get(7)); } else { @@ -101,10 +101,11 @@ public class DateFormatUtil { } } else { formatDate = formatDate(date, "yyyy/M/d"); - } + }*/ + formatDate = formatDate(date, "yyyy/M/d"); if (showTime) { - formatDate = formatDate + " " + getTimeString(dateMillis, context); + formatDate = formatDate ;//+ " " + getTimeString(dateMillis, context); } }