dp2px

JingMeng · Jul 2, 2020 · 643820d · 643820d
1 parent ec0656a
commit 643820d
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 12 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/app/src/main/java/com/necer/ncalendar/DensityUtil.java b/app/src/main/java/com/necer/ncalendar/DensityUtil.java
@@ -0,0 +1,16 @@
+package com.necer.ncalendar;
+
+import android.content.Context;
+import android.util.TypedValue;
+
+/**
+ * Created by necer on 2020/7/2.
+ */
+public class DensityUtil {
+
+    public static int dp2px(Context context, float dpVal) {
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                dpVal, context.getResources().getDisplayMetrics());
+    }
+
+}
diff --git a/app/src/main/java/com/necer/ncalendar/painter/LigaturePainter.java b/app/src/main/java/com/necer/ncalendar/painter/LigaturePainter.java
@@ -5,8 +5,10 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.RectF;
+import android.util.TypedValue;
 
 import com.necer.entity.CalendarDate;
+import com.necer.ncalendar.DensityUtil;
 import com.necer.painter.CalendarPainter;
 import com.necer.utils.CalendarUtil;
 import com.necer.view.CalendarView;
@@ -32,7 +34,7 @@ public LigaturePainter(Context context) {
         mTextPaint = getPaint();
         mBgPaint = getPaint();
 
-        //mCircleRadius = CalendarUtil.dp2px(context, 20);
+        mCircleRadius = DensityUtil.dp2px(context, 20);
         mBgPaint.setColor(Color.parseColor("#ff7575"));
     }
 
@@ -129,19 +131,20 @@ private void drawSelectBg(Canvas canvas, RectF rectF, LocalDate localDate, boole
 
     //绘制公历
     private void drawSolar(Canvas canvas, RectF rectF, LocalDate date, boolean isSelected, boolean isCurrectMonthOrWeek) {
-   //     mTextPaint.setTextSize(CalendarUtil.dp2px(mContext, 18));
+        mTextPaint.setTextSize(DensityUtil.dp2px(mContext, 16));
         mTextPaint.setColor(isSelected ? Color.WHITE : Color.BLACK);
         mTextPaint.setAlpha(isCurrectMonthOrWeek ? 255 : 100);
         canvas.drawText(date.getDayOfMonth() + "", rectF.centerX(), rectF.centerY(), mTextPaint);
     }
 
     //绘制农历
     private void drawLunar(Canvas canvas, RectF rectF, LocalDate date, boolean isSelected, boolean isCurrectMonthOrWeek) {
-       // mTextPaint.setTextSize(CalendarUtil.dp2px(mContext, 10));
+        mTextPaint.setTextSize(DensityUtil.dp2px(mContext, 10));
         CalendarDate calendarDate = CalendarUtil.getCalendarDate(date);
         mTextPaint.setColor(isSelected ? Color.WHITE : Color.GRAY);
         mTextPaint.setAlpha(isCurrectMonthOrWeek ? 255 : 100);
-    //    canvas.drawText(calendarDate.lunar.lunarOnDrawStr, rectF.centerX(), rectF.centerY() + CalendarUtil.dp2px(mContext, 12), mTextPaint);
+        canvas.drawText(calendarDate.lunar.lunarOnDrawStr, rectF.centerX(), rectF.centerY() + DensityUtil.dp2px(mContext, 12), mTextPaint);
     }
 
+
 }
diff --git a/app/src/main/java/com/necer/ncalendar/painter/StretchPainter.java b/app/src/main/java/com/necer/ncalendar/painter/StretchPainter.java
@@ -7,6 +7,7 @@
 import android.graphics.RectF;
 import android.text.TextUtils;
 
+import com.necer.ncalendar.DensityUtil;
 import com.necer.painter.CalendarPainter;
 import com.necer.utils.CalendarUtil;
 import com.necer.view.CalendarView;
@@ -24,7 +25,7 @@ public StretchPainter(Context context) {
         mBgPaint = getPaint();
         mTextPaint = getPaint();
         mBgPaint.setColor(Color.parseColor("#ff7575"));
-      //  mTextPaint.setTextSize(CalendarUtil.dp2px(context, 10));
+        mTextPaint.setTextSize(DensityUtil.dp2px(context, 10));
         mTextPaint.setColor(Color.parseColor("#000000"));
     }
 

diff --git a/app/src/main/java/com/necer/ncalendar/painter/TicketPainter.java b/app/src/main/java/com/necer/ncalendar/painter/TicketPainter.java
@@ -8,6 +8,7 @@
 import android.text.TextUtils;
 
 import com.necer.calendar.ICalendar;
+import com.necer.ncalendar.DensityUtil;
 import com.necer.painter.CalendarPainter;
 import com.necer.utils.CalendarUtil;
 import com.necer.view.CalendarView;
@@ -45,7 +46,7 @@ public TicketPainter(Context context, ICalendar iCalendar) {
         mBgPaint = getPaint();
 
         mBgPaint.setColor(Color.parseColor("#7D7DFF"));
-       // mCircleRadius = (int) CalendarUtil.dp2px(context, 20);
+        mCircleRadius = (int) DensityUtil.dp2px(context, 20);
 
         mPriceMap = new HashMap<>();
         mHolidayList = new ArrayList<>();
@@ -110,7 +111,7 @@ private void drawSelectBg(Canvas canvas, RectF rectF, boolean isisSelected, bool
 
     //绘制公历
     private void drawSolar(Canvas canvas, RectF rectF, LocalDate localDate, boolean isSelected, boolean isCurrectMonthOrWeek) {
-      //  mTextPaint.setTextSize(CalendarUtil.dp2px(mContext, 18));
+        mTextPaint.setTextSize(DensityUtil.dp2px(mContext, 16));
         mTextPaint.setColor(isSelected ? Color.WHITE : Color.BLACK);
         mTextPaint.setAlpha(isCurrectMonthOrWeek ? 255 : 100);
         canvas.drawText(localDate.getDayOfMonth() + "", rectF.centerX(), TextUtils.isEmpty(mPriceMap.get(localDate)) ? getBaseLineY(rectF) : rectF.centerY(), mTextPaint);
@@ -120,26 +121,26 @@ private void drawSolar(Canvas canvas, RectF rectF, LocalDate localDate, boolean
     private void drawPrice(Canvas canvas, RectF rectF, LocalDate localDate, boolean isSelected, boolean isCurrectMonthOrWeek) {
         String price = mPriceMap.get(localDate);
         if (!TextUtils.isEmpty(price)) {
-          //  mTextPaint.setTextSize(CalendarUtil.dp2px(mContext, 10));
+            mTextPaint.setTextSize(DensityUtil.dp2px(mContext, 10));
             mTextPaint.setColor(isSelected ? Color.WHITE : Color.RED);
             mTextPaint.setAlpha(isCurrectMonthOrWeek ? 255 : 100);
-         //   canvas.drawText(price, rectF.centerX(), rectF.centerY() + CalendarUtil.dp2px(mContext, 12), mTextPaint);
+            canvas.drawText(price, rectF.centerX(), rectF.centerY() + DensityUtil.dp2px(mContext, 12), mTextPaint);
         }
     }
 
 
     //绘制节假日
     private void drawHolidays(Canvas canvas, RectF rectF, LocalDate localDate, boolean isSelected, boolean isCurrectMonthOrWeek) {
-      //  mTextPaint.setTextSize(CalendarUtil.dp2px(mContext, 10));
+        mTextPaint.setTextSize(DensityUtil.dp2px(mContext, 10));
         if (mHolidayList.contains(localDate)) {
             mTextPaint.setColor(isSelected ? Color.WHITE : Color.GREEN);
             mTextPaint.setAlpha(isCurrectMonthOrWeek ? 255 : 100);
-         //   canvas.drawText("休", rectF.centerX() + CalendarUtil.dp2px(mContext, 10), rectF.centerY() - CalendarUtil.dp2px(mContext, 5), mTextPaint);
+            canvas.drawText("休", rectF.centerX() + DensityUtil.dp2px(mContext, 10), rectF.centerY() - DensityUtil.dp2px(mContext, 5), mTextPaint);
         }
         if (mWorkdayList.contains(localDate)) {
             mTextPaint.setColor(isSelected ? Color.WHITE : Color.RED);
             mTextPaint.setAlpha(isCurrectMonthOrWeek ? 255 : 100);
-          //  canvas.drawText("班", rectF.centerX() + CalendarUtil.dp2px(mContext, 10), rectF.centerY() - CalendarUtil.dp2px(mContext, 5), mTextPaint);
+            canvas.drawText("班", rectF.centerX() + DensityUtil.dp2px(mContext, 10), rectF.centerY() - DensityUtil.dp2px(mContext, 5), mTextPaint);
         }
     }