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 8a5a6b7..ef21a4c 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 @@ -32,8 +32,6 @@ private PaintViewModel paintViewModel; private PageViewModel pageViewModel; - private boolean buttonView = false; - //----------------------------------------------------------------- //----------------------------------------------------------------- @Override @@ -60,12 +58,6 @@ } //----------------------------------------------------------------- - @Override - protected void onPause() { - super.onPause(); - } - - //----------------------------------------------------------------- //----------------------------------------------------------------- // init private void init() { @@ -115,12 +107,6 @@ }); } - - //------------------------------------------------------------------ - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - } //------------------------------------------------------------------ } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java index 20ed231..1cac73a 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java @@ -51,10 +51,11 @@ //----------------------------------------------------------------- //----------------------------------------------------------------- - // ページのサイズを取得し続ける + // ページのサイズとサムネを取得し続ける @Override public void run() { pageViewModel.getPageSizeRequest(); + pageViewModel.getPageThumbnailRequest(); } //----------------------------------------------------------------- @@ -88,23 +89,23 @@ pageViewModel.switchToEditPageRequest(event); } - //----------------------------------------------------------------- - // - @Override - public boolean onTouchEvent(MotionEvent event) { - int action = event.getActionMasked(); - - //----------------------------------------------------------------- - switch (action) { - - case MotionEvent.ACTION_MOVE: - slidePage(event); - - break; - } - - return true; - } +// //----------------------------------------------------------------- +// // +// @Override +// public boolean onTouchEvent(MotionEvent event) { +// int action = event.getActionMasked(); +// +// //----------------------------------------------------------------- +// switch (action) { +// +// case MotionEvent.ACTION_MOVE: +// slidePage(event); +// +// break; +// } +// +// return true; +// } //----------------------------------------------------------------- //----------------------------------------------------------------- @@ -131,6 +132,8 @@ webView.getSettings().setLoadWithOverviewMode(true); webView.getSettings().setUseWideViewPort(true); webView.getSettings().setSupportZoom(false); + webView.clearCache(true); + webView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE); } //----------------------------------------------------------------- @@ -141,8 +144,6 @@ @Override public void onChanged(Integer pageNo) { binding.textPageNo.setText(String.valueOf(pageNo)); - - pageViewModel.getPageThumbnailRequest(); } }); @@ -150,10 +151,7 @@ pageViewModel.getPages().observe(this, new Observer>() { @Override public void onChanged(HashMap s) { - binding.pageWebview.clearCache(true); - binding.pageWebview.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE); binding.pageWebview.loadUrl(s.get(pageViewModel.getCurPageNo().getValue())); - Log.d("a", "onFailure: -----------------------OK:Obs"); } }); 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 bb2095c..d7cd5d5 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 @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.concurrent.ScheduledThreadPoolExecutor; -public class PageViewModel extends ViewModel implements Runnable { +public class PageViewModel extends ViewModel { private PaintModelContainer paintModelContainer; @@ -25,9 +25,6 @@ private MutableLiveData mPageSize = new MutableLiveData<>(0); private MutableLiveData> mPages = new MutableLiveData<>(new HashMap<>()); - - private ScheduledThreadPoolExecutor thread = new ScheduledThreadPoolExecutor(1); - //----------------------------------------------------------------- // getter public LiveData getCurPageNo() { @@ -130,7 +127,6 @@ // ページのサムネイル取得 public void getPageThumbnailRequest() { PageConnectionModel pageConnectionModel = paintModelContainer.getPageConnectionModel(); - pageConnectionModel.getPageThumb(mPages); } @@ -142,25 +138,10 @@ //----------------------------------------------------------------- // - public void resetPageNo(){ + public void resetPageNo() { PageOperationModel pageOperationModel = paintModelContainer.getPageOperationModel(); pageOperationModel.resetEditingPageNo(mCurPageNo); } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // 一定間隔でサーバー上の筆跡を取得する(GET) - @Override - public void run() { - paintModelContainer.getPageConnectionModel().getPageSize(mPageSize); - } - - //----------------------------------------------------------------- - // - public void stop() { - thread.shutdown(); - } - //----------------------------------------------------------------- }