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 4abd53a..4e811a4 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 @@ -103,7 +103,7 @@ case MotionEvent.ACTION_UP: Log.d("motion", "=====================================up======================================================"); - paintViewModel.addPositionRequestfirst(); + paintViewModel.addPositionRequestFirst(); break; } 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 085e8d6..c67d605 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 @@ -22,25 +22,19 @@ //----------------------------------------------------------------- // 描画処理の仲介 public class PaintViewModel extends ViewModel implements Runnable { - private PaintModelContainer paintModelContainer; - private MutableLiveData mCurPageNo = new MutableLiveData<>(); - private MutableLiveData mCurPageId = new MutableLiveData<>(); - private MutableLiveData mPageSize = new MutableLiveData<>(); - private MutableLiveData StrokeNo = new MutableLiveData<>(); - private int mStrokeNo = 0; + private MutableLiveData mCurPageNo = new MutableLiveData<>(1); + private MutableLiveData mCurPageId = new MutableLiveData<>(0); + private MutableLiveData mPageSize = new MutableLiveData<>(0); + private MutableLiveData mStrokeNo = new MutableLiveData(0); private MutableLiveData> mStrokes = new MutableLiveData<>(); + private int strokeNo = 0; private ScheduledThreadPoolExecutor thread = new ScheduledThreadPoolExecutor(1); - private ArrayList positionLocalx = new ArrayList<>(); - private ArrayList positionLocaly = new ArrayList<>(); - private ArrayList localstrokeNo = new ArrayList<>(); private int cnt = 0; private float fsx = 0; private float fsy = 0; - private int ranStrokeNo=0; - private Acanthus acanthus; //----------------------------------------------------------------- // getter @@ -49,7 +43,7 @@ } public int getStrokeNo() { - return this.mStrokeNo; + return this.strokeNo; } public LiveData getPageNo() { @@ -67,9 +61,7 @@ paintModelContainer = new PaintModelContainer(acanthus); paintModelContainer.getPaintConnectionModel().init(acanthus); paintModelContainer.getInvitesConnectionModel().init(acanthus); - this.acanthus=acanthus; - mStrokeNo.setValue(0); mStrokes.setValue(new ArrayList<>()); mStrokes.getValue().add(new Stroke()); @@ -79,18 +71,19 @@ thread.scheduleWithFixedDelay(this, 1000L, 100L, TimeUnit.MILLISECONDS); } + //----------------------------------------------------------------- // strokeNoの発行 - public void setmStrokeNo(){ + public void setmStrokeNo() { Random random = new Random(); - mStrokeNo=random.nextInt(1000000000); - Log.d("TAG", "setmStrokeNo: "+mStrokeNo); + strokeNo = random.nextInt(1000000000); + Log.d("TAG", "setmStrokeNo: " + mStrokeNo); } //----------------------------------------------------------------- // 描画APIの通信リクエスト public void addLocalStrokeRequest(float x, float y) { - paintModelContainer.getPaintConnectionModel().addLocalStroke(mStrokeNo); + paintModelContainer.getPaintConnectionModel().addLocalStroke(strokeNo); fsx = x; fsy = y; cnt = 1; @@ -100,21 +93,15 @@ // public void addPositionRequest(float x, float y) { // Log.d("mStrokeNo", mStrokeNo.getValue().toString()); - paintModelContainer.getPaintConnectionModel().addPosition(cnt, x, y, mStrokeNo); - //positionLocalx.add((double)x); - //positionLocaly.add((double)y); + paintModelContainer.getPaintConnectionModel().addPosition(cnt, x, y, strokeNo); cnt++; } //----------------------------------------------------------------- // - public void addPositionRequestfirst() { - paintModelContainer.getPaintConnectionModel().addPosition(0, fsx, fsy, mStrokeNo); - paintModelContainer.getPaintConnectionModel().addPosition(cnt, -1, -1, mStrokeNo); - //Log.d("x", positionLocalx.toString()); - //Log.d("y", positionLocaly.toString()); - //positionLocalx.clear(); - //positionLocaly.clear(); + public void addPositionRequestFirst() { + paintModelContainer.getPaintConnectionModel().addPosition(0, fsx, fsy, strokeNo); + paintModelContainer.getPaintConnectionModel().addPosition(cnt, -1, -1, strokeNo); } //----------------------------------------------------------------- @@ -209,7 +196,8 @@ public void run() { // Log.d("debug", "run: "); paintModelContainer.getPaintConnectionModel().getStrokes(mStrokes); - paintModelContainer.getPaintConnectionModel().getStrokeNo(StrokeNo); + paintModelContainer.getPaintConnectionModel().getStrokeNo(mStrokeNo); + paintModelContainer.getPageConnectionModel().getPageSize(mPageSize); } //-----------------------------------------------------------------