数字背景

SecretYi · Sep 3, 2019 · 34a4781 · 34a4781
1 parent 3f4e6b9
commit 34a4781
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 2 deletions.
diff --git a/app/src/main/java/com/necer/ncalendar/painter/LigaturePainter.java b/app/src/main/java/com/necer/ncalendar/painter/LigaturePainter.java
@@ -9,6 +9,7 @@
 import com.necer.entity.CalendarDate;
 import com.necer.painter.CalendarPainter;
 import com.necer.utils.CalendarUtil;
+import com.necer.view.CalendarView;
 
 import org.joda.time.LocalDate;
 
@@ -42,6 +43,11 @@ private Paint getPaint() {
         return paint;
     }
 
+    @Override
+    public void onDrawCalendarBackground(CalendarView calendarView, Canvas canvas, RectF rectF, LocalDate localDate, int totalDistance, int currentDistance) {
+
+    }
+
     @Override
     public void onDrawToday(Canvas canvas, RectF rectF, LocalDate localDate, List<LocalDate> selectedDateList) {
         drawSelectBg(canvas, rectF, localDate, true, selectedDateList);

diff --git a/app/src/main/java/com/necer/ncalendar/painter/StretchPainter.java b/app/src/main/java/com/necer/ncalendar/painter/StretchPainter.java
@@ -9,6 +9,7 @@
 
 import com.necer.painter.CalendarPainter;
 import com.necer.utils.CalendarUtil;
+import com.necer.view.CalendarView;
 
 import org.joda.time.LocalDate;
 
@@ -27,6 +28,11 @@ public StretchPainter(Context context) {
     }
 
 
+    @Override
+    public void onDrawCalendarBackground(CalendarView calendarView, Canvas canvas, RectF rectF, LocalDate localDate, int totalDistance, int currentDistance) {
+
+    }
+
     @Override
     public void onDrawToday(Canvas canvas, RectF rectF, LocalDate localDate, List<LocalDate> selectedDateList) {
         canvas.drawRect(rectF, mBgPaint);

diff --git a/app/src/main/java/com/necer/ncalendar/painter/TicketPainter.java b/app/src/main/java/com/necer/ncalendar/painter/TicketPainter.java
@@ -10,6 +10,7 @@
 import com.necer.calendar.ICalendar;
 import com.necer.painter.CalendarPainter;
 import com.necer.utils.CalendarUtil;
+import com.necer.view.CalendarView;
 
 import org.joda.time.LocalDate;
 
@@ -68,6 +69,11 @@ private Paint getPaint() {
     }
 
 
+    @Override
+    public void onDrawCalendarBackground(CalendarView calendarView, Canvas canvas, RectF rectF, LocalDate localDate, int totalDistance, int currentDistance) {
+
+    }
+
     @Override
     public void onDrawToday(Canvas canvas, RectF rectF, LocalDate localDate, List<LocalDate> selectedDateList) {
         drawSelectBg(canvas, rectF, selectedDateList.contains(localDate), true);

diff --git a/ncalendar/src/main/java/com/necer/calendar/BaseCalendar.java b/ncalendar/src/main/java/com/necer/calendar/BaseCalendar.java
@@ -389,13 +389,23 @@ public CalendarPainter getCalendarPainter() {
         return mCalendarPainter;
     }
 
+
+    @Override
+    public void updateSlideDistance(int currentDistance) {
+        CalendarView currectCalendarView = findViewWithTag(getCurrentItem());
+        if (currectCalendarView != null) {
+            currectCalendarView.updateSlideDistance(currentDistance);
+        }
+    }
+
     //月周切换时交换数据，保证月日历和周日历有相同的选中日期
     public void exchangeSelectDateList(List<LocalDate> dateList) {
         mAllSelectDateList.clear();
         mAllSelectDateList.addAll(dateList);
         notifyCalendar();
     }
 
+
     public void setOnMWDateChangeListener(OnMWDateChangeListener onMWDateChangeListener) {
         this.mOnMWDateChangeListener = onMWDateChangeListener;
     }

diff --git a/ncalendar/src/main/java/com/necer/calendar/ICalendar.java b/ncalendar/src/main/java/com/necer/calendar/ICalendar.java
@@ -91,4 +91,7 @@ public interface ICalendar {
     //获取当前页面的数据 如果是月周折叠日历 周状态下获取的是一周的数据，月状态下获取的一月的数据
     List<LocalDate> getCurrectDateList();
 
+
+    void updateSlideDistance(int currentDistance);
+
 }
diff --git a/ncalendar/src/main/java/com/necer/calendar/NCalendar.java b/ncalendar/src/main/java/com/necer/calendar/NCalendar.java
@@ -604,6 +604,12 @@ public void setOnCalendarMultipleChangedListener(OnCalendarMultipleChangedListen
         weekCalendar.setOnCalendarMultipleChangedListener(onCalendarMultipleChangedListener);
     }
 
+    @Override
+    public void updateSlideDistance(int currentDistance) {
+        monthCalendar.updateSlideDistance(currentDistance);
+        weekCalendar.updateSlideDistance(currentDistance);
+    }
+
     @Override
     public void setOnCalendarStateChangedListener(OnCalendarStateChangedListener onCalendarStateChangedListener) {
         this.onCalendarStateChangedListener = onCalendarStateChangedListener;
@@ -771,7 +777,7 @@ protected boolean isMonthCalendarWeekState() {
     //滑动中 包含跟随手势和自动滑动
     protected void scrolling(float dy) {
         setWeekVisible(dy > 0);
-
+        updateSlideDistance((int) childView.getY());
         if (onCalendarScrollingListener != null) {
             onCalendarScrollingListener.onCalendarScrolling(dy);
         }

diff --git a/ncalendar/src/main/java/com/necer/painter/CalendarPainter.java b/ncalendar/src/main/java/com/necer/painter/CalendarPainter.java
@@ -3,6 +3,9 @@
 import android.graphics.Canvas;
 import android.graphics.RectF;
 
+import com.necer.calendar.BaseCalendar;
+import com.necer.view.CalendarView;
+
 import org.joda.time.LocalDate;
 
 import java.util.List;
@@ -13,6 +16,8 @@
 public interface CalendarPainter {
 
 
+    void onDrawCalendarBackground(CalendarView calendarView, Canvas canvas, RectF rectF, LocalDate localDate, int totalDistance, int currentDistance);
+
     //绘制今天的日期
     void onDrawToday(Canvas canvas, RectF rectF, LocalDate localDate, List<LocalDate> selectedDateList);
 
@@ -26,4 +31,5 @@ public interface CalendarPainter {
     void onDrawDisableDate(Canvas canvas, RectF rectF, LocalDate localDate);
 
 
+
 }
diff --git a/ncalendar/src/main/java/com/necer/painter/InnerPainter.java b/ncalendar/src/main/java/com/necer/painter/InnerPainter.java
@@ -4,12 +4,16 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.RectF;
+import android.graphics.Typeface;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.necer.calendar.ICalendar;
 import com.necer.entity.CalendarDate;
 import com.necer.utils.Attrs;
 import com.necer.utils.CalendarUtil;
+import com.necer.view.CalendarView;
+import com.necer.view.MonthView;
 
 import org.joda.time.LocalDate;
 
@@ -26,6 +30,7 @@ public class InnerPainter implements CalendarPainter {
     private Attrs mAttrs;
     protected Paint mTextPaint;
     protected Paint mCirclePaint;
+    protected Paint mBgPaint;
 
     private int noAlphaColor = 255;
 
@@ -59,6 +64,11 @@ public InnerPainter(ICalendar calendar) {
         for (int i = 0; i < workdayList.size(); i++) {
             mWorkdayList.add(new LocalDate(workdayList.get(i)));
         }
+
+        mBgPaint = getPaint();
+        mBgPaint.setTextSize(100);
+        mBgPaint.setColor(Color.BLUE);
+        mBgPaint.setTypeface(Typeface.DEFAULT_BOLD);
     }
 
 
@@ -70,6 +80,22 @@ private Paint getPaint() {
     }
 
 
+    @Override
+    public void onDrawCalendarBackground(CalendarView calendarView, Canvas canvas, RectF rectF, LocalDate localDate, int totalDistance, int currentDistance) {
+        Log.e("aa", "InnerPainter:calendarView:" + calendarView);
+        Log.e("aa", "InnerPainter:localDate:" + localDate);
+        Log.e("aa", "InnerPainter:totalDistance:" + totalDistance);
+        Log.e("aa", "InnerPainter:currentDistance:" + currentDistance);
+        Log.e("aa", "InnerPainter:rectF:" + rectF.bottom);
+
+        if (calendarView instanceof MonthView) {
+           // canvas.drawRect(rectF,mBgPaint);
+            canvas.drawText(localDate.getMonthOfYear() + "", rectF.centerX(), getBaseLineY(rectF), mBgPaint);
+
+        }
+
+    }
+
     @Override
     public void onDrawToday(Canvas canvas, RectF rectF, LocalDate localDate, List<LocalDate> selectDateList) {
         if (selectDateList.contains(localDate)) {

diff --git a/ncalendar/src/main/java/com/necer/view/CalendarView.java b/ncalendar/src/main/java/com/necer/view/CalendarView.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.RectF;
+import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -27,12 +28,15 @@ public abstract class CalendarView extends View {
     private int mLineNum;//行数
     protected LocalDate mInitialDate;//当前页面的初始化日期
     protected List<RectF> mRectFList;//点击用的矩形集合
+    protected RectF mBgRectF;//日历背景集合
     protected List<LocalDate> mDateList;//页面的数据集合
     private List<LocalDate> mAllSelectListDate;//当前页面选中的日期
     protected BaseCalendar mCalendar;
     protected LocalDate mStartDate;
     protected LocalDate mEndDate;
 
+    private int mCurrentDistance;//折叠日历滑动当前的距离
+
     public CalendarView(Context context, ViewGroup container, LocalDate initialDate, List<LocalDate> dateList) {
         super(context);
         this.mInitialDate = initialDate;
@@ -49,12 +53,32 @@ public CalendarView(Context context, ViewGroup container, LocalDate initialDate,
         for (int i = 0; i < mDateList.size(); i++) {
             mRectFList.add(new RectF());
         }
+        mBgRectF = new RectF();
     }
 
 
     @Override
     protected void onDraw(Canvas canvas) {
 
+        CalendarPainter calendarPainter = mCalendar.getCalendarPainter();
+        //绘制背景
+        drawBg(canvas, calendarPainter);
+        //绘制日期
+        drawDate(canvas, calendarPainter);
+    }
+
+    //绘制背景
+    private void drawBg(Canvas canvas, CalendarPainter calendarPainter) {
+        mBgRectF.set(0f, 0f, getMeasuredWidth(), getMeasuredHeight());
+        Log.e("aa", "drawBg:::" + getMeasuredHeight());
+        calendarPainter.onDrawCalendarBackground(this, canvas, mBgRectF, getMiddleLocalDate(), getMeasuredHeight(), mCurrentDistance);
+
+    }
+
+
+    //绘制日期
+    private void drawDate(Canvas canvas, CalendarPainter calendarPainter) {
+
         for (int i = 0; i < mLineNum; i++) {
             for (int j = 0; j < 7; j++) {
                 RectF rectF = mRectFList.get(i * 7 + j);
@@ -75,7 +99,6 @@ protected void onDraw(Canvas canvas) {
                 }
 
                 //开始绘制
-                CalendarPainter calendarPainter = mCalendar.getCalendarPainter();
                 LocalDate localDate = mDateList.get(i * 7 + j);
                 //在可用区间内的正常绘制，
                 if (!(localDate.isBefore(mStartDate) || localDate.isAfter(mEndDate))) {
@@ -186,6 +209,11 @@ public List<LocalDate> getCurrentSelectDateList() {
         return currentSelectDateList;
     }
 
+    public void updateSlideDistance(int currentDistance) {
+        this.mCurrentDistance = currentDistance;
+        invalidate();
+    }
+
     //获取当前页面的日期
     public List<LocalDate> getCurrentDateList() {
         return mDateList;