diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Entities/CactusAPIEntity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Entities/CactusAPIEntity.java new file mode 100644 index 0000000..1bcbbf4 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Entities/CactusAPIEntity.java @@ -0,0 +1,10 @@ +package org.ntlab.radishforandroidstudio.cactusClient.Entities; + +/** + * ネットワークからデータを取得するためのRestAPI + */ + +public interface CactusAPIEntity { + + String API_BASE_URI ="http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/"; +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Entities/CactusConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Entities/CactusConnection.java new file mode 100644 index 0000000..8208995 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Entities/CactusConnection.java @@ -0,0 +1,14 @@ +package org.ntlab.radishforandroidstudio.cactusClient.Entities; + +import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection; + +public class CactusConnection extends HttpAsyncConnection { + + + public CactusConnection(String url) { + super(url); + } + + +} + diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Entities/CactusConnectionEntity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Entities/CactusConnectionEntity.java new file mode 100644 index 0000000..3df5664 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Entities/CactusConnectionEntity.java @@ -0,0 +1,11 @@ +package org.ntlab.radishforandroidstudio.cactusClient.Entities; + +public class CactusConnectionEntity implements CactusAPIEntity { + + private String LOGIN_URL = API_BASE_URI +"accounts"; + + public String getLOGIN_URL() { + return LOGIN_URL; + } + +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/LoginUseCases.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/LoginUseCases.java index a266b04..5d3ed21 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/LoginUseCases.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/LoginUseCases.java @@ -1,19 +1,17 @@ package org.ntlab.radishforandroidstudio.cactusClient.UseCases; -import org.ntlab.radishforandroidstudio.cactusClient.Entities.CactusUserEntity; -import org.ntlab.radishforandroidstudio.cactusClient.models.CactusUserModel; +import org.ntlab.radishforandroidstudio.cactusClient.Entities.CactusConnectionEntity; -public class LoginUseCases { +public class LoginUseCases extends UseCase { - public void LoginUseCase(){} + private String LOGIN_URL; + private CactusConnectionEntity cactusConnectionEntity; - void transform(CactusUserEntity cactusUserEntity){ - CactusUserModel cactusUserModel =null; - if (cactusUserEntity != null){ - cactusUserModel=new CactusUserModel(cactusUserEntity.getUserId()); -// cactusUserModel.setUserPass(); - } - + public String userLoginURL() { + cactusConnectionEntity = new CactusConnectionEntity(); + LOGIN_URL = cactusConnectionEntity.getLOGIN_URL(); + return LOGIN_URL; } + } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/UseCase.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/UseCase.java new file mode 100644 index 0000000..852587d --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/UseCase.java @@ -0,0 +1,6 @@ +package org.ntlab.radishforandroidstudio.cactusClient.UseCases; + +public class UseCase { + + +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/AddUserFormParam.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/AddUserFormParam.java deleted file mode 100644 index b6f3115..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/AddUserFormParam.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.controller; - -public class AddUserFormParam { - - public AddUserFormParam(){ - - - } -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/UserLoginController.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/UserLoginController.java index e0a1d9a..79339e1 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/UserLoginController.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/UserLoginController.java @@ -9,32 +9,44 @@ import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.Cactus; -import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection; +import org.ntlab.radishforandroidstudio.cactusClient.Entities.CactusConnection; +import org.ntlab.radishforandroidstudio.cactusClient.UseCases.LoginUseCases; import org.ntlab.radishforandroidstudio.cactusClient.models.account.Account; import org.ntlab.radishforandroidstudio.cactusClient.models.account.URIAddressedAccount; import org.ntlab.radishforandroidstudio.cactusClient.views.InstancesFragment; import org.ntlab.radishforandroidstudio.framework.network.CallBack; public class UserLoginController { - private LoginFragmentConnection connection; + private Cactus userCactus; private String userID; private String userPass; + private String Login_URL; private FragmentManager manager; + LoginUseCases loginUseCases; + CactusConnection loginConnection; + public UserLoginController(Cactus cactus, EditText userName, EditText passWord, FragmentManager fragmentManager) { - connection = new LoginFragmentConnection(); + this.userID = userName.getText().toString(); this.userPass = passWord.getText().toString(); this.userCactus = cactus; this.manager = fragmentManager; + + connection(); } + private void connection() { + loginUseCases = new LoginUseCases(); + Login_URL = loginUseCases.userLoginURL(); + loginConnection = new CactusConnection(Login_URL); + } public void addFormParam() { - connection.addFormParam("userID", userID); - connection.addFormParam("userPass", userPass); - connection.doPut(); + loginConnection.addFormParam("userID", userID); + loginConnection.addFormParam("userPass", userPass); + loginConnection.doPut(); } @@ -55,12 +67,13 @@ } } + public void loginResponse() { - connection.setCallBack(new CallBack() { + + loginConnection.setCallBack(new CallBack() { @Override public void onResponse(String response) { changeJson(response); - } }); }