修改日历控件部分问题

student/src/main/java/com/cooleshow/student/widgets/SimpleMonthView.java

@@ -8,6 +8,7 @@ import android.graphics.RectF;
 import android.view.View;
 
 import com.cooleshow.base.utils.SizeUtils;
+import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.student.R;
 import com.haibin.calendarview.Calendar;
 import com.haibin.calendarview.MonthView;
@@ -137,7 +138,7 @@ public class SimpleMonthView extends MonthView {
                 canvas.drawText("有课", cx, y + mItemHeight - spaceMarginBottom, mSchemeTextPaint);
             }
         } else if (hasScheme) {//否则绘制具有标记的
-            canvas.drawText(calendar.isCurrentDay() ? "今" : String.valueOf(calendar.getDay()),
+            canvas.drawText(isToday(calendar) ? "今" : String.valueOf(calendar.getDay()),
                     cx,
                     baselineY,
                     getPaint(calendar));
@@ -145,12 +146,22 @@ public class SimpleMonthView extends MonthView {
             mSchemeTextPaint.setColor(schemeTextColor);
             canvas.drawText("有课", cx, y + mItemHeight - spaceMarginBottom, mSchemeTextPaint);
         } else {//最好绘制普通文本
-            canvas.drawText(calendar.isCurrentDay() ? "今" : String.valueOf(calendar.getDay()), cx, baselineY,
+            canvas.drawText(isToday(calendar) ? "今" : String.valueOf(calendar.getDay()), cx, baselineY,
                     getPaint(calendar));
         }
 
     }
 
+    private boolean isToday(Calendar calendar) {
+        try {
+            boolean today = TimeUtils.isToday(calendar.getTimeInMillis());
+            return today;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
     private Paint getPaint(Calendar calendar) {
         if (calendar.isCurrentDay()) {
             //当前日期

teacher/src/main/java/com/cooleshow/teacher/widgets/SimpleMonthView.java

@@ -9,6 +9,7 @@ import android.graphics.RectF;
 import android.view.View;
 
 import com.cooleshow.base.utils.SizeUtils;
+import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.teacher.R;
 import com.haibin.calendarview.Calendar;
 import com.haibin.calendarview.MonthView;
@@ -138,7 +139,7 @@ public class SimpleMonthView extends MonthView {
                 canvas.drawText("有课", cx, y + mItemHeight - spaceMarginBottom, mSchemeTextPaint);
             }
         } else if (hasScheme) {//否则绘制具有标记的
-            canvas.drawText(calendar.isCurrentDay() ? "今" : String.valueOf(calendar.getDay()),
+            canvas.drawText(isToday(calendar) ? "今" : String.valueOf(calendar.getDay()),
                     cx,
                     baselineY,
                     getPaint(calendar));
@@ -146,12 +147,22 @@ public class SimpleMonthView extends MonthView {
             mSchemeTextPaint.setColor(schemeTextColor);
             canvas.drawText("有课", cx, y + mItemHeight - spaceMarginBottom, mSchemeTextPaint);
         } else {//最好绘制普通文本
-            canvas.drawText(calendar.isCurrentDay() ? "今" : String.valueOf(calendar.getDay()), cx, baselineY,
+            canvas.drawText(isToday(calendar) ? "今" : String.valueOf(calendar.getDay()), cx, baselineY,
                     getPaint(calendar));
         }
 
     }
 
+    private boolean isToday(Calendar calendar) {
+        try {
+            boolean today = TimeUtils.isToday(calendar.getTimeInMillis());
+            return today;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
     private Paint getPaint(Calendar calendar) {
         if (calendar.isCurrentDay()) {
             //当前日期