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 eaf49ad..a7f86ff 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,6 @@ private int localstrokeNo = 0; private Canvas curCanvas; private Bitmap image; - private Point curpoint; private ArrayList pts; //----------------------------------------------------------------- @@ -56,10 +55,9 @@ paint2.setColor(Color.RED);//色の指定 paint2.setStyle(Paint.Style.STROKE);//線をひく paint2.setStrokeWidth(20);//幅 - image = Bitmap.createBitmap(640, 480, Bitmap.Config.ARGB_8888); - curCanvas = new Canvas(image); + //image = Bitmap.createBitmap(640, 480, Bitmap.Config.ARGB_8888); + //curCanvas = new Canvas(image); pts=new ArrayList<>(); - Point curpoint= new Point(); thread.scheduleWithFixedDelay(this, 1000L, 2000L, TimeUnit.MILLISECONDS); invalidate(); @@ -82,13 +80,13 @@ // @Override protected void onDraw(Canvas canvas) { - super.onDraw(canvas); + super.onDraw(curCanvas); //canvas.setBitmap(image); - - curCanvas = canvas; - + //curCanvas = canvas; canvas.drawPath(path, paint); canvas.drawPath(path2, paint2); + curCanvas.drawPath(path, paint); + curCanvas.drawPath(path2, paint2); } //----------------------------------------------------------------- @@ -119,7 +117,7 @@ case MotionEvent.ACTION_UP: Log.d("motion", "=====================================up======================================================"); paintViewModel.addPositionRequestFirst(); - drawCanvas(); + //drawCanvas(); pts.clear(); break; } @@ -141,6 +139,7 @@ // 押した瞬間の処理 private void onTouched(float x, float y) { //path = new Path(); + Point curpoint = new Point(); path.moveTo(x, y); curpoint.setX(x); curpoint.setY(y); @@ -152,6 +151,7 @@ // 押した後動かした時の処理 private void onTouchedMove(float x, float y) { path.lineTo(x, y); + Point curpoint = new Point(); curpoint.setX(x); curpoint.setY(y); pts.add(curpoint); @@ -199,11 +199,6 @@ @RequiresApi(api = Build.VERSION_CODES.O) public void canvassc() { - image = Bitmap.createBitmap(640, 480, Bitmap.Config.ARGB_8888); - curCanvas = new Canvas(image); - draw(curCanvas); - - ByteArrayOutputStream stream = new ByteArrayOutputStream(); image.compress(Bitmap.CompressFormat.PNG, 100, stream); byte[] byteArray = stream.toByteArray(); @@ -219,7 +214,6 @@ Byte b = encode[i]; System.out.println("b[" + i + "]" + b.toString()); } - image.recycle(); } @@ -227,7 +221,7 @@ @Override protected void onSizeChanged(int w, int h, int oldw, int oldh){ super.onSizeChanged(w, h, oldw, oldh); - image = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888); + image = Bitmap.createBitmap(680, 1200, Bitmap.Config.ARGB_8888); curCanvas = new Canvas(image); curCanvas.drawColor(0xFFFFFFFF); }