diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java index 14fc7e1..6512913 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingActivity.java @@ -84,8 +84,6 @@ } }); - //getKeywordの呼び出し - drawingStateViewModel.init(); //タイマースタート呼び出し drawingStateViewModel.start(500,(Iris)getApplication()); } diff --git a/app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java b/app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java index 59b645d..0f8ee1e 100644 --- a/app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java +++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java @@ -3,6 +3,7 @@ import android.graphics.Bitmap; +import org.ntlab.irisclient.Iris; import org.ntlab.irisclient.models.Member; import org.ntlab.irisclient.resources.DrawingRest; import org.ntlab.irisclient.resources.RoomsRest; @@ -22,7 +23,7 @@ import retrofit2.converter.jackson.JacksonConverterFactory; public class DrawingStateViewModel extends TimerViewModel { - + //フィールド final private MutableLiveData stateMutableLiveData=new MutableLiveData<>(); final private MutableLiveData dnoMutableLiveData=new MutableLiveData<>(); final private MutableLiveData drawingMutableLiveData = new MutableLiveData<>(); @@ -33,18 +34,14 @@ private Integer dnoPreData = null; private String drawingPreData; - private String rid; - private String nickName; private List keywords; - //フィールド + public DrawingStateViewModel() { this.retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/") .addConverterFactory(JacksonConverterFactory.create()) .build(); - rid = iris.getRid(); - nickName = iris.getNickname(); } //ゲッター @@ -142,22 +139,16 @@ return this.stateMutableLiveData; } - public void setRid(String rid){ - this.rid = rid; - } - public void setKeywords(List keywords){ - this.keywords = keywords; - } - public void setNickName(String nickName){ - this.nickName = nickName; - } - - public void init(){ + public void start(int interval, Iris iris) { + super.start(interval, iris); + String rid = iris.getRid(); updateKeywords(rid); } @Override public void update() { + String rid = iris.getRid(); + String nickName = iris.getNickname(); updateState(rid); updateDno(rid, nickName); } @@ -171,7 +162,7 @@ final DrawingRest drawingRest = retrofit.create(DrawingRest.class); Integer dno = dnoMutableLiveData.getValue(); - Call call = drawingRest.putDrawing(rid, dno, encoded ); + Call call = drawingRest.putDrawing(iris.getRid(), dno, encoded ); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) {