Merge pull request Bigkoo#755 from MankinChung/fix

xiaosong520 · web-flow · commit 884e20fa8e43 · 2019-04-28T20:01:06.000+08:00
修复 农历‘日’越界的bug
diff --git a/pickerview/src/main/java/com/bigkoo/pickerview/view/WheelTime.java b/pickerview/src/main/java/com/bigkoo/pickerview/view/WheelTime.java
@@ -161,6 +161,7 @@ public void onItemSelected(int index) {
                     wv_month.setCurrentItem(wv_month.getCurrentItem());
                 }
 
+                int currentIndex = wv_day.getCurrentItem();
                 int maxItem = 29;
                 if (ChinaDate.leapMonth(year_num) != 0 && wv_month.getCurrentItem() > ChinaDate.leapMonth(year_num) - 1) {
                     if (wv_month.getCurrentItem() == ChinaDate.leapMonth(year_num) + 1) {
@@ -175,7 +176,7 @@ public void onItemSelected(int index) {
                     maxItem = ChinaDate.monthDays(year_num, wv_month.getCurrentItem() + 1);
                 }
 
-                if (wv_day.getCurrentItem() > maxItem - 1) {
+                if (currentIndex > maxItem - 1) {
                     wv_day.setCurrentItem(maxItem - 1);
                 }
 
@@ -191,6 +192,7 @@ public void onItemSelected(int index) {
             public void onItemSelected(int index) {
                 int month_num = index;
                 int year_num = wv_year.getCurrentItem() + startYear;
+                int currentIndex = wv_day.getCurrentItem();
                 int maxItem = 29;
                 if (ChinaDate.leapMonth(year_num) != 0 && month_num > ChinaDate.leapMonth(year_num) - 1) {
                     if (wv_month.getCurrentItem() == ChinaDate.leapMonth(year_num) + 1) {
@@ -205,7 +207,7 @@ public void onItemSelected(int index) {
                     maxItem = ChinaDate.monthDays(year_num, month_num + 1);
                 }
 
-                if (wv_day.getCurrentItem() > maxItem - 1) {
+                if (currentIndex > maxItem - 1) {
                     wv_day.setCurrentItem(maxItem - 1);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,7 @@ public void onItemSelected(int index) {`
`161`	`161`	`wv_month.setCurrentItem(wv_month.getCurrentItem());`
`162`	`162`	`}`
`163`	`163`
	`164`	`+ int currentIndex = wv_day.getCurrentItem();`
`164`	`165`	`int maxItem = 29;`
`165`	`166`	`if (ChinaDate.leapMonth(year_num) != 0 && wv_month.getCurrentItem() > ChinaDate.leapMonth(year_num) - 1) {`
`166`	`167`	`if (wv_month.getCurrentItem() == ChinaDate.leapMonth(year_num) + 1) {`
`@@ -175,7 +176,7 @@ public void onItemSelected(int index) {`
`175`	`176`	`maxItem = ChinaDate.monthDays(year_num, wv_month.getCurrentItem() + 1);`
`176`	`177`	`}`
`177`	`178`
`178`		`- if (wv_day.getCurrentItem() > maxItem - 1) {`
	`179`	`+ if (currentIndex > maxItem - 1) {`
`179`	`180`	`wv_day.setCurrentItem(maxItem - 1);`
`180`	`181`	`}`
`181`	`182`
`@@ -191,6 +192,7 @@ public void onItemSelected(int index) {`
`191`	`192`	`public void onItemSelected(int index) {`
`192`	`193`	`int month_num = index;`
`193`	`194`	`int year_num = wv_year.getCurrentItem() + startYear;`
	`195`	`+ int currentIndex = wv_day.getCurrentItem();`
`194`	`196`	`int maxItem = 29;`
`195`	`197`	`if (ChinaDate.leapMonth(year_num) != 0 && month_num > ChinaDate.leapMonth(year_num) - 1) {`
`196`	`198`	`if (wv_month.getCurrentItem() == ChinaDate.leapMonth(year_num) + 1) {`
`@@ -205,7 +207,7 @@ public void onItemSelected(int index) {`
`205`	`207`	`maxItem = ChinaDate.monthDays(year_num, month_num + 1);`
`206`	`208`	`}`
`207`	`209`
`208`		`- if (wv_day.getCurrentItem() > maxItem - 1) {`
	`210`	`+ if (currentIndex > maxItem - 1) {`
`209`	`211`	`wv_day.setCurrentItem(maxItem - 1);`
`210`	`212`	`}`
`211`	`213`