diff --git a/app/src/main/java/com/bcgdv/asia/ticktock/MainActivity.java b/app/src/main/java/com/bcgdv/asia/ticktock/MainActivity.java index 87f3f01..241bdd6 100644 --- a/app/src/main/java/com/bcgdv/asia/ticktock/MainActivity.java +++ b/app/src/main/java/com/bcgdv/asia/ticktock/MainActivity.java @@ -4,6 +4,7 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.widget.TextView; +import android.widget.Toast; import com.bcgdv.asia.lib.ticktock.TickTockView; @@ -28,6 +29,12 @@ protected void onCreate(Bundle savedInstanceState) { mCountDown.setOnTickListener(new TickTockView.OnTickListener() { @Override public String getText(long timeRemaining) { + + if(timeRemaining == 0.0) + { + Toast.makeText(getApplicationContext(),"finished",Toast.LENGTH_LONG).show(); + } + int seconds = (int) (timeRemaining / 1000) % 60; int minutes = (int) ((timeRemaining / (1000 * 60)) % 60); int hours = (int) ((timeRemaining / (1000 * 60 * 60)) % 24); @@ -50,6 +57,12 @@ public String getText(long timeRemaining) { Date date = new Date(); @Override public String getText(long timeRemaining) { + + if(timeRemaining == 0.0) + { + Toast.makeText(getApplicationContext(),"finished1",Toast.LENGTH_LONG).show(); + } + date.setTime(System.currentTimeMillis()); return format.format(date); } @@ -61,22 +74,23 @@ public String getText(long timeRemaining) { protected void onStart() { super.onStart(); Calendar end = Calendar.getInstance(); - end.add(Calendar.MINUTE, 4); +// end.add(Calendar.MINUTE, 4); end.add(Calendar.SECOND, 5); Calendar start = Calendar.getInstance(); - start.add(Calendar.MINUTE, -1); + start.add(Calendar.SECOND, 3); if (mCountDown != null) { mCountDown.start(start, end); } Calendar c2= Calendar.getInstance(); - c2.add(Calendar.HOUR, 2); - c2.set(Calendar.MINUTE, 0); - c2.set(Calendar.SECOND, 0); - c2.set(Calendar.MILLISECOND, 0); + c2.add(Calendar.SECOND, 30); + + Calendar start1 = Calendar.getInstance(); + start.add(Calendar.SECOND, 3); + if (mCountUp != null) { - mCountUp.start(c2); + mCountUp.start(start1,40); } } diff --git a/ticktock/src/main/java/com/bcgdv/asia/lib/ticktock/TickTockView.java b/ticktock/src/main/java/com/bcgdv/asia/lib/ticktock/TickTockView.java index 55e4e16..288b6db 100644 --- a/ticktock/src/main/java/com/bcgdv/asia/lib/ticktock/TickTockView.java +++ b/ticktock/src/main/java/com/bcgdv/asia/lib/ticktock/TickTockView.java @@ -284,6 +284,24 @@ public void start(Calendar startTime, Calendar endTime) { start(endTime); } + + + + public void start(Calendar start , int endSeconds) + { + + Calendar end = Calendar.getInstance(); + + + end.add(Calendar.SECOND, endSeconds); + mStartTime = start; + start(end); + + + + + } + private void updateText(long timeRemaining) { if (mTickListener != null) { String text = mTickListener.getText(timeRemaining);