diff --git a/app/src/main/java/com/example/citrusclient/Citrus.java b/app/src/main/java/com/example/citrusclient/Citrus.java index c9bd0fc..52505ac 100644 --- a/app/src/main/java/com/example/citrusclient/Citrus.java +++ b/app/src/main/java/com/example/citrusclient/Citrus.java @@ -13,7 +13,6 @@ private Integer curDay; private String curLookingAccountId; private Integer curLookingBookId; - private String accountColor; //getter public String getToken(){ return token; @@ -27,7 +26,6 @@ public Integer getCurDay(){return curDay;} public String getCurLookingAccountId(){return curLookingAccountId;} public Integer getCurLookingBookId(){return curLookingBookId;} - public String getAccountColor(){return accountColor;} //setter public void setToken(String token){ this.token = token; @@ -41,5 +39,4 @@ public void setCurDay(Integer curDay){this.curDay = curDay;} public void setCurLookingAccountId(String curLookingAccountId){this.curLookingAccountId = curLookingAccountId;} public void setCurLookingBookId(Integer curLookingBookId){this.curLookingBookId = curLookingBookId;} - public void setAccountColor(String accountColor){this.accountColor = accountColor;} } diff --git a/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java b/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java index 007d4ea..592ecd2 100644 --- a/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java +++ b/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java @@ -5,6 +5,7 @@ import retrofit2.http.DELETE; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; import retrofit2.http.POST; import retrofit2.http.PUT; import retrofit2.http.Path; @@ -52,6 +53,13 @@ @Query("token") String token, @Query("password") String password ); + //仮 + //アカウントの色を返す + @FormUrlEncoded + @GET("accounts/{account_id}/accountColor") + Call getAccountColor( + @Path("account_id") String account_id + ); //仮 //アカウントカラー変更 @@ -63,8 +71,10 @@ @Field("token") String token ); + //仮 + //アカウント変更 @FormUrlEncoded - @PUT("accounts/{account_id") + @PUT("accounts/{account_id}") Call changeAccount( @Path("account_id") String account_id, @Field("new_account_id") String new_account_id, diff --git a/app/src/main/java/com/example/citrusclient/viewmodels/SettingsViewModel.java b/app/src/main/java/com/example/citrusclient/viewmodels/SettingsViewModel.java index 022b6ef..d58ef10 100644 --- a/app/src/main/java/com/example/citrusclient/viewmodels/SettingsViewModel.java +++ b/app/src/main/java/com/example/citrusclient/viewmodels/SettingsViewModel.java @@ -3,6 +3,9 @@ import com.example.citrusclient.Citrus; import com.example.citrusclient.rest.AccountsRest; +import java.net.HttpCookie; + +import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; import retrofit2.Call; import retrofit2.Callback; @@ -13,8 +16,8 @@ public class SettingsViewModel extends ViewModel { private final Retrofit retrofit; private final AccountsRest accountsRest; + private final MutableLiveData accountColorLiveData; - private Citrus citrus; public SettingsViewModel(){ retrofit = new Retrofit.Builder() @@ -22,12 +25,36 @@ .addConverterFactory(JacksonConverterFactory.create()) .build(); this.accountsRest = retrofit.create(AccountsRest.class); + this.accountColorLiveData = new MutableLiveData<>(); + } + public MutableLiveData getAccountColorLiveData(){return accountColorLiveData;} + + public void loadAccountColor(String accountId){ + Call call= accountsRest.getAccountColor(accountId); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + String strAccountColor = response.body(); + if (response.isSuccessful()){ + System.out.println("success"); + accountColorLiveData.setValue(strAccountColor); + }else{ + System.out.println("fail"); + } + } + + @Override + public void onFailure(Call call, Throwable t) { + System.out.println("NetworkError"+t); + + } + }); } //なんちゃって通信ver1 //PW変更時のサーバ通信プログラム public void changePW(String accountId, String old_password, String new_password,String token){ - Call call = accountsRest.changePW(accountId,old_password,new_password,token); + Call call = accountsRest.changePW(accountId, old_password, new_password, token); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { @@ -71,14 +98,14 @@ //通信Ver3 //色変更 - public void changeColor(String accountId,String accountColor, String token){ - Call call =accountsRest.changeColor(accountId,accountColor,token); + public void changeColor(String accountId, String accountColor, String token){ + Call call =accountsRest.changeColor(accountId, accountColor, token); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { if(response.isSuccessful()){ System.out.println("success"); - citrus.setAccountColor(accountColor); + }else{ System.out.println("fail"); } @@ -93,14 +120,13 @@ //通信Ver4 //アカウント名変更 - public void changeAccount(String accountId,String accountColor, String token){ - Call call =accountsRest.changeColor(accountId,accountColor,token); + public void changeAccount(String accountId, String accountColor, String token){ + Call call =accountsRest.changeColor(accountId, accountColor, token); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { if(response.isSuccessful()){ System.out.println("success"); - citrus.setAccountId(accountColor); }else{ System.out.println("fail"); } diff --git a/app/src/main/java/com/example/citrusclient/views/SignUpActivity.java b/app/src/main/java/com/example/citrusclient/views/SignUpActivity.java index 926957b..d1385fc 100644 --- a/app/src/main/java/com/example/citrusclient/views/SignUpActivity.java +++ b/app/src/main/java/com/example/citrusclient/views/SignUpActivity.java @@ -101,8 +101,7 @@ //端末にtoken.id登録 String token = response.body(); citrus.setToken(token); - citrus.setAccountId(id); - citrus.setAccountColor("#D5D5D5"); + //画面遷移 handler.post(new Runnable() {