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 2fb1662..8f5da61 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 @@ -63,4 +63,16 @@ // @GET("gallery/{aid}/images") Call> getPageUrls(@Path("aid") Integer aid); + + //----------------------------------------------------------------- + // + @GET("gallery/{aid}/pageMap/{pid}/image") + Call getLayers(@Path("aid") Integer aid, @Path("pid") Integer pid); + + //----------------------------------------------------------------- + // + @FormUrlEncoded + @POST("gallery/{aid}/pageMap/{pid}/image") + Call addImage(@Path("aid") Integer aid, @Path("pid") Integer pid, @Field("image") String image); + } \ No newline at end of file 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 49cd83a..b4cf4f9 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 @@ -206,6 +206,8 @@ image.compress(Bitmap.CompressFormat.PNG, 100, stream); byte[] byteArray = stream.toByteArray(); String encode = Base64.getEncoder().encodeToString(byteArray); + paintViewModel.setImage(encode); + Log.d("motion", "=====================================up======================================================"); Log.d("motion", "=====================================up======================================================"); int stringcnt=0; @@ -215,6 +217,8 @@ stringcnt++; } Log.d("encode:", encode.substring(4000*stringcnt,encode.length())); + + image.recycle(); ResetImage(); } 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 f9c4e99..4f841ab 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 @@ -218,6 +218,12 @@ } //----------------------------------------------------------------- + //サーバーに画像データ(BASE64)を送る + public void setImage(String image){ + paintModelContainer.getPaintConnectionModel().setImage(image); + } + + //----------------------------------------------------------------- // public void stop() { thread.shutdown(); 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 3e06146..60caa1e 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 @@ -192,5 +192,25 @@ } //----------------------------------------------------------------- + // "screenssc()"が実行されたとき、エンコードした文字列(BASE64)をサーバに送る + public void setImage(String image){ + final StrokesRest strokesRest = retrofit.create(StrokesRest.class); + + //----------------------------------------------------------------- + Call call = strokesRest.addImage(acanthus.getAid(), acanthus.getEditingPageId(), image); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + } + + @Override + public void onFailure(Call call, Throwable t) { + } + }); + + } + + + //----------------------------------------------------------------- } \ No newline at end of file