调整自定义Painter

JingMeng · Jul 5, 2019 · cd965f1 · cd965f1
1 parent 309f1d2
commit cd965f1
Show file tree

Hide file tree

Showing 13 changed files with 195 additions and 250 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/month.png b/app/month.png
diff --git a/app/src/main/java/com/necer/ncalendar/CustomPainter.java b/app/src/main/java/com/necer/ncalendar/CustomPainter.java
@@ -10,6 +10,10 @@
 import com.necer.painter.CalendarPainter;
 import com.necer.utils.Util;
 
+import org.joda.time.LocalDate;
+
+import java.util.List;
+
 /**
  * Created by necer on 2019/1/3.
  */
@@ -27,58 +31,78 @@ public CustomPainter(Context context) {
     }
 
 
-    @Override
-    public void onDrawToday(Canvas canvas, Rect rect, NDate nDate,boolean is) {
+//    @Override
+//    public void onDrawToday(Canvas canvas, Rect rect, NDate nDate,boolean is) {
+//
+//        if (false) {
+//            paint.setColor(Color.RED);
+//            canvas.drawRect(getNewRect(context,rect), paint);
+//            paint.setColor(Color.WHITE);
+//        } else {
+//            paint.setColor(Color.LTGRAY);
+//            canvas.drawRect(getNewRect(context,rect), paint);
+//            paint.setColor(Color.GREEN);
+//        }
+//        canvas.drawText(nDate.localDate.getDayOfMonth() + "", rect.centerX(), getBaseLineY(rect), paint);
+//
+//
+//    }
+//
+//    @Override
+//    public void onDrawDisableDate(Canvas canvas, Rect rect, NDate nDate) {
+//
+//    }
+//
+//    @Override
+//    public void onDrawCurrentMonthOrWeek(Canvas canvas, Rect rect, NDate nDate, boolean isSelect) {
+//        if (isSelect) {
+//            paint.setColor(Color.BLACK);
+//            canvas.drawRect(getNewRect(context,rect), paint);
+//            paint.setColor(Color.WHITE);
+//        } else {
+//            paint.setColor(Color.BLACK);
+//        }
+//        canvas.drawText(nDate.localDate.getDayOfMonth() + "", rect.centerX(), getBaseLineY(rect), paint);
+//
+//    }
+//
+//    @Override
+//    public void onDrawNotCurrentMonth(Canvas canvas, Rect rect, NDate nDate,boolean isSelect) {
+//        paint.setColor(Color.LTGRAY);
+//        canvas.drawText(nDate.localDate.getDayOfMonth() + "", rect.centerX(), getBaseLineY(rect), paint);
+//    }
 
-        if (false) {
-            paint.setColor(Color.RED);
-            canvas.drawRect(getNewRect(context,rect), paint);
-            paint.setColor(Color.WHITE);
-        } else {
-            paint.setColor(Color.LTGRAY);
-            canvas.drawRect(getNewRect(context,rect), paint);
-            paint.setColor(Color.GREEN);
-        }
-        canvas.drawText(nDate.localDate.getDayOfMonth() + "", rect.centerX(), getBaseLineY(rect), paint);
 
+    private int getBaseLineY(Rect rect) {
+        Paint.FontMetrics fontMetrics = paint.getFontMetrics();
+        float top = fontMetrics.top;
+        float bottom = fontMetrics.bottom;
+        int baseLineY = (int) (rect.centerY() - top / 2 - bottom / 2);
+        return baseLineY;
+    }
 
+    private Rect getNewRect(Context context,Rect rect) {
+        int rectDistance = (int) Util.dp2px(context, 20);
+        return new Rect(rect.centerX() - rectDistance, rect.centerY() - rectDistance, rect.centerX() + rectDistance, rect.centerY() + rectDistance);
     }
 
     @Override
-    public void onDrawDisableDate(Canvas canvas, Rect rect, NDate nDate) {
+    public void onDrawToday(Canvas canvas, Rect rect, LocalDate localDate, List<LocalDate> selectedDateList) {
 
     }
 
     @Override
-    public void onDrawCurrentMonthOrWeek(Canvas canvas, Rect rect, NDate nDate, boolean isSelect) {
-        if (isSelect) {
-            paint.setColor(Color.BLACK);
-            canvas.drawRect(getNewRect(context,rect), paint);
-            paint.setColor(Color.WHITE);
-        } else {
-            paint.setColor(Color.BLACK);
-        }
-        canvas.drawText(nDate.localDate.getDayOfMonth() + "", rect.centerX(), getBaseLineY(rect), paint);
+    public void onDrawCurrentMonthOrWeek(Canvas canvas, Rect rect, LocalDate localDate, List<LocalDate> selectedDateList) {
 
     }
 
     @Override
-    public void onDrawNotCurrentMonth(Canvas canvas, Rect rect, NDate nDate,boolean isSelect) {
-        paint.setColor(Color.LTGRAY);
-        canvas.drawText(nDate.localDate.getDayOfMonth() + "", rect.centerX(), getBaseLineY(rect), paint);
-    }
-
+    public void onDrawLastOrNextMonth(Canvas canvas, Rect rect, LocalDate localDate, List<LocalDate> selectedDateList) {
 
-    private int getBaseLineY(Rect rect) {
-        Paint.FontMetrics fontMetrics = paint.getFontMetrics();
-        float top = fontMetrics.top;
-        float bottom = fontMetrics.bottom;
-        int baseLineY = (int) (rect.centerY() - top / 2 - bottom / 2);
-        return baseLineY;
     }
 
-    private Rect getNewRect(Context context,Rect rect) {
-        int rectDistance = (int) Util.dp2px(context, 20);
-        return new Rect(rect.centerX() - rectDistance, rect.centerY() - rectDistance, rect.centerX() + rectDistance, rect.centerY() + rectDistance);
+    @Override
+    public void onDrawDisableDate(Canvas canvas, Rect rect, LocalDate localDate) {
+
     }
 }
diff --git a/app/src/main/java/com/necer/ncalendar/activity/TestMiui10Activity.java b/app/src/main/java/com/necer/ncalendar/activity/TestMiui10Activity.java
@@ -75,9 +75,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         innerPainter.setReplaceLunarStrMap(strMap);
 
         Map<String, Integer> colorMap = new HashMap<>();
-        colorMap.put("2019-01-25", Color.RED);
+        colorMap.put("2019-07-25", Color.RED);
 
-        colorMap.put("2019-01-24", Color.parseColor("#000000"));
+        colorMap.put("2019-07-5", Color.parseColor("#000000"));
         innerPainter.setReplaceLunarColorMap(colorMap);
 
 

diff --git a/app/week.png b/app/week.png
diff --git a/ncalendar/build.gradle b/ncalendar/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-
 apply plugin: 'com.novoda.bintray-release'
 
 
@@ -10,27 +9,11 @@ android {
         targetSdkVersion 27
         versionCode 1
         versionName "4.0.4"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
     implementation 'com.android.support:appcompat-v7:27.1.1'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     api 'joda-time:joda-time:2.10.1'
 }
 

diff --git a/ncalendar/src/androidTest/java/com/necer/ExampleInstrumentedTest.java b/ncalendar/src/androidTest/java/com/necer/ExampleInstrumentedTest.java
diff --git a/ncalendar/src/main/java/com/necer/adapter/WeekCalendarAdapter.java b/ncalendar/src/main/java/com/necer/adapter/WeekCalendarAdapter.java
@@ -1,14 +1,10 @@
 package com.necer.adapter;
-
 import android.content.Context;
 import android.view.ViewGroup;
-
 import com.necer.utils.Util;
 import com.necer.view.CalendarView;
 import com.necer.view.WeekView;
-
 import org.joda.time.LocalDate;
-
 import java.util.List;
 
 /**

diff --git a/ncalendar/src/main/java/com/necer/painter/CalendarPainter.java b/ncalendar/src/main/java/com/necer/painter/CalendarPainter.java
@@ -17,16 +17,16 @@ public interface CalendarPainter {
 
 
     //绘制今天的日期
-    void onDrawToday(Canvas canvas, Rect rect, NDate nDate, boolean isSelect);
+    void onDrawToday(Canvas canvas, Rect rect, LocalDate localDate, List<LocalDate> selectedDateList);
 
     //绘制当前月或周的日期
-    void onDrawCurrentMonthOrWeek(Canvas canvas, Rect rect, NDate nDate, boolean isSelect);
+    void onDrawCurrentMonthOrWeek(Canvas canvas, Rect rect, LocalDate localDate, List<LocalDate> selectedDateList);
 
     //绘制上一月，下一月的日期，周日历不须实现
-    void onDrawNotCurrentMonth(Canvas canvas, Rect rect, NDate nDate, boolean isSelect);
+    void onDrawLastOrNextMonth(Canvas canvas, Rect rect, LocalDate localDate, List<LocalDate> selectedDateList);
 
     //绘制不可用的日期，和方法setDateInterval(startFormatDate, endFormatDate)对应
-    void onDrawDisableDate(Canvas canvas, Rect rect, NDate nDate);
+    void onDrawDisableDate(Canvas canvas, Rect rect, LocalDate localDate);
 
 
 }