@@ -206,15 +206,18 @@ private void startCounting(String dateString) {
206
206
}
207
207
new CountDownTimer (date .getTime () - now .getTime (), 1000 ) {
208
208
public void onTick (long millisUntilFinished ) {
209
+ long mMinutes = MILLISECONDS .toMinutes (millisUntilFinished );
210
+ long mHours = MILLISECONDS .toHours (millisUntilFinished );
211
+
209
212
long days = MILLISECONDS .toDays (millisUntilFinished );
210
213
long hours = days >= 1 && mMaxTimeUnit < TimeUnits .HOUR .getValue () ?
211
214
MILLISECONDS .toHours (millisUntilFinished ) - TimeUnit .DAYS .toHours (days ) :
212
215
MILLISECONDS .toHours (millisUntilFinished );
213
- long minutes = hours >= 1 && mMaxTimeUnit < TimeUnits .MINUTE .getValue () ?
216
+ long minutes = mHours >= 1 && mMaxTimeUnit < TimeUnits .MINUTE .getValue () ?
214
217
MILLISECONDS .toMinutes (millisUntilFinished ) - TimeUnit .HOURS
215
218
.toMinutes (MILLISECONDS .toHours (millisUntilFinished )) :
216
219
MILLISECONDS .toMinutes (millisUntilFinished );
217
- long seconds = minutes >= 1 && mMaxTimeUnit < TimeUnits .SECOND .getValue () ?
220
+ long seconds = mMinutes >= 1 && mMaxTimeUnit < TimeUnits .SECOND .getValue () ?
218
221
MILLISECONDS .toSeconds (millisUntilFinished ) - TimeUnit .MINUTES .toSeconds (
219
222
MILLISECONDS .toMinutes (millisUntilFinished )) :
220
223
MILLISECONDS .toSeconds (millisUntilFinished );
@@ -228,10 +231,12 @@ public void onFinish() {
228
231
}
229
232
230
233
private void setText (long days , long hours , long minutes , long seconds ) {
231
- if (days == 0 ) {
234
+ if (days == 0 && mMaxTimeUnit >
235
+ TimeUnits .DAY .getValue ()) {
232
236
mTvDay .setVisibility (GONE );
233
237
}
234
- if (hours == 0 ) {
238
+ if (hours == 0 && mMaxTimeUnit >
239
+ TimeUnits .HOUR .getValue ()) {
235
240
mTvHour .setVisibility (GONE );
236
241
}
237
242
if (mIsShowingTextDesc ) {
0 commit comments