Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修复select回调时间不符合默认预期问题 #753

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

修复select回调时间不符合默认预期问题 #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3adb4e
update .gitignore ignore .DS_Store
lingyfh Apr 25, 2019
6b7afdd
bug fix:修复不选择小时时间情况date compareTo不准确问题
lingyfh Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
*.DS_Store

# built application files
*.apk
*.ap_
Expand Down Expand Up @@ -30,4 +32,4 @@ build
*.iws
*.ipr
*~
*.swp
*.swp
6 changes: 3 additions & 3 deletions pickerview/src/main/java/com/bigkoo/pickerview/view/TimePickerView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ private void setTime() {
year = calendar.get(Calendar.YEAR);
month = calendar.get(Calendar.MONTH);
day = calendar.get(Calendar.DAY_OF_MONTH);
hours = calendar.get(Calendar.HOUR_OF_DAY);
minute = calendar.get(Calendar.MINUTE);
seconds = calendar.get(Calendar.SECOND);
hours = mPickerOptions.type[3] ? calendar.get(Calendar.HOUR_OF_DAY) : 0;
minute = mPickerOptions.type[4] ? calendar.get(Calendar.MINUTE) : 0;
seconds = mPickerOptions.type[5] ? calendar.get(Calendar.SECOND) : 0;
} else {
year = mPickerOptions.date.get(Calendar.YEAR);
month = mPickerOptions.date.get(Calendar.MONTH);
Expand Down