修复跳转日期的bug

lizihanglove · Oct 16, 2017 · f8d8ac5 · f8d8ac5
1 parent 9fd9309
commit f8d8ac5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 2
-        versionName "2.4.2"
+        versionName "2.4.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/necer/ncalendardemo/activity/MonthSelectActivity.java b/app/src/main/java/necer/ncalendardemo/activity/MonthSelectActivity.java
@@ -55,6 +55,7 @@ public void toToday(View view) {
     }
 
     public void setDate(View view) {
-        monthcalendar.setDate("2018-10-11");
+        monthcalendar.setDate("2017-11-11");
+      //  monthcalendar.setDate("2017-12-31");
     }
 }
diff --git a/app/src/main/res/layout/activity_ncalendar.xml b/app/src/main/res/layout/activity_ncalendar.xml
@@ -114,7 +114,8 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:background="@android:color/white"/>
 
     </com.necer.ncalendar.calendar.NCalendar>
 

diff --git a/ncalendar/build.gradle b/ncalendar/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
-version = "2.4.2" //版本号
+version = "2.4.3" //版本号
 
 android {
     compileSdkVersion 25

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/calendar/MonthCalendar.java b/ncalendar/src/main/java/com/necer/ncalendar/calendar/MonthCalendar.java
@@ -99,7 +99,6 @@ public void setOnMonthCalendarChangedListener(OnMonthCalendarChangedListener onM
 
     @Override
     protected void setDateTime(DateTime dateTime) {
-
         if (dateTime.getMillis() > endDateTime.getMillis() || dateTime.getMillis() < startDateTime.getMillis()) {
             Toast.makeText(getContext(), R.string.illegal_date, Toast.LENGTH_SHORT).show();
             return;
@@ -118,7 +117,6 @@ protected void setDateTime(DateTime dateTime) {
         //不是当月
         if (!Utils.isEqualsMonth(initialDateTime, dateTime)) {
             int months = Utils.getIntervalMonths(initialDateTime, dateTime);
-
             int i = getCurrentItem() + months;
             setCurrentItem(i, Math.abs(months) < 2);
             currectMonthView = getCurrectMonthView();

diff --git a/ncalendar/src/main/java/com/necer/ncalendar/utils/Utils.java b/ncalendar/src/main/java/com/necer/ncalendar/utils/Utils.java
@@ -107,8 +107,9 @@ public static boolean isNextMonth(DateTime dateTime1, DateTime dateTime2) {
      * @return
      */
     public static int getIntervalMonths(DateTime dateTime1, DateTime dateTime2) {
-        dateTime1 = dateTime1.withTimeAtStartOfDay();
-        dateTime2 = dateTime2.withTimeAtStartOfDay();
+        dateTime1 = dateTime1.withDayOfMonth(1).withTimeAtStartOfDay();
+        dateTime2 = dateTime2.withDayOfMonth(1).withTimeAtStartOfDay();
+
         return Months.monthsBetween(dateTime1, dateTime2).getMonths();
     }