diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java index 4c17d1d..ba0dfb7 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java @@ -19,7 +19,6 @@ private PaintCanvas paintCanvas; private ActivityPaintBinding binding; - private PaintViewModel paintViewModel; //----------------------------------------------------------------- diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java index f93b07a..cf5b5b1 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java @@ -57,9 +57,16 @@ paint2.setColor(Color.RED);//色の指定 paint2.setStyle(Paint.Style.STROKE);//線をひく paint2.setStrokeWidth(20);//幅 + //描写するためにrunで回す。 thread.scheduleWithFixedDelay(this, 1000L, 1000L, TimeUnit.MILLISECONDS); } + // 一定間隔でサーバーから受け取ったstrokesの描写を行う + @Override + public void run() { + getCanvas(); + } + //----------------------------------------------------------------- // setter public void setPaintViewModel(PaintViewModel paintViewModel) { @@ -68,9 +75,11 @@ //----------------------------------------------------------------- //----------------------------------------------------------------- - // + //描写に関する部分 @Override protected void onDraw(Canvas canvas) { + //書き始めた段階から繰り返し呼ばれる + //手を放すと停止 super.onDraw(canvas); canvas.drawPath(path, paint); canvas.drawPath(path2, paint2); @@ -87,19 +96,19 @@ //(3-2)タッチの処理 switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: + case MotionEvent.ACTION_DOWN://タッチした瞬間 Log.d("motion", "+++++++++++++++++++++++++++++++++++++++down======================================================"); onTouched(x, y); paintViewModel.addLocalStrokeRequest(); break; - case MotionEvent.ACTION_MOVE: + case MotionEvent.ACTION_MOVE://指動かしている間 Log.d("motion", "move"); onTouchedMove(x, y); paintViewModel.addPositionRequest(x, y); break; - case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_UP://指を放した瞬間 Log.d("motion", "=====================================up======================================================"); break; } @@ -164,10 +173,4 @@ cnt = 0; } } - - // 一定間隔でサーバー上の筆跡を取得する（GET） - @Override - public void run() { - getCanvas(); - } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java index a9860dc..449c126 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java @@ -28,7 +28,6 @@ private MutableLiveData mPageNo = new MutableLiveData<>(); private MutableLiveData mStrokeNo = new MutableLiveData<>(); private MutableLiveData> mStrokes = new MutableLiveData<>(); - private ScheduledThreadPoolExecutor thread = new ScheduledThreadPoolExecutor(1); //----------------------------------------------------------------- diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java index 25fe857..6d2efd9 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java @@ -58,7 +58,8 @@ .addConverterFactory(JacksonConverterFactory.create()) .build(); } - +//----------------------------------------------------------------- +//----------▽▽POST▽▽---------- //----------------------------------------------------------------- //----------------------------------------------------------------- // ローカルでのストロークの追加(POST) @@ -108,7 +109,11 @@ } }); } - +//----------△△POST△△---------- +//----------------------------------------------------------------- +/////////////////////////////////////////////////////////////////////////////////////////////////////////// +//----------------------------------------------------------------- +//----------▽▽GET▽▽---------- //----------------------------------------------------------------- // 全strokeを取得する public void getStrokes(MutableLiveData> strokes) { @@ -151,7 +156,11 @@ } }); } - +//----------△△GET△△---------- +//----------------------------------------------------------------- +/////////////////////////////////////////////////////////////////////////////////////////////////////////// +//----------------------------------------------------------------- +//----------▽▽delete▽▽---------- //----------------------------------------------------------------- // "Clear"ボタンによる描画の全消去 / サーバー側の筆跡全削除 public void deleteStrokes() { @@ -170,7 +179,7 @@ } }); } - - //----------------------------------------------------------------- +//----------△△delete△△---------- +//----------------------------------------------------------------- } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_edit.xml b/app/src/main/res/layout/fragment_edit.xml index 99e3755..b1cabc4 100644 --- a/app/src/main/res/layout/fragment_edit.xml +++ b/app/src/main/res/layout/fragment_edit.xml @@ -50,10 +50,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="編集" - app:layout_constraintBottom_toTopOf="@+id/list_view" + app:layout_constraintBottom_toBottomOf="@+id/list_view" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toEndOf="@+id/Paint_button" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.531" /> \ No newline at end of file