Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pickerview/src/main/java/com/bigkoo/pickerview/view/TimePickerView.java
#	pickerview/src/main/java/com/bigkoo/pickerview/view/WheelTime.java

Author: 杨宏伟

README.md

@@ -1,6 +1,8 @@
 
 ## Android-PickerView
 
+起始时间和终止时间，都已支持控制到时分秒
+
 解决原库时间范围不控制时分秒的问题
 原库地址：https://github.com/Bigkoo/Android-PickerView
 
@@ -14,6 +16,6 @@ allprojects {
 	}
 
 dependencies {
-	        implementation 'com.github.LuckyCodeer.Android-PickerView:pickerview:4.2.3'
+	        implementation 'com.github.LuckyCodeer.Android-PickerView:pickerview:4.2.5'
 	}
 ```

pickerview/src/main/java/com/bigkoo/pickerview/view/TimePickerView.java

@@ -195,8 +195,10 @@ private void initDefaultSelectedDate() {
     private void setTime() {
         int year, month, day, hours, minute, seconds;
         Calendar calendar = Calendar.getInstance();
-        Log.i("TAG", "===> " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime()));
         boolean isInRange = true;
+        if (mPickerOptions.date != null) {
+            calendar.setTime(mPickerOptions.date.getTime());
+        }
         if (mPickerOptions.startDate != null && mPickerOptions.endDate != null) {
             if (calendar.getTimeInMillis() < mPickerOptions.startDate.getTimeInMillis()
                     || calendar.getTimeInMillis() > mPickerOptions.endDate.getTimeInMillis()) {
@@ -214,6 +216,7 @@ private void setTime() {
                 calendar = mPickerOptions.endDate;
             }
         }
+
         if (!isInRange) {
             year = calendar.get(Calendar.YEAR);
             month = calendar.get(Calendar.MONTH);

pickerview/src/main/java/com/bigkoo/pickerview/view/WheelTime.java

@@ -401,7 +401,7 @@ private void setSolar(int year, final int month, int day, int h, int m, int s) {
         }
         wv_hours.setAdapter(new NumericWheelAdapter(tempStartHour, tempEndHour));
 
-        wv_hours.setCurrentItem(h);
+        wv_hours.setCurrentItem(h - tempStartHour);
         wv_hours.setGravity(gravity);
         //分
         wv_minutes = (WheelView) view.findViewById(R.id.min);
@@ -419,7 +419,7 @@ private void setSolar(int year, final int month, int day, int h, int m, int s) {
         }
         wv_minutes.setAdapter(new NumericWheelAdapter(tempStartMinute, tempEndMinute));
 
-        wv_minutes.setCurrentItem(m);
+        wv_minutes.setCurrentItem(m - tempStartMinute);
         wv_minutes.setGravity(gravity);
         //秒
         wv_seconds = (WheelView) view.findViewById(R.id.second);
@@ -437,7 +437,7 @@ private void setSolar(int year, final int month, int day, int h, int m, int s) {
         }
         wv_seconds.setAdapter(new NumericWheelAdapter(tempStartSecond, tempEndSecond));
 
-        wv_seconds.setCurrentItem(s);
+        wv_seconds.setCurrentItem(s - tempStartSecond);
         wv_seconds.setGravity(gravity);
 
         // 添加"年"监听
@@ -824,17 +824,31 @@ public String getTime() {
             //如果是农历 返回对应的公历时间
             return getLunarTime();
         }
+        Integer year = (Integer) wv_year.getAdapter().getItem(wv_year.getCurrentItem());
+        Integer month = (Integer) wv_month.getAdapter().getItem(wv_month.getCurrentItem());
+        Integer day = (Integer) wv_day.getAdapter().getItem(wv_day.getCurrentItem());
+        Integer hour = (Integer) wv_hours.getAdapter().getItem(wv_hours.getCurrentItem());
+        Integer minute = (Integer) wv_minutes.getAdapter().getItem(wv_minutes.getCurrentItem());
+        Integer seconds = (Integer) wv_seconds.getAdapter().getItem(wv_seconds.getCurrentItem());
+
         StringBuilder sb = new StringBuilder();
-        if (currentYear == startYear) {
-           /* int i = wv_month.getCurrentItem() + startMonth;
-            System.out.println("i:" + i);*/
+        sb.append(year).append("-")
+                .append(month).append("-")
+                .append(day).append(" ")
+                .append(hour).append(":")
+                .append(minute).append(":")
+                .append(seconds);
+        Log.i("TAG", "===>getTime "+sb);
+       /* if (currentYear == startYear) {
+           *//* int i = wv_month.getCurrentItem() + startMonth;
+            System.out.println("i:" + i);*//*
             if ((wv_month.getCurrentItem() + startMonth) == startMonth) {
                 sb.append((wv_year.getCurrentItem() + startYear)).append("-")
                         .append((wv_month.getCurrentItem() + startMonth)).append("-")
                         .append((wv_day.getCurrentItem() + startDay)).append(" ")
-                        .append(wv_hours.getCurrentItem() + startHour).append(":")
-                        .append(wv_minutes.getCurrentItem() + startMinute).append(":")
-                        .append(wv_seconds.getCurrentItem() + startSecond);
+                        .append(wv_hours.getItemsCount() != 24 ? wv_hours.getCurrentItem() + startHour : wv_hours.getCurrentItem()).append(":")
+                        .append(wv_minutes.getItemsCount() != 60 ? wv_minutes.getCurrentItem() + startMinute : wv_minutes.getCurrentItem()).append(":")
+                        .append(wv_seconds.getItemsCount() != 60 ? wv_seconds.getCurrentItem() + startSecond : wv_seconds.getCurrentItem());
             } else {
                 sb.append((wv_year.getCurrentItem() + startYear)).append("-")
                         .append((wv_month.getCurrentItem() + startMonth)).append("-")
@@ -851,7 +865,7 @@ public String getTime() {
                     .append(wv_hours.getCurrentItem()).append(":")
                     .append(wv_minutes.getCurrentItem()).append(":")
                     .append(wv_seconds.getCurrentItem());
-        }
+        }*/
 
         return sb.toString();
     }