修改部分参数注释

JingMeng · Mar 25, 2020 · e6e8b08 · e6e8b08
1 parent 20ffa9e
commit e6e8b08
Show file tree

Hide file tree

Showing 8 changed files with 408 additions and 121 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/ncalendar/src/main/java/com/necer/painter/CalendarPainter.java b/ncalendar/src/main/java/com/necer/painter/CalendarPainter.java
@@ -10,7 +10,8 @@
 import java.util.List;
 
 /**
- * Created by necer on 2019/1/3.
+ * @author necer
+ * @date 2019/1/3
  */
 public interface CalendarPainter {
 

diff --git a/ncalendar/src/main/java/com/necer/painter/InnerPainter.java b/ncalendar/src/main/java/com/necer/painter/InnerPainter.java
@@ -24,7 +24,9 @@
 import java.util.Map;
 
 /**
- * Created by necer on 2019/1/3.
+ *
+ * @author necer
+ * @date 2019/1/3
  */
 public class InnerPainter implements CalendarPainter {
 
@@ -182,12 +184,12 @@ private void drawSolar(Canvas canvas, RectF rectF, LocalDate date, int color, in
         mTextPaint.setColor(color);
         mTextPaint.setAlpha(alphaColor);
         mTextPaint.setTextSize(mAttrs.solarTextSize);
-        canvas.drawText(date.getDayOfMonth() + "", rectF.centerX(), mAttrs.isShowLunar ? rectF.centerY() : getTextBaseLineY(rectF.centerY()), mTextPaint);
+        canvas.drawText(date.getDayOfMonth() + "", rectF.centerX(), mAttrs.showLunar ? rectF.centerY() : getTextBaseLineY(rectF.centerY()), mTextPaint);
     }
 
     //绘制农历
     private void drawLunar(Canvas canvas, RectF rectF, LocalDate localDate, int color, int alphaColor) {
-        if (mAttrs.isShowLunar) {
+        if (mAttrs.showLunar) {
             CalendarDate calendarDate = CalendarUtil.getCalendarDate(localDate);
             //农历部分文字展示优先顺序 替换的文字、农历节日、节气、公历节日、正常农历日期
             String lunarString;
@@ -226,7 +228,7 @@ private void drawPoint(Canvas canvas, RectF rectF, LocalDate date, Drawable draw
 
     //绘制节假日
     private void drawHolidayWorkday(Canvas canvas, RectF rectF, LocalDate localDate, Drawable holidayDrawable, Drawable workdayDrawable, int holidayTextColor, int workdayTextColor, int alphaColor) {
-        if (mAttrs.isShowHoliday) {
+        if (mAttrs.showHoliday) {
             int[] holidayLocation = getHolidayLocation(rectF.centerX(), rectF.centerY());
             if (mHolidayList.contains(localDate)) {
                 if (holidayDrawable == null) {