diff --git a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java index d30d202..e79c3b3 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java +++ b/app/src/main/java/org/ntlab/acanthus_client/Acanthus.java @@ -6,64 +6,72 @@ //----------------------------------------------------------------- // ユーザーアカウント public class Acanthus extends Application { + //----------------------------------------------------------------- private Integer preferenceUid; private String preferenceName; private String preferenceEmail; private String preferencePassword; private String preferenceToken; + //----------------------------------------------------------------- + private Integer aid; //----------------------------------------------------------------- - // setter - public Integer getPreferenceUid(){ - if(preferenceUid == null){ - SharedPreferences preferences = getSharedPreferences("prefData",MODE_PRIVATE); + // getter + public Integer getPreferenceUid() { + if (preferenceUid == null) { + SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); preferenceUid = preferences.getInt("uid", 0); } return preferenceUid; } public String getPreferenceName() { - if(preferenceName == null){ - SharedPreferences preferences = getSharedPreferences("prefData",MODE_PRIVATE); + if (preferenceName == null) { + SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); preferenceName = preferences.getString("name", ""); } return preferenceName; } public String getPreferenceEmail() { - if(preferenceEmail == null){ - SharedPreferences preferences = getSharedPreferences("prefData",MODE_PRIVATE); + if (preferenceEmail == null) { + SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); preferenceEmail = preferences.getString("email", ""); } return preferenceEmail; } public String getPreferencePassword() { - if(preferencePassword == null){ - SharedPreferences preferences = getSharedPreferences("prefData",MODE_PRIVATE); + if (preferencePassword == null) { + SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); preferencePassword = preferences.getString("password", ""); } return preferencePassword; } public String getPreferenceToken() { - if(preferenceToken == null){ - SharedPreferences preferences = getSharedPreferences("prefData",MODE_PRIVATE); + if (preferenceToken == null) { + SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); preferenceToken = preferences.getString("token", ""); } return preferenceToken; } + public Integer getAid() { + if (this.aid == null) this.aid = 1111; + return aid; + } + //----------------------------------------------------------------- // setter - public void setPreferenceUid(Integer preferenceUid){ + public void setPreferenceUid(Integer preferenceUid) { SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putInt("uid", preferenceUid); editor.commit(); } - public void setPreferenceName(String preferenceName){ + public void setPreferenceName(String preferenceName) { SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putString("name", preferenceName); @@ -77,19 +85,22 @@ editor.commit(); } - public void setPreferencePassword(String preferencePassword){ + public void setPreferencePassword(String preferencePassword) { SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putString("password", preferencePassword); editor.commit(); } - public void setPreferenceToken(String preferenceToken){ + public void setPreferenceToken(String preferenceToken) { SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); editor.putString("token", preferenceToken); editor.commit(); } + public void setAid(Integer aid) { + this.aid = aid; + } //----------------------------------------------------------------- } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java new file mode 100644 index 0000000..8f9dc88 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java @@ -0,0 +1,63 @@ +package org.ntlab.acanthus_client.views.paint; + +import android.graphics.Paint; +import android.view.View; + +import androidx.lifecycle.ViewModel; + +import org.ntlab.acanthus_client.Acanthus; +import org.ntlab.acanthus_client.resources.accounts.LoginRest; +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 PaintViewModel extends ViewModel { + private Retrofit retrofit; + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + public PaintViewModel() { + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(ScalarsConverterFactory.create()) + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // + public void addPosition(Acanthus acanthus, int strokeNo, float x, float y) { + final StrokesRest strokesRest = retrofit.create(StrokesRest.class); + + //----------------------------------------------------------------- + // + Call call = strokesRest.addPositions(acanthus.getAid(), strokeNo, x, y); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { +// if(response.isSuccessful()) + } + + @Override + public void onFailure(Call call, Throwable t) { + + } + }); + } + + //----------------------------------------------------------------- + // + public void getRemoteAnimationInfo() { + } + + +}