diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java index 2bc13ac..0758ea5 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java @@ -4,10 +4,11 @@ import android.os.Bundle; - +// 表示ページ public class AnimationActivity extends AppCompatActivity { private AnimationCanvas animationCanvas; + //animationCanvasの表示 @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -16,12 +17,14 @@ setContentView(animationCanvas); } + //タイマーの停止 @Override protected void onPause(){ super.onPause(); animationCanvas.onPouse(); } + //再生(タイマーの生成) @Override protected void onResume(){ super.onResume(); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java index bfa5351..2346dbb 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java @@ -16,17 +16,15 @@ import retrofit2.Retrofit; public class AnimationCanvas extends View { - private Retrofit retrofit; private Acanthus acanthus; private AnimationViewModel animationViewModel = new AnimationViewModel(); private Paint paint = new Paint(); - - private ScheduledExecutorService ses = null; + //ページ指定用の変数 private int pageNo = 0; - + //ページ進ませる private final Runnable task = new Runnable(){ @Override public void run(){ @@ -39,27 +37,17 @@ super(context); } - /* - @Override - protected void onDraw(Canvas canvas) { - super.onDraw(canvas); - Stroke stroke = retrofit.create(Stroke.class); - paint.setStrokeWidth(stroke.getThickness()); - paint.setColor(stroke.getColor()); - ArrayList pts = stroke.getPositions(); - //canvas.drawLines(pts, paint); - } - */ //ダミーです。 @Override protected void onDraw(Canvas canvas) { super.onDraw(canvas); + //100msごとに1pxずつ3つ目の四角が下に降りる canvas.drawRect(100, 100, 200, 300, paint); canvas.drawRect(300, 200, 400, 400, paint); canvas.drawRect(500, 100 + pageNo, 600, 300 + pageNo, paint); /* - //Stroke stroke = retrofit.create(Stroke.class); + //線の描写 paint.setStrokeWidth(20); paint.setColor(Color.RED); float pts[] = {100, 1000, 500, 100, 500, 100, 900, 1000, 900, 1000, 250, 450, 250, 450, 800, 450}; @@ -67,6 +55,7 @@ */ } + //タイマーの生成 public void onResume(){ //タイマーの作成 ses = Executors.newSingleThreadScheduledExecutor(); @@ -74,8 +63,8 @@ ses.scheduleAtFixedRate(task, 0L, 100L, TimeUnit.MILLISECONDS); } + //タイマーを停止する public void onPouse(){ - //タイマーを停止する ses.shutdown(); ses = null; } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java index 69a41a1..04b113c 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java @@ -38,10 +38,10 @@ public class AnimationViewModel extends ViewModel { private Retrofit retrofit; private Acanthus acanthus; - // getStrokes + + // StrokesRestをGETする。 public void getAnimationStrokes() { final StrokesRest strokesRest = retrofit.create(StrokesRest.class); - Call> call = strokesRest.getStrokes(acanthus.getAid()); - + Call> strokes = strokesRest.getStrokes(acanthus.getAid()); } }