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 8cf77fc..f93b07a 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,7 +57,7 @@ paint2.setColor(Color.RED);//色の指定 paint2.setStyle(Paint.Style.STROKE);//線をひく paint2.setStrokeWidth(20);//幅 - thread.scheduleWithFixedDelay(this, 1000L, 100L, TimeUnit.MILLISECONDS); + thread.scheduleWithFixedDelay(this, 1000L, 1000L, TimeUnit.MILLISECONDS); } //----------------------------------------------------------------- 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 84adc88..0670a5a 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 b9848b0..9825177 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.087" /> \ No newline at end of file