diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 4bd28f7..7f74339 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
-
+
-
+
\ 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 a7f86ff..4088f9a 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
@@ -38,7 +38,11 @@
private int localstrokeNo = 0;
private Canvas curCanvas;
private Bitmap image;
- private ArrayList pts;
+ private int curw;
+ private int curh;
+ private int curoldw;
+ private int curoldh;
+
//-----------------------------------------------------------------
//-----------------------------------------------------------------
@@ -57,7 +61,6 @@
paint2.setStrokeWidth(20);//幅
//image = Bitmap.createBitmap(640, 480, Bitmap.Config.ARGB_8888);
//curCanvas = new Canvas(image);
- pts=new ArrayList<>();
thread.scheduleWithFixedDelay(this, 1000L, 2000L, TimeUnit.MILLISECONDS);
invalidate();
@@ -111,14 +114,11 @@
Log.d("motion", "move");
onTouchedMove(x, y);
paintViewModel.addPositionRequest(x, y);
- curCanvas.drawBitmap(image,x,y,paint);
break;
case MotionEvent.ACTION_UP:
Log.d("motion", "=====================================up======================================================");
paintViewModel.addPositionRequestFirst();
- //drawCanvas();
- pts.clear();
break;
}
@@ -141,9 +141,6 @@
//path = new Path();
Point curpoint = new Point();
path.moveTo(x, y);
- curpoint.setX(x);
- curpoint.setY(y);
- pts.add(curpoint);
invalidate();
}
@@ -152,9 +149,6 @@
private void onTouchedMove(float x, float y) {
path.lineTo(x, y);
Point curpoint = new Point();
- curpoint.setX(x);
- curpoint.setY(y);
- pts.add(curpoint);
invalidate();
}
@@ -202,26 +196,34 @@
ByteArrayOutputStream stream = new ByteArrayOutputStream();
image.compress(Bitmap.CompressFormat.PNG, 100, stream);
byte[] byteArray = stream.toByteArray();
- byte[] encode = Base64.getEncoder().encode(byteArray);
+ String encode = Base64.getEncoder().encodeToString(byteArray);
Log.d("motion", "=====================================up======================================================");
Log.d("motion", "=====================================up======================================================");
- Log.d("byteArray", byteArray.toString());
- Log.d("byteImage", encode.toString());
-
- System.out.println("size:" + encode.length);
-
- for (int i = 0; i < encode.length; i++) {
- Byte b = encode[i];
- System.out.println("b[" + i + "]" + b.toString());
+ int stringcnt=0;
+ int last=0;
+ for(int i = 0; i 1){
- Path path = new Path();
- final int SMOOTH_VAL = 6;
- for(int i = pts.size() - 2; i < pts.size(); i++){
- if(i >= 0){
- Point point = pts.get(i);
-
- if(i == 0){
- Point next = pts.get(i + 1);
- point.setDx(((next.getX() - point.getX()) / SMOOTH_VAL));
- point.setDy(((next.getY() - point.getY()) / SMOOTH_VAL));
- }
- else if(i == pts.size() - 1){
- Point prev = pts.get(i - 1);
- point.setDx(((point.getX() - prev.getX()) / SMOOTH_VAL));
- point.setDy(((point.getY() - prev.getY()) / SMOOTH_VAL));
- }
- else{
- Point next = pts.get(i + 1);
- Point prev = pts.get(i - 1);
- point.setDx( ((next.getX() - prev.getX()) / SMOOTH_VAL));
- point.setDy( ((next.getY() - prev.getY()) / SMOOTH_VAL));
- }
- }
- }
-
- boolean first = true;
- for(int i = 0; i < pts.size(); i++){
- Point point = pts.get(i);
- if(first){
- first = false;
- path.moveTo(point.getX(), point.getX());
- }
- else{
- Point prev = pts.get(i - 1);
- path.cubicTo(prev.getX() + prev.getDx(), prev.getY() + prev.getDy(), point.getX() - point.getDx(), point.getY() - point.getDy(), point.getX(), point.getY());
- }
- }
- curCanvas.drawPath(path, paint);
- } else {
- if (pts.size() == 1) {
- Point point = pts.get(0);
- curCanvas.drawCircle(point.getX(), point.getY(), 2, paint);
- }
- }
- }
}
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java
index 6a1dab4..b8ca99e 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java
@@ -5,7 +5,6 @@
import android.os.Handler;
import android.view.View;
import android.widget.ImageView;
-import android.widget.TextView;
import com.bumptech.glide.Glide;