From f3adb4e64587f9dd348cb03579d07c7fc4444119 Mon Sep 17 00:00:00 2001 From: lingyfh Date: Thu, 25 Apr 2019 21:24:43 +0800 Subject: [PATCH 1/2] update .gitignore ignore .DS_Store --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5fa6bf09..9d9d9505 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +*.DS_Store + # built application files *.apk *.ap_ @@ -30,4 +32,4 @@ build *.iws *.ipr *~ -*.swp \ No newline at end of file +*.swp From 6b7afddc80c6525529d20c6207a1cc0f8cb63da2 Mon Sep 17 00:00:00 2001 From: lingyfh Date: Thu, 25 Apr 2019 21:29:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=20fix:=E4=BF=AE=E5=A4=8D=E4=B8=8D?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B0=8F=E6=97=B6=E6=97=B6=E9=97=B4=E6=83=85?= =?UTF-8?q?=E5=86=B5date=20compareTo=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bigkoo/pickerview/view/TimePickerView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pickerview/src/main/java/com/bigkoo/pickerview/view/TimePickerView.java b/pickerview/src/main/java/com/bigkoo/pickerview/view/TimePickerView.java index 4742c6a9..b3b67070 100644 --- a/pickerview/src/main/java/com/bigkoo/pickerview/view/TimePickerView.java +++ b/pickerview/src/main/java/com/bigkoo/pickerview/view/TimePickerView.java @@ -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);