diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java index 11f7b1a..f6384c8 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java @@ -32,7 +32,7 @@ @FormUrlEncoded @POST("gallery/{aid}/pageMap/{pid}/layers/{layerNo}/strokes") Call addStroke(@Path("aid") Integer aid, @Path("pid") Integer pid, @Path("layerNo") Integer layerNo, - @Field("uid") Integer uid, @Field("uidToken") String uidToken, + @Field("uid") Integer uid, @Field("strokeNo") Integer strokeNo,@Field("uidToken") String uidToken, @Field("pen") Integer pen, @Field("color") Integer color, @Field("thick") Integer thick); //----------------------------------------------------------------- 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 a2b5e2a..83bf0a3 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 @@ -25,7 +25,8 @@ private MutableLiveData mPageLength = new MutableLiveData<>(); private MutableLiveData mPageNo = new MutableLiveData<>(); - private MutableLiveData mStrokeNo = new MutableLiveData<>(); + private MutableLiveData StrokeNo = new MutableLiveData<>(); + private int mStrokeNo = 0; private MutableLiveData> mStrokes = new MutableLiveData<>(); private ScheduledThreadPoolExecutor thread = new ScheduledThreadPoolExecutor(1); @@ -46,7 +47,7 @@ this.mStrokes.getValue().clear(); } - public MutableLiveData getStrokeNo() { + public int getStrokeNo() { return this.mStrokeNo; } @@ -82,8 +83,8 @@ Random random = new Random(); int randomValue = random.nextInt(10000); String s= acanthus.getPreferenceUid().toString()+acanthus.getAid().toString()+String.valueOf(randomValue); - mStrokeNo.setValue(Integer.valueOf(s)); - Log.d("TAG", "setmStrokeNo: "+mStrokeNo.toString()); + mStrokeNo=Integer.valueOf(s); + Log.d("TAG", "setmStrokeNo: "+mStrokeNo); } //----------------------------------------------------------------- @@ -96,14 +97,14 @@ } public void addPositionRequest(float x, float y) { // Log.d("mStrokeNo", mStrokeNo.getValue().toString()); - paintModelContainer.getPaintConnectionModel().addPosition(cnt,x,y,mStrokeNo.getValue()); + paintModelContainer.getPaintConnectionModel().addPosition(cnt,x,y,mStrokeNo); //positionLocalx.add((double)x); //positionLocaly.add((double)y); cnt++; } public void addPositionRequestfirst() { - paintModelContainer.getPaintConnectionModel().addPosition(0,fsx,fsy,mStrokeNo.getValue()); - paintModelContainer.getPaintConnectionModel().addPosition(cnt,-1,-1,mStrokeNo.getValue()); + 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(); @@ -140,7 +141,7 @@ public void run() { // Log.d("debug", "run: "); paintModelContainer.getPaintConnectionModel().getStrokes(mStrokes); - paintModelContainer.getPaintConnectionModel().getStrokeNo(mStrokeNo); + paintModelContainer.getPaintConnectionModel().getStrokeNo(StrokeNo); } //----------------------------------------------------------------- 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 0b4d3d5..e50f09a 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 @@ -63,14 +63,14 @@ //----------------------------------------------------------------- //----------------------------------------------------------------- // ローカルでのストロークの追加(POST) - public void addLocalStroke(MutableLiveData mStrokeNo) { + public void addLocalStroke(int mStrokeNo) { final StrokesRest strokesRest = retrofit.create(StrokesRest.class); Log.d("strokeNo:", "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^add----------------------"); //----------------------------------------------------------------- // ストローク追加API Call call = strokesRest.addStroke( - acanthus.getAid(), acanthus.getEditingPageNo(), 0, acanthus.getPreferenceUid(), acanthus.getPreferenceToken(), + acanthus.getAid(), acanthus.getEditingPageNo(), 0, acanthus.getPreferenceUid(),mStrokeNo, acanthus.getPreferenceToken(), 0, 0, 10); // strokeNoを更新 @@ -91,14 +91,14 @@ //----------------------------------------------------------------- // ローカルでの筆跡追加(POST) - public void addPosition(int i ,double x, double y, int currentStrokeNo) { + public void addPosition(int i ,double x, double y, int mStrokeNo) { final StrokesRest strokesRest = retrofit.create(StrokesRest.class); //Log.d("strokeNo:", currentStrokeNo); //----------------------------------------------------------------- // 座標追加 - Call call = strokesRest.addPositions(i,acanthus.getAid(), currentStrokeNo, x, y); + Call call = strokesRest.addPositions(i,acanthus.getAid(), mStrokeNo, x, y); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { @@ -107,7 +107,6 @@ @Override public void onFailure(Call call, Throwable t) { - Log.d("POSTonFailure: ","i:"+i+",x:"+x+",y:"+y ); } }); }