Fork: 0
nitta-lab-2021 / org.ntlab.acanthus_client
Browse code
リアルタイムで描写ができるようになりました。
README master
1 parent 1088203 commit 1a6421ae658dbb68817802d08d51d312fee52280
r-kuraoka authored on 5 Oct 2021
Patch
Unified Split
Showing 2 changed files
View
17
■■■■■
 app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java
//(3-1)座標を取得（x座標、y座標）
float x = event.getX();
float y = event.getY();
 
 
//(3-2)タッチの処理
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
Log.d("motion", "+++++++++++++++++++++++++++++++++++++++down======================================================");
onTouched(x, y);
paintViewModel.addLocalStrokeRequest();
paintViewModel.addLocalStrokeRequest(x,y);
//paintViewModel.addPositionLocal(x, y);
break;
 
case MotionEvent.ACTION_MOVE:
Log.d("motion", "move");
onTouchedMove(x, y);
paintViewModel.addPositionLocal(x, y);
paintViewModel.addPositionRequest(x,y);
break;
 
case MotionEvent.ACTION_UP:
Log.d("motion", "=====================================up======================================================");
paintViewModel.addPositionRequest();
paintViewModel.addPositionRequestfirst();
break;
}
 
 
}
 
//描写するための取得
public void getCanvas() {
int cnt = 1;
path2.reset();//ここで一旦クリア
int cnt = 0;
path2.reset();
invalidate();
for (Stroke s : paintViewModel.getStroke().getValue()) {
for (Position p : s.getPositions()) {
if (cnt == 1) {
if (cnt == 0) {
onTouched2(p.getX(), p.getY());
} else if(cnt==p.getI()){
} else{
onTouchedMove2(p.getX(), p.getY());
}
cnt++;
}
View
67
■■■■■
 app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java
private ScheduledThreadPoolExecutor thread = new ScheduledThreadPoolExecutor(1);
private ArrayList<Double>positionLocalx = new ArrayList<>();
private ArrayList<Double>positionLocaly = new ArrayList<>();
private ArrayList<Integer>localstrokeNo = new ArrayList<>();
private ArrayList<Double>positionLocalx2 = new ArrayList<>();
private ArrayList<Double>positionLocaly2 = new ArrayList<>();
private ArrayList<Integer>localstrokeNo2 = new ArrayList<>();
private int cnt=0;
private float fsx=0;
private float fsy=0;
//-----------------------------------------------------------------
// getter
public MutableLiveData<Collection<Stroke>> getStroke() {
return this.mStrokes;
}
 
//-----------------------------------------------------------------
// 描画APIの通信リクエスト
public void addLocalStrokeRequest() {
public void addLocalStrokeRequest(float x,float y) {
paintModelContainer.getPaintConnectionModel().addLocalStroke(mStrokeNo);
fsx=x;
fsy=y;
cnt=1;
}
 
public void addPositionLocal(float x , float y) {
// if(positionLocalx.size()==0) {
positionLocalx.add((double) x);
positionLocaly.add((double) y);
localstrokeNo.add(mStrokeNo.getValue());
//}else{
// positionLocalx2.add((double) x);
// positionLocaly2.add((double) y);
// localstrokeNo2.add(mStrokeNo.getValue());
//}
public void addPositionRequest(float x, float y) {
paintModelContainer.getPaintConnectionModel().addPosition(cnt,x,y,mStrokeNo.getValue());
cnt++;
}
public void addPositionRequest() {
// if(positionLocalx.size()!=0) {
for (int i = 0; i < positionLocalx.size(); i++) {
paintModelContainer.getPaintConnectionModel().addPosition(i, positionLocalx.get(i), positionLocaly.get(i),mStrokeNo.getValue());
}
positionLocalx.clear();
positionLocaly.clear();
localstrokeNo.clear();
// }
// if(positionLocalx2.size()!=0) {
// for (int i = 0; i < positionLocalx2.size(); i++) {
// paintModelContainer.getPaintConnectionModel().addPosition(i, positionLocalx2.get(i), positionLocaly2.get(i), localstrokeNo2.get(i));
// }
// positionLocalx2.clear();
// positionLocaly2.clear();
// localstrokeNo2.clear();
// }
public void addPositionRequestfirst() {
paintModelContainer.getPaintConnectionModel().addPosition(0,fsx,fsy,mStrokeNo.getValue());
}
 
//-----------------------------------------------------------------
// 招待APIの通信リクエスト