diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/InvitesConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/InvitesConnectionModel.java deleted file mode 100644 index 8a06abd..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/InvitesConnectionModel.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.ntlab.acanthus_client.views.paint; - -import org.ntlab.acanthus_client.Acanthus; -import org.ntlab.acanthus_client.resources.gallery.InvitesRest; -import org.ntlab.acanthus_client.resources.gallery.StrokesRest; - -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; -import retrofit2.converter.jackson.JacksonConverterFactory; -import retrofit2.converter.scalars.ScalarsConverterFactory; - -//----------------------------------------------------------------- -// 招待関係通信 -public class InvitesConnectionModel { - private Retrofit retrofit; - private Acanthus acanthus; - - //----------------------------------------------------------------- - // - public InvitesConnectionModel(Acanthus acanthus) { - init(acanthus); - } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // init - public void init(Acanthus acanthus) { - this.acanthus = acanthus; - this.retrofit = new Retrofit.Builder() - .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") - .addConverterFactory(ScalarsConverterFactory.create()) - .addConverterFactory(JacksonConverterFactory.create()) - .build(); - } - - //----------------------------------------------------------------- - // 新しい編集者の追加(POST) - public void inviteNewEditor(Integer invitedUid) { - final InvitesRest invitesRest = retrofit.create(InvitesRest.class); - Integer owner = 1; - String token = "abc0"; - int dummy = 1111; - - //----------------------------------------------------------------- - // 招待リクエストを送るAPI - Call call = invitesRest.addInvite(dummy, owner.toString(), invitedUid.toString(), token); - call.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if(response.isSuccessful()); - } - - @Override - public void onFailure(Call call, Throwable t) { - - } - }); - } - //----------------------------------------------------------------- - -} diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintConnectionModel.java deleted file mode 100644 index ac86d13..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintConnectionModel.java +++ /dev/null @@ -1,176 +0,0 @@ -package org.ntlab.acanthus_client.views.paint; - -import android.util.Log; - -import androidx.lifecycle.MutableLiveData; -import androidx.navigation.ActivityNavigator; - -import org.ntlab.acanthus_client.Acanthus; -import org.ntlab.acanthus_client.entities.Animation; -import org.ntlab.acanthus_client.entities.Position; -import org.ntlab.acanthus_client.entities.Stroke; -import org.ntlab.acanthus_client.resources.gallery.GalleryRest; -import org.ntlab.acanthus_client.resources.gallery.StrokesRest; - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Collection; - -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; -import retrofit2.converter.jackson.JacksonConverterFactory; -import retrofit2.converter.scalars.ScalarsConverterFactory; - -//----------------------------------------------------------------- -// 描画通信 -public class PaintConnectionModel { - private Animation editedAnimation; - private Integer currentStrokeNo; - private Retrofit retrofit; - private Acanthus acanthus; - private Collection getPaint; - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // - public PaintConnectionModel(Acanthus acanthus) { - init(acanthus); - } - - //----------------------------------------------------------------- - // setter - public void setEditedAnimation(Animation editedAnimation) { - this.editedAnimation = editedAnimation; - } - - private void setCurrentStrokeNo(int strokeNo) { - this.currentStrokeNo = strokeNo; - } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // init - public void init(Acanthus acanthus) { - this.acanthus = acanthus; - this.getPaint = new ArrayList(); - this.retrofit = new Retrofit.Builder() - .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") - .addConverterFactory(ScalarsConverterFactory.create()) - .addConverterFactory(JacksonConverterFactory.create()) - .build(); - } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // ローカルでのストロークの追加(POST) - public void addLocalStroke() { - final StrokesRest strokesRest = retrofit.create(StrokesRest.class); - - //----------------------------------------------------------------- - // ストローク追加API - Call call = strokesRest.addStroke( - acanthus.getAid(), acanthus.getPreferenceUid(), acanthus.getPreferenceToken(), - 0, 0, 10); - - // strokeNoを更新 - call.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - if (response.isSuccessful()) setCurrentStrokeNo(response.body()); - } - - @Override - public void onFailure(Call call, Throwable t) { - - } - }); - } - - //----------------------------------------------------------------- - // ローカルでの筆跡追加(POST) - public void addPosition(float x, float y) { - final StrokesRest strokesRest = retrofit.create(StrokesRest.class); - - //----------------------------------------------------------------- - // 筆跡追加API - Call call = strokesRest.addPositions(acanthus.getAid(), this.currentStrokeNo, x, y); - call.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - - } - - @Override - public void onFailure(Call call, Throwable t) { - - } - }); - } - - //----------------------------------------------------------------- - //Getを追加 - public void apiGetPosition(MutableLiveData> paintPosition, int num) { - final StrokesRest strokesRest = retrofit.create(StrokesRest.class); - - //----------------------------------------------------------------- - // 筆跡追加API - Call> call = strokesRest.getPositions(acanthus.getAid(), num); - call.enqueue(new Callback>() { - @Override - public void onResponse(Call> call, Response> response) { - if (response.isSuccessful()) paintPosition.setValue(response.body()); - } - - @Override - public void onFailure(Call> call, Throwable t) { - - } - }); - - } - - //----------------------------------------------------------------- - //Getを追加 - public void getStrokeSize(MutableLiveData> strokes) { - final StrokesRest strokesRest = retrofit.create(StrokesRest.class); - - //----------------------------------------------------------------- - // 筆跡追加API - Call> call = strokesRest.getStrokes(acanthus.getAid()); - call.enqueue(new Callback>() { - @Override - public void onResponse(Call> call, Response> response) { - if (response.isSuccessful()) strokes.setValue(response.body()); - } - - @Override - public void onFailure(Call> call, Throwable t) { - - } - }); - - } - - //----------------------------------------------------------------- - //DELETE - public void deleteStrokes() { - final StrokesRest strokesRest = retrofit.create(StrokesRest.class); - - //----------------------------------------------------------------- - // 筆跡をすべて削除する - Call call = strokesRest.deleteStrokes(acanthus.getAid(), acanthus.getPreferenceUid()); - 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 diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModelContainer.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModelContainer.java index a61430d..5ff4f92 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModelContainer.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModelContainer.java @@ -1,6 +1,8 @@ package org.ntlab.acanthus_client.views.paint; import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.views.paint.models.InvitesConnectionModel; +import org.ntlab.acanthus_client.views.paint.models.PaintConnectionModel; //----------------------------------------------------------------- // 各種モデルの保持者 diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/InvitesConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/InvitesConnectionModel.java new file mode 100644 index 0000000..09c4c66 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/InvitesConnectionModel.java @@ -0,0 +1,63 @@ +package org.ntlab.acanthus_client.views.paint.models; + +import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.resources.gallery.InvitesRest; +import org.ntlab.acanthus_client.resources.gallery.StrokesRest; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; + +//----------------------------------------------------------------- +// 招待関係通信 +public class InvitesConnectionModel { + private Retrofit retrofit; + private Acanthus acanthus; + + //----------------------------------------------------------------- + // + public InvitesConnectionModel(Acanthus acanthus) { + init(acanthus); + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // init + public void init(Acanthus acanthus) { + this.acanthus = acanthus; + this.retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(ScalarsConverterFactory.create()) + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + } + + //----------------------------------------------------------------- + // 新しい編集者の追加(POST) + public void inviteNewEditor(Integer invitedUid) { + final InvitesRest invitesRest = retrofit.create(InvitesRest.class); + Integer owner = 1; + String token = "abc0"; + int dummy = 1111; + + //----------------------------------------------------------------- + // 招待リクエストを送るAPI + Call call = invitesRest.addInvite(dummy, owner.toString(), invitedUid.toString(), token); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if(response.isSuccessful()); + } + + @Override + public void onFailure(Call call, Throwable t) { + + } + }); + } + //----------------------------------------------------------------- + +} 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 new file mode 100644 index 0000000..791fa24 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java @@ -0,0 +1,177 @@ +package org.ntlab.acanthus_client.views.paint.models; + +import android.util.Log; + +import androidx.lifecycle.MutableLiveData; +import androidx.navigation.ActivityNavigator; + +import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.entities.Animation; +import org.ntlab.acanthus_client.entities.Position; +import org.ntlab.acanthus_client.entities.Stroke; +import org.ntlab.acanthus_client.resources.gallery.GalleryRest; +import org.ntlab.acanthus_client.resources.gallery.StrokesRest; + +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.Collection; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; + +//----------------------------------------------------------------- +// 描画通信 +public class PaintConnectionModel { + private Animation editedAnimation; + private Integer currentStrokeNo; + private Retrofit retrofit; + private Acanthus acanthus; + private Collection getPaint; + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // + public PaintConnectionModel(Acanthus acanthus) { + init(acanthus); + } + + //----------------------------------------------------------------- + // setter + public void setEditedAnimation(Animation editedAnimation) { + this.editedAnimation = editedAnimation; + } + + private void setCurrentStrokeNo(int strokeNo) { + this.currentStrokeNo = strokeNo; + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // init + public void init(Acanthus acanthus) { + this.acanthus = acanthus; + this.getPaint = new ArrayList(); + this.retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(ScalarsConverterFactory.create()) + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // ローカルでのストロークの追加(POST) + public void addLocalStroke() { + final StrokesRest strokesRest = retrofit.create(StrokesRest.class); + + //----------------------------------------------------------------- + // ストローク追加API + Call call = strokesRest.addStroke( + acanthus.getAid(), acanthus.getPreferenceUid(), acanthus.getPreferenceToken(), + 0, 0, 10); + + // strokeNoを更新 + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()) setCurrentStrokeNo(response.body()); + } + + @Override + public void onFailure(Call call, Throwable t) { + + } + }); + } + + //----------------------------------------------------------------- + // ローカルでの筆跡追加(POST) + public void addPosition(float x, float y) { + final StrokesRest strokesRest = retrofit.create(StrokesRest.class); + + //----------------------------------------------------------------- + // 筆跡追加API + Call call = strokesRest.addPositions(acanthus.getAid(), this.currentStrokeNo, x, y); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + + } + + @Override + public void onFailure(Call call, Throwable t) { + + } + }); + } + + //----------------------------------------------------------------- + //Getを追加 + public void apiGetPosition(MutableLiveData> paintPosition, int num) { + final StrokesRest strokesRest = retrofit.create(StrokesRest.class); + + //----------------------------------------------------------------- + // 筆跡追加API + Call> call = strokesRest.getPositions(acanthus.getAid(), num); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.isSuccessful()) paintPosition.setValue(response.body()); + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); + + } + + //----------------------------------------------------------------- + //Getを追加 + public void getStrokeSize(MutableLiveData> strokes) { + final StrokesRest strokesRest = retrofit.create(StrokesRest.class); + + //----------------------------------------------------------------- + // 筆跡追加API + Call> call = strokesRest.getStrokes(acanthus.getAid()); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.isSuccessful()) strokes.setValue(response.body()); + } + + @Override + public void onFailure(Call> call, Throwable t) { + + } + }); + + } + + //----------------------------------------------------------------- + // "Clear"ボタンによる描画の全消去 / サーバー側の筆跡全削除 + public void deleteStrokes() { + final StrokesRest strokesRest = retrofit.create(StrokesRest.class); + + //----------------------------------------------------------------- + // 筆跡をすべて削除する + Call call = strokesRest.deleteStrokes(acanthus.getAid(), acanthus.getPreferenceUid()); + 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