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 05da37c..8a5a6b7 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 @@ -14,6 +14,7 @@ import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.databinding.ActivityPaintBinding; import org.ntlab.acanthus_client.entities.Stroke; +import org.ntlab.acanthus_client.views.paint.page.PageViewModel; import java.util.Collection; @@ -29,6 +30,7 @@ private ActivityPaintBinding binding; private PaintViewModel paintViewModel; + private PageViewModel pageViewModel; private boolean buttonView = false; @@ -37,6 +39,7 @@ @Override public void onDestroy() { super.onDestroy(); + pageViewModel.resetPageNo(); } //----------------------------------------------------------------- @@ -60,7 +63,6 @@ @Override protected void onPause() { super.onPause(); -// paintViewModel.stop(); } //----------------------------------------------------------------- @@ -69,7 +71,10 @@ private void init() { Acanthus acanthus = (Acanthus) getApplication(); paintViewModel = new ViewModelProvider(this).get(PaintViewModel.class); + pageViewModel = new ViewModelProvider(this).get(PageViewModel.class); + paintViewModel.init(acanthus); + pageViewModel.init(acanthus); startObserve(); } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java index ed09b9c..d99f279 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java @@ -53,6 +53,13 @@ } //----------------------------------------------------------------- + // 編集中のページ番号を1に戻す + public void resetEditingPageNo(MutableLiveData mCurPageNo) { + acanthus.setEditingPageNo(1); + mCurPageNo.setValue(1); + } + + //----------------------------------------------------------------- //----------------------------------------------------------------- // ページを進める public void incrementPageNo(MutableLiveData mPageNo, Integer pageSize) { diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageViewModel.java index 759af22..bb2095c 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageViewModel.java @@ -96,7 +96,6 @@ // ひとつ前のページを記憶する private void updatePrePageId() { PageConnectionModel pageConnectionModel = paintModelContainer.getPageConnectionModel(); -// pageConnectionModel.getPrePageId(); } //----------------------------------------------------------------- @@ -136,12 +135,20 @@ } //----------------------------------------------------------------- - // + // ページの枚数を取得する public void getPageSizeRequest() { paintModelContainer.getPageConnectionModel().getPageSize(mPageSize); } //----------------------------------------------------------------- + // + public void resetPageNo(){ + PageOperationModel pageOperationModel = paintModelContainer.getPageOperationModel(); + pageOperationModel.resetEditingPageNo(mCurPageNo); + } + + + //----------------------------------------------------------------- //----------------------------------------------------------------- // 一定間隔でサーバー上の筆跡を取得する(GET) @Override @@ -154,4 +161,6 @@ public void stop() { thread.shutdown(); } + + //----------------------------------------------------------------- }