增加代码设置日期区间

smarteng · Oct 30, 2017 · 53462d3 · 53462d3
1 parent 3a7d6cd
commit 53462d3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/app/src/main/java/necer/ncalendardemo/activity/NCalendarActivity.java b/app/src/main/java/necer/ncalendardemo/activity/NCalendarActivity.java
@@ -12,6 +12,7 @@
 
 import com.necer.ncalendar.calendar.NCalendar;
 import com.necer.ncalendar.listener.OnCalendarChangedListener;
+import com.necer.ncalendar.utils.MyLog;
 
 import org.joda.time.DateTime;
 
@@ -52,7 +53,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         tv_date = (TextView) findViewById(R.id.tv_date);
 
 
-     //   ncalendar.setDateInterval("2017-04-02","2018-01-01");
+        ncalendar.setDateInterval("2017-04-02","2018-01-01");
 
 
 
@@ -84,6 +85,8 @@ public void run() {
     public void onCalendarChanged(DateTime dateTime) {
         tv_month.setText(dateTime.getMonthOfYear() + "月");
         tv_date.setText(dateTime.getYear() + "年" + dateTime.getMonthOfYear() + "月" + dateTime.getDayOfMonth() + "日");
+
+        MyLog.d("dateTime::" + dateTime);
     }
 
 

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/calendar/CalendarPager.java b/ncalendar/src/main/java/com/necer/ncalendar/calendar/CalendarPager.java
@@ -90,6 +90,16 @@ public CalendarPager(Context context, AttributeSet attrs) {
         endDateTime = new DateTime(endString == null ? "2099-12-31" : endString);
 
         setDateInterval(null, null);
+
+        getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                initCurrentCalendarView(mCurrPage);
+                getViewTreeObserver().removeGlobalOnLayoutListener(this);
+            }
+        });
+
+        setBackgroundColor(Attrs.backgroundColor);
     }
 
     public void setDateInterval(String startString,String endString) {
@@ -133,15 +143,6 @@ public void onPageScrollStateChanged(int state) {
 
         addOnPageChangeListener(onPageChangeListener);
 
-        getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                initCurrentCalendarView(mCurrPage);
-                getViewTreeObserver().removeGlobalOnLayoutListener(this);
-            }
-        });
-
-        setBackgroundColor(Attrs.backgroundColor);
     }
 
 

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/calendar/NCalendar.java b/ncalendar/src/main/java/com/necer/ncalendar/calendar/NCalendar.java
@@ -131,10 +131,7 @@ public void onAnimationRepeat(Animator animation) {
         });
     }
 
-    public void setDateInterval(String startString,String endString) {
-        monthCalendar.setDateInterval(startString,endString);
-        weekCalendar.setDateInterval(startString,endString);
-    }
+
 
 
     @Override
@@ -567,4 +564,14 @@ public void toLastPager() {
             weekCalendar.toLastPager();
         }
     }
+
+    /**
+     * 设置日期区间
+     * @param startString
+     * @param endString
+     */
+    public void setDateInterval(String startString,String endString) {
+        monthCalendar.setDateInterval(startString,endString);
+        weekCalendar.setDateInterval(startString,endString);
+    }
 }