回答編集履歴

rest_counts/rest_sets 及び Status 関係を追加

2020/05/14 20:00

投稿

jimbe

スコア12670

test CHANGED Viewed

@@ -40,7 +40,7 @@
 public class CountDownTimerActivity extends AppCompatActivity implements Workout.Listener {
-  private TextView setTextView, countTextView, lefttimeTextView;
+  private TextView setTextView, countTextView, statusTextView, lefttimeTextView;
   private ProgressBar progressBar;
@@ -74,14 +74,14 @@
     countTextView = findViewById(R.id.countNumber);
+    statusTextView = findViewById(R.id.status);
     lefttimeTextView = findViewById(R.id.timeLeft);
     progressBar = findViewById(R.id.pb);
-    progressBar.setMax(workout.getTickMax());
     startStopButton = findViewById(R.id.button_start_stop);
@@ -138,7 +138,7 @@
   private Workout getWorkout(int id) {
-    return new Workout("test",10,0,2,1,0); //テスト用
+    return new Workout("test",10,5,2,2,20); //テスト用
     /*
@@ -178,7 +178,15 @@
     setTextView.setText(""+properties.getSet());
+    statusTextView.setText(""+properties.getStatus());
+    if(progressBar.getMax() != properties.getTickMax()) {
+      progressBar.setMax(properties.getTickMax());
+    }
     progressBar.setProgress(properties.getTickMax() - properties.getTick());
@@ -320,6 +328,8 @@
   int getLeftSecond();
+  Workout.Status getStatus();
 }
@@ -338,23 +348,29 @@
   }
+  enum Status {
+    Nonexecution, Training, RestCounts, RestSets
+  }
   private static final int PARTICLE_SIZE = 20; //1秒を何tickに分けるか
-  //private String name;
+  private String name;
-  //private int time; //トレーニング時間[s]
+  private int time; //トレーニング時間[s]
-  //private int rest_time; //休憩時間[s]
+  private int rest_counts; //休憩時間[s]
   private int countMax; //カウント
   private int setMax; //セット数
-  //private int set_during; //セット間の休憩時間[s]
+  private int rest_sets; //セット間の休憩時間[s]
@@ -366,27 +382,45 @@
   private int count, set;
+  private Status status;
   private Handler handler;
+  /**
+   *
+   * @param name トレーニング名?
+   * @param time トレーニング時間[s]
+   * @param rest_counts 休憩時間[s]
+   * @param count カウント
+   * @param set セット数
+   * @param rest_sets セット間の休憩時間[s]
+   */
-  Workout(String name, int time, int rest_time, int count, int set, int set_during) {
+  Workout(String name, int time, int rest_counts, int count, int set, int rest_sets) {
-    //this.name = name;
+    this.name = name;
-    //this.time = time;
+    this.time = time;
-    //this.rest_time = rest_time;
+    this.rest_counts = rest_counts;
     this.countMax = count;
     this.setMax = set;
-    //this.set_during = set_during;
+    this.rest_sets = rest_sets;
-    this.tickMax = time * PARTICLE_SIZE;
     this.handler = new Handler();
@@ -408,6 +442,8 @@
   public int getLeftSecond() { return calcLeftSecond(tick); }
+  public Status getStatus() { return status; }
   private static int calcLeftSecond(int tick) { return (tick + PARTICLE_SIZE - 1) / PARTICLE_SIZE; }
@@ -416,18 +452,18 @@
   synchronized void start(Listener listener) {
-    if(timer != null)
-      throw new IllegalStateException();
+    if(timer != null) throw new IllegalStateException();
     this.listener = listener;
+    status = Status.Training;
+    listener.start(Workout.this);
     timer = new Timer();
     timer.scheduleAtFixedRate(new TickTask(), 1000L / PARTICLE_SIZE, 1000L / PARTICLE_SIZE); //[ms]
-    listener.start(Workout.this);
   }
@@ -482,119 +518,171 @@
   private boolean downTick() {
+    if(--tick > 0) return false;
+    switch(status) {
+      case RestCounts:
-    if(--tick <= 0) {
+        if(count <= 0) {
+          status = Status.RestSets;
+          tickMax = rest_sets * PARTICLE_SIZE;
+          tick = tickMax;
+          break;
+        }
+        /*break;*/
+      case RestSets:
+        status = Status.Training;
+        if(count <= 0) count = countMax;
+        tickMax = time * PARTICLE_SIZE;
+        tick = tickMax;
+        break;
+      default: //Training
-      if(--count <= 0) {
+        if(--count <= 0) {
+          if(--set <= 0) {
+            status = Status.Nonexecution;
-        if(--set <= 0) return true; //finish
+            return true; //finish
+          }
+        }
+        status = Status.RestCounts;
+        tickMax = rest_counts * PARTICLE_SIZE;
+        tick = tickMax;
+    }
+    return false;
+  }
+  private static class WorkoutSnapshot implements WorkoutProperties {
+    private int tick, tickMax;
+    private int count, set;
+    private Status status;
+    WorkoutSnapshot(Workout wo) {
+      this.tick = wo.tick;
+      this.tickMax = wo.tickMax;
-        count = countMax;
+      this.count = wo.count;
+      this.set = wo.set;
+      this.status = wo.status;
+    }
+    public int getSet() { return set; }
+    public int getCount() { return count; }
+    public int getTick() { return tick; }
+    public int getTickMax() { return tickMax; }
+    public int getLeftSecond() { return calcLeftSecond(tick); }
+    public Status getStatus() { return status; }
+  }
+  private synchronized void postProgress(WorkoutProperties properties) {
+    if(listener != null) {
+      listener.progress(properties);
+    }
+  }
+  private synchronized void postFinish(WorkoutProperties properties) {
+    if(listener != null) {
+      listener.finish(properties);
+      listener = null;
+    }
+  }
+  synchronized void stop() {
+    if(timer != null) {
+      timer.cancel();
+      timer = null;
+      if(listener != null) {
+        listener.stop(this);
+        listener = null;
       }
+    }
+  }
+  synchronized void reset() {
+    if(timer == null) {
+      count = countMax;
+      set = setMax;
+      tickMax = time * PARTICLE_SIZE;
       tick = tickMax;
-    }
-    return false;
-  }
-  private static class WorkoutSnapshot implements WorkoutProperties {
-    private int tick, tickMax;
-    private int count, set;
-    WorkoutSnapshot(Workout wo) {
-      this.tick = wo.tick;
-      this.tickMax = wo.tickMax;
-      this.count = wo.count;
-      this.set = wo.set;
-    }
-    public int getSet() { return set; }
-    public int getCount() { return count; }
-    public int getTick() { return tick; }
-    public int getTickMax() { return tickMax; }
-    public int getLeftSecond() { return calcLeftSecond(tick); }
-  }
-  private synchronized void postProgress(WorkoutProperties properties) {
-    if(listener != null) {
-      listener.progress(properties);
-    }
-  }
-  private synchronized void postFinish(WorkoutProperties properties) {
-    if(listener != null) {
-      listener.finish(properties);
+      status = Status.Nonexecution;
-      listener = null;
-    }
-  }
-  synchronized void stop() {
-    if(timer != null) {
-      timer.cancel();
-      timer = null;
-      if(listener != null) {
-        listener.stop(this);
-        listener = null;
-      }
-    }
-  }
-  synchronized void reset() {
-    if(timer == null) {
-      this.count = countMax;
-      this.set = setMax;
-      this.tick = tickMax;
     }

CountDownTimer から Timer#scheduleAtFixedRate に変更

2020/05/14 20:00

投稿

jimbe

スコア12670

test CHANGED Viewed

@@ -56,7 +56,7 @@
     super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_main); //activity_count_down_timer
+    setContentView(R.layout.activity_count_down_timer);
@@ -138,7 +138,7 @@
   private Workout getWorkout(int id) {
-    return new Workout("test",10,0,3,4,0); //テスト用
+    return new Workout("test",10,0,2,1,0); //テスト用
     /*
@@ -172,17 +172,19 @@
-  private void showWorkout(Workout workout) {
+  private void showWorkout(WorkoutProperties properties) {
-    countTextView.setText(""+workout.getCount());
+    countTextView.setText(""+properties.getCount());
-    setTextView.setText(""+workout.getSet());
+    setTextView.setText(""+properties.getSet());
-    progressBar.setProgress(workout.getTick());
+    progressBar.setProgress(properties.getTickMax() - properties.getTick());
-    int left = workout.getLeftSecond();
+    int left = properties.getLeftSecond();
     int minute = left / 60;
@@ -214,7 +216,7 @@
   @Override
-  public void start(Workout workout) {
+  public void start(WorkoutProperties properties) {
     setStop();
@@ -228,9 +230,9 @@
   @Override
-  public void progress(Workout workout) {
+  public void progress(WorkoutProperties properties) {
-    showWorkout(workout);
+    showWorkout(properties);
   }
@@ -238,9 +240,9 @@
   @Override
-  public void finish(Workout workout) {
+  public void finish(WorkoutProperties properties) {
-    showWorkout(workout);
+    showWorkout(properties);
     startStopButton.setEnabled(false);
@@ -252,7 +254,7 @@
   @Override
-  public void stop(Workout workout) {
+  public void stop(WorkoutProperties properties) {
     setRestart();
@@ -298,23 +300,41 @@
-import android.os.CountDownTimer;
+import android.os.Handler;
-import android.util.Log;
+import java.util.*;
-class Workout {
+interface WorkoutProperties {
+  int getSet();
+  int getCount();
+  int getTick();
+  int getTickMax();
+  int getLeftSecond();
+}
+class Workout implements WorkoutProperties {
   interface Listener {
-    void start(Workout workout);
+    void start(WorkoutProperties properties);
-    void progress(Workout workout);
+    void progress(WorkoutProperties properties);
-    void finish(Workout workout);
+    void finish(WorkoutProperties properties);
-    void stop(Workout workout);
+    void stop(WorkoutProperties properties);
   }
@@ -340,13 +360,13 @@
   private Listener listener;
-  private CountDownTimer countDownTimer;
+  private Timer timer;
   private int tick, tickMax;
   private int count, set;
-  private boolean firstTick = false; //CountDownTimer の 最初の onTick を無視するため
+  private Handler handler;
@@ -368,6 +388,8 @@
     this.tickMax = time * PARTICLE_SIZE;
+    this.handler = new Handler();
     reset();
@@ -376,109 +398,205 @@
-  int getSet() { return set; }
+  public int getSet() { return set; }
-  int getCount() { return count; }
+  public int getCount() { return count; }
-  int getTick() { return tick; }
+  public int getTick() { return tick; }
-  int getTickMax() { return tickMax; }
+  public int getTickMax() { return tickMax; }
+  public int getLeftSecond() { return calcLeftSecond(tick); }
-  int getLeftSecond() { return (tick+PARTICLE_SIZE-1) / PARTICLE_SIZE; }
+  private static int calcLeftSecond(int tick) { return (tick + PARTICLE_SIZE - 1) / PARTICLE_SIZE; }
-  void start(Listener listener) {
+  synchronized void start(Listener listener) {
+    if(timer != null)
+      throw new IllegalStateException();
     this.listener = listener;
-    long millisInFuture = (tick+tickMax*(count*set-1))*1000L/PARTICLE_SIZE;
-    firstTick = true;
+    timer = new Timer();
-    countDownTimer = new CountDownTimer(millisInFuture, 1000L/PARTICLE_SIZE) { //[ms]
+    timer.scheduleAtFixedRate(new TickTask(), 1000L / PARTICLE_SIZE, 1000L / PARTICLE_SIZE); //[ms]
+    listener.start(Workout.this);
+  }
+  private class TickTask extends TimerTask {
-      @Override
+    @Override
-      public void onTick(long ignore) {
+    public void run() {
-        if(firstTick) { //最初の onTick を無視
+      boolean finish = downTick();
+      final WorkoutProperties properties = new WorkoutSnapshot(Workout.this);
+      handler.post(new Runnable() {
-          firstTick = false;
+        public void run() {
-          return;
+          postProgress(properties);
         }
+      });
+      if(finish) {
+        synchronized(this) {
-        downTick();
+          timer.cancel();
+          timer = null;
+        }
+        handler.post(new Runnable() {
+          public void run() {
-        Workout.this.listener.progress(Workout.this);
+            postFinish(properties);
+          }
+        });
       }
-      @Override
+    }
+  }
-      public void onFinish() {
+  private boolean downTick() {
+    if(--tick <= 0) {
-        onTick(0L); //終了時の Tick を発生(したように見せかける)
+      if(--count <= 0) {
-        Workout.this.listener.finish(Workout.this);
+        if(--set <= 0) return true; //finish
-        Workout.this.listener = null;
+        count = countMax;
       }
-    }.start();
+      tick = tickMax;
-    listener.start(Workout.this);
-  }
+    }
+    return false;
+  }
+  private static class WorkoutSnapshot implements WorkoutProperties {
+    private int tick, tickMax;
-  private void downTick() {
+    private int count, set;
+    WorkoutSnapshot(Workout wo) {
-    if(--tick <= 0) {
+      this.tick = wo.tick;
-      if(--count <= 0) {
+      this.tickMax = wo.tickMax;
-        if(--set <= 0) return; //finish
-        count = countMax;
+      this.count = wo.count;
+      this.set = wo.set;
+    }
+    public int getSet() { return set; }
+    public int getCount() { return count; }
+    public int getTick() { return tick; }
+    public int getTickMax() { return tickMax; }
+    public int getLeftSecond() { return calcLeftSecond(tick); }
+  }
+  private synchronized void postProgress(WorkoutProperties properties) {
+    if(listener != null) {
+      listener.progress(properties);
+    }
+  }
+  private synchronized void postFinish(WorkoutProperties properties) {
+    if(listener != null) {
+      listener.finish(properties);
+      listener = null;
+    }
+  }
+  synchronized void stop() {
+    if(timer != null) {
+      timer.cancel();
+      timer = null;
+      if(listener != null) {
+        listener.stop(this);
+        listener = null;
       }
-      tick = tickMax;
-    }
+    }
-  }
+  }
-  void stop() {
+  synchronized void reset() {
-    if(countDownTimer != null) {
+    if(timer == null) {
-      countDownTimer.cancel();
-      countDownTimer = null;
-      listener.stop(this);
+      this.count = countMax;
-      listener = null;
+      this.set = setMax;
+      this.tick = tickMax;
-    }
+    }
-  }
-  void reset() {
-    this.count = countMax;
-    this.set = setMax;
-    this.tick = tickMax;
   }

Workout のイベント発生とカウントダウンのタイミングを変更

2020/05/13 15:50

投稿

jimbe

スコア12670

test CHANGED Viewed

@@ -300,6 +300,8 @@
 import android.os.CountDownTimer;
+import android.util.Log;
 class Workout {
@@ -318,7 +320,7 @@
-  private static final int PARTICLE_SIZE = 2; //1秒を何tickに分けるか
+  private static final int PARTICLE_SIZE = 20; //1秒を何tickに分けるか
@@ -344,6 +346,8 @@
   private int count, set;
+  private boolean firstTick = false; //CountDownTimer の 最初の onTick を無視するため
   Workout(String name, int time, int rest_time, int count, int set, int set_during) {
@@ -380,7 +384,7 @@
   int getTickMax() { return tickMax; }
-  int getLeftSecond() { return tick / PARTICLE_SIZE; }
+  int getLeftSecond() { return (tick+PARTICLE_SIZE-1) / PARTICLE_SIZE; }
@@ -390,28 +394,24 @@
     long millisInFuture = (tick+tickMax*(count*set-1))*1000L/PARTICLE_SIZE;
+    firstTick = true;
     countDownTimer = new CountDownTimer(millisInFuture, 1000L/PARTICLE_SIZE) { //[ms]
       @Override
-      public void onTick(long millisUntilFinished) {
+      public void onTick(long ignore) {
-        tick --;
+        if(firstTick) { //最初の onTick を無視
-        if(tick < 0) {
+          firstTick = false;
-          tick = tickMax - 1;
-          if(--count <= 0) {
-            set --;
+          return;
-            count = countMax;
-          }
         }
+        downTick();
         Workout.this.listener.progress(Workout.this);
       }
@@ -420,11 +420,7 @@
       public void onFinish() {
-        tick = 0;
+        onTick(0L); //終了時の Tick を発生(したように見せかける)
-        count = 0;
-        set = 0;
         Workout.this.listener.finish(Workout.this);
@@ -438,6 +434,24 @@
   }
+  private void downTick() {
+    if(--tick <= 0) {
+      if(--count <= 0) {
+        if(--set <= 0) return; //finish
+        count = countMax;
+      }
+      tick = tickMax;
+    }
+  }
   void stop() {