Merge remote-tracking branch 'origin/master'

Author: zengsong

README-en.md

@@ -39,7 +39,7 @@ and support for the linkage, dialog . It's very easy to use ,  you also can cust
 ### Gradle
 
 ```java
-compile 'com.contrarywind:Android-PickerView:4.1.6'
+compile 'com.contrarywind:Android-PickerView:4.1.8'
 ```
 
 ### Maven
@@ -48,7 +48,7 @@ compile 'com.contrarywind:Android-PickerView:4.1.6'
 <dependency>
 <groupId>com.contrarywind</groupId>
 <artifactId>Android-PickerView</artifactId>
-<version>4.1.2</version>
+<version>4.1.8</version>
 <type>pom</type>
 </dependency>
 ```

README.md

@@ -61,6 +61,10 @@
   startDate.set(2013,0,1);
   endDate.set(2020,11,1);
 
+ #### V4.1.8 版本更新说明（2019-4-24）
+ -  更新gradle版本， wheelview基础库由 compile 改为 api 依赖，避免gradle 5.0+版本无法引入。
+ -  修复 setTextXOffset 赋值问题。
+  
  #### V4.1.7 版本更新说明（2019-1-10）
  -  修复 WheelView在初始化时，数据为空导致height=0，造成一直显示不出来的问题。
  -  新增取消按钮的点击事件监听入口。
@@ -83,7 +87,7 @@
 
 #### 1.添加Jcenter仓库 Gradle依赖：
 ```java
-compile 'com.contrarywind:Android-PickerView:4.1.7'
+compile 'com.contrarywind:Android-PickerView:4.1.8'
 ```
 或者
 
@@ -92,7 +96,7 @@ compile 'com.contrarywind:Android-PickerView:4.1.7'
 <dependency>
 <groupId>com.contrarywind</groupId>
 <artifactId>Android-PickerView</artifactId>
-<version>4.1.7</version>
+<version>4.1.8</version>
 <type>pom</type>
 </dependency>
 ```

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);
                 }