适配器功能开发完成

SecretYi · Nov 8, 2019 · 2100b25 · 2100b25
1 parent 19c9738
commit 2100b25
Show file tree

Hide file tree

Showing 21 changed files with 479 additions and 313 deletions.
diff --git a/app/src/main/java/com/necer/ncalendar/TestAdapterCalendarActivity.java b/app/src/main/java/com/necer/ncalendar/TestAdapterCalendarActivity.java
@@ -3,14 +3,17 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
 import com.necer.calendar.Miui10Calendar;
 import com.necer.calendar.MonthCalendar;
 import com.necer.calendar.WeekCalendar;
+import com.necer.enumeration.CalendarType;
 import com.necer.painter.CalendarAdapter;
+import com.necer.view.ICalendarView;
 
 import org.joda.time.LocalDate;
 
@@ -30,10 +33,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 //        MonthCalendar monthCalendar = findViewById(R.id.monthCalendar);
 //        monthCalendar.setCalendarAdapter(new TestAdapter());
 
-      //  WeekCalendar weekCalendar = findViewById(R.id.weekCalendar);
+        //  WeekCalendar weekCalendar = findViewById(R.id.weekCalendar);
 
-     //
-      //  weekCalendar.setCalendarAdapter(new TestAdapter());
+        //
+        //  weekCalendar.setCalendarAdapter(new TestAdapter());
 
 
         Miui10Calendar miui10Calendar = findViewById(R.id.miui10Calendar);
@@ -62,7 +65,7 @@ public void onBindToadyView(View view, LocalDate localDate, List<LocalDate> sele
         public void onBindCurrentMonthOrWeekView(View view, LocalDate localDate, List<LocalDate> selectedDateList) {
             TextView tv_item = view.findViewById(R.id.tv_item);
             tv_item.setText(String.valueOf(localDate.getDayOfMonth()));
-            tv_item.setBackgroundColor(selectedDateList.contains(localDate) ? Color.RED : Color.WHITE);
+            tv_item.setBackgroundColor(selectedDateList.contains(localDate) ? Color.RED : Color.TRANSPARENT);
         }
 
         @Override
@@ -75,22 +78,40 @@ public void onBindLastOrNextMonthView(View view, LocalDate localDate, List<Local
         @Override
         public void onBindDisableDateView(View view, LocalDate localDate) {
 
+
         }
 
-//        @Override
-//        public void onBindToadyView(View view, LocalDate localDate, boolean isCheck) {
-//            TextView textView = view.findViewById(R.id.tv_item);
-//            textView.setText(localDate.getDayOfMonth()+"");
-//            view.setBackgroundColor(isCheck ? Color.parseColor("#ff00ff") : Color.parseColor("#ffffff"));
-//
-//        }
-//
-//        @Override
-//        public void onBindCurrentMonthOrWeekView(View view, LocalDate localDate, boolean isCheck) {
-//            TextView textView = view.findViewById(R.id.tv_item);
-//            textView.setText(localDate.getDayOfMonth()+"");
-//            view.setBackgroundColor(isCheck ? Color.parseColor("#ff00ff") : Color.parseColor("#ffffff"));
-//
-//        }
+
+        @Override
+        public View getCalendarBackgroundView(Context context) {
+            //return super.getCalendarBackgroundView(context);
+
+            View view = LayoutInflater.from(context).inflate(R.layout.bg_calendar, null);
+            return view;
+        }
+
+        @Override
+        public void onBindCalendarBackgroundView(ICalendarView iCalendarView, View calendarBackgroundView, LocalDate localDate, int totalDistance, int currentDistance) {
+            super.onBindCalendarBackgroundView(iCalendarView, calendarBackgroundView, localDate, totalDistance, currentDistance);
+
+
+            if (iCalendarView.getCalendarType() == CalendarType.MONTH) {
+                TextView tv_bg = calendarBackgroundView.findViewById(R.id.tv_bg);
+                // int alphaColor = mAttrs.numberBackgroundAlphaColor * currentDistance / totalDistance;
+                if (totalDistance != 0) {
+
+                    float i = (float)currentDistance / (float)totalDistance;
+
+
+                    Log.e("currentDistance", "currentDistance:::" + i);
+
+                    tv_bg.setAlpha(i);
+                    tv_bg.setText(String.valueOf(localDate.getMonthOfYear()));
+
+                }
+
+            }
+
+        }
     }
 }
diff --git a/app/src/main/java/com/necer/ncalendar/painter/LigaturePainter.java b/app/src/main/java/com/necer/ncalendar/painter/LigaturePainter.java
@@ -10,6 +10,7 @@
 import com.necer.painter.CalendarPainter;
 import com.necer.utils.CalendarUtil;
 import com.necer.view.CalendarView;
+import com.necer.view.ICalendarView;
 
 import org.joda.time.LocalDate;
 
@@ -44,7 +45,7 @@ private Paint getPaint() {
     }
 
     @Override
-    public void onDrawCalendarBackground(CalendarView calendarView, Canvas canvas, RectF rectF, LocalDate localDate, int totalDistance, int currentDistance) {
+    public void onDrawCalendarBackground(ICalendarView calendarView, Canvas canvas, RectF rectF, LocalDate localDate, int totalDistance, int currentDistance) {
 
     }
 

diff --git a/app/src/main/java/com/necer/ncalendar/painter/StretchPainter.java b/app/src/main/java/com/necer/ncalendar/painter/StretchPainter.java
@@ -10,6 +10,7 @@
 import com.necer.painter.CalendarPainter;
 import com.necer.utils.CalendarUtil;
 import com.necer.view.CalendarView;
+import com.necer.view.ICalendarView;
 
 import org.joda.time.LocalDate;
 
@@ -29,7 +30,7 @@ public StretchPainter(Context context) {
 
 
     @Override
-    public void onDrawCalendarBackground(CalendarView calendarView, Canvas canvas, RectF rectF, LocalDate localDate, int totalDistance, int currentDistance) {
+    public void onDrawCalendarBackground(ICalendarView calendarView, Canvas canvas, RectF rectF, LocalDate localDate, int totalDistance, int currentDistance) {
 
     }
 

diff --git a/app/src/main/java/com/necer/ncalendar/painter/TicketPainter.java b/app/src/main/java/com/necer/ncalendar/painter/TicketPainter.java
@@ -11,6 +11,7 @@
 import com.necer.painter.CalendarPainter;
 import com.necer.utils.CalendarUtil;
 import com.necer.view.CalendarView;
+import com.necer.view.ICalendarView;
 
 import org.joda.time.LocalDate;
 
@@ -70,7 +71,7 @@ private Paint getPaint() {
 
 
     @Override
-    public void onDrawCalendarBackground(CalendarView calendarView, Canvas canvas, RectF rectF, LocalDate localDate, int totalDistance, int currentDistance) {
+    public void onDrawCalendarBackground(ICalendarView calendarView, Canvas canvas, RectF rectF, LocalDate localDate, int totalDistance, int currentDistance) {
 
     }
 

diff --git a/app/src/main/res/layout/activity_month_adapter.xml b/app/src/main/res/layout/activity_month_adapter.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -8,7 +9,12 @@
     <com.necer.calendar.Miui10Calendar
         android:id="@+id/miui10Calendar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:defaultCalendar="week"
+        app:isShowNumberBackground="true"
+        app:numberBackgroundAlphaColor="100"
+        app:numberBackgroundTextSize="250sp"
+        app:numberBackgroundTextColor="#398FE9">
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/bg_calendar.xml b/app/src/main/res/layout/bg_calendar.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/tv_bg"
+        android:layout_width="wrap_content"
+        android:textSize="50dp"
+        android:textStyle="bold"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
diff --git a/ncalendar/src/main/java/com/necer/adapter/BasePagerAdapter.java b/ncalendar/src/main/java/com/necer/adapter/BasePagerAdapter.java
@@ -4,14 +4,14 @@
 
 import androidx.viewpager.widget.PagerAdapter;
 
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.necer.calendar.BaseCalendar;
 import com.necer.enumeration.CalendarBuild;
-import com.necer.utils.Attrs;
+import com.necer.enumeration.CalendarType;
 import com.necer.view.CalendarView;
+import com.necer.view.CalendarView2;
 import com.necer.view.ICalendarView;
 
 import org.joda.time.LocalDate;
@@ -57,14 +57,31 @@ public void destroyItem(ViewGroup container, int position, Object object) {
 
     @Override
     public Object instantiateItem(ViewGroup container, int position) {
-        ICalendarView iCalendarView = getCalendarView(container, position);
+        ICalendarView iCalendarView;
+        LocalDate pageInitializeDate = getPageInitializeDate(position);
+        if (mCalendar.getCalendarBuild() == CalendarBuild.DRAW) {
+            iCalendarView = new CalendarView(mContext, mCalendar, pageInitializeDate, getCalendarType());
+        } else {
+            iCalendarView = new CalendarView2(mContext, mCalendar, pageInitializeDate, getCalendarType());
+        }
         ((View) iCalendarView).setTag(position);
         container.addView((View) iCalendarView);
         return iCalendarView;
     }
 
-    protected abstract ICalendarView getCalendarView(ViewGroup container, int position);
-
+    /**
+     * 每个页面的初始化日期
+     *
+     * @return
+     */
+    protected abstract LocalDate getPageInitializeDate(int position);
+
+    /**
+     * 获取是周日历还是月日历
+     *
+     * @return
+     */
+    protected abstract CalendarType getCalendarType();
 
 
 }

diff --git a/ncalendar/src/main/java/com/necer/adapter/MonthPagerAdapter.java b/ncalendar/src/main/java/com/necer/adapter/MonthPagerAdapter.java
@@ -1,15 +1,9 @@
 package com.necer.adapter;
 
 import android.content.Context;
-import android.view.ViewGroup;
 
 import com.necer.calendar.BaseCalendar;
-import com.necer.enumeration.CalendarBuild;
 import com.necer.enumeration.CalendarType;
-import com.necer.helper.CalendarHelper;
-import com.necer.view.CalendarView;
-import com.necer.view.CalendarView2;
-import com.necer.view.ICalendarView;
 
 import org.joda.time.LocalDate;
 
@@ -24,24 +18,13 @@ public MonthPagerAdapter(Context context, BaseCalendar baseCalendar) {
     }
 
     @Override
-    protected ICalendarView getCalendarView(ViewGroup container, int position) {
+    protected LocalDate getPageInitializeDate(int position) {
         LocalDate localDate = mInitializeDate.plusMonths(position - mPageCurrIndex);
+        return localDate;
+    }
 
-        // return new MonthView(mContext, container, localDate, dateList);
-
-
-        //Log.e("CalendarBuild::", "CalendarBuild:222::" + calendarBuild);
-       // Log.e("CalendarBuild::", "CalendarBuild:333::" + mCalendarBuild);
-
-        if (mCalendar.getCalendarBuild() == CalendarBuild.DRAW) {
-            // return new MonthView(mContext, container, localDate, dateList);
-
-            // return new CalendarView(mContext, container, localDate, dateList, CalendarType.MONTH);
-            return new CalendarView(mContext, new CalendarHelper((BaseCalendar) container, localDate, CalendarType.MONTH));
-        } else {
-            // return new MonthView2(mContext, container, localDate, dateList);
-            return new CalendarView2(mContext, new CalendarHelper((BaseCalendar) container, localDate, CalendarType.MONTH));
-        }
-        // return new MonthView2(mContext, container, localDate, dateList);
+    @Override
+    protected CalendarType getCalendarType() {
+        return CalendarType.MONTH;
     }
 }
diff --git a/ncalendar/src/main/java/com/necer/adapter/WeekPagerAdapter.java b/ncalendar/src/main/java/com/necer/adapter/WeekPagerAdapter.java
@@ -1,15 +1,9 @@
 package com.necer.adapter;
 
 import android.content.Context;
-import android.view.ViewGroup;
 
 import com.necer.calendar.BaseCalendar;
-import com.necer.enumeration.CalendarBuild;
 import com.necer.enumeration.CalendarType;
-import com.necer.helper.CalendarHelper;
-import com.necer.view.CalendarView;
-import com.necer.view.CalendarView2;
-import com.necer.view.ICalendarView;
 
 import org.joda.time.LocalDate;
 
@@ -25,23 +19,14 @@ public WeekPagerAdapter(Context context, BaseCalendar baseCalendar) {
     }
 
     @Override
-    protected ICalendarView getCalendarView(ViewGroup container, int position) {
+    protected LocalDate getPageInitializeDate(int position) {
         LocalDate localDate = mInitializeDate.plusDays((position - mPageCurrIndex) * 7);
-       // List<LocalDate> dateList = CalendarUtil.getWeekCalendar(localDate, mFirstDayOfWeek);
-        //return new CalendarView(mContext, container, localDate, dateList);
-
-        if (mCalendar.getCalendarBuild() == CalendarBuild.DRAW) {
-            // return new MonthView(mContext, container, localDate, dateList);
-
-            // return new CalendarView(mContext, container, localDate, dateList, CalendarType.MONTH);
-            return new CalendarView(mContext, new CalendarHelper((BaseCalendar) container, localDate, CalendarType.WEEK));
-        } else {
-            // return new MonthView2(mContext, container, localDate, dateList);
-            return new CalendarView2(mContext, new CalendarHelper((BaseCalendar) container, localDate, CalendarType.WEEK));
-        }
-
+        return localDate;
+    }
 
-        //return new CalendarView(mContext,new CalendarHelper((BaseCalendar) container,localDate, CalendarType.WEEK));
+    @Override
+    protected CalendarType getCalendarType() {
+        return CalendarType.WEEK;
     }
 
 }