diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 18e6d9e..bbe8375 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,7 +29,6 @@ android:theme="@style/SplashTheme"> - 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 new file mode 100644 index 0000000..a266b04 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/UseCases/LoginUseCases.java @@ -0,0 +1,19 @@ +package org.ntlab.radishforandroidstudio.cactusClient.UseCases; + +import org.ntlab.radishforandroidstudio.cactusClient.Entities.CactusUserEntity; +import org.ntlab.radishforandroidstudio.cactusClient.models.CactusUserModel; + +public class LoginUseCases { + + public void LoginUseCase(){} + + void transform(CactusUserEntity cactusUserEntity){ + CactusUserModel cactusUserModel =null; + if (cactusUserEntity != null){ + cactusUserModel=new CactusUserModel(cactusUserEntity.getUserId()); +// cactusUserModel.setUserPass(); + } + + } + +} 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 new file mode 100644 index 0000000..b6f3115 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/AddUserFormParam.java @@ -0,0 +1,9 @@ +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 eab90f3..1d1d5b5 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 @@ -1,5 +1,7 @@ package org.ntlab.radishforandroidstudio.cactusClient.controller; +import android.widget.EditText; + import net.arnx.jsonic.JSON; import net.arnx.jsonic.TypeReference; @@ -16,10 +18,13 @@ String userPass; Cactus cactus; - public UserLoginController(Cactus cactus, String userId, String userPass) { - this.userId = userId; - this.userPass = userPass; - this.cactus=cactus; + public UserLoginController(Cactus cactus, EditText userName, EditText passWord) { + this.userId = userName.getText().toString(); + this.userPass = passWord.getText().toString(); + this.cactus = cactus; + } + + public UserLoginController() { } public boolean login() { @@ -42,10 +47,7 @@ public void addUserFormParam() { loginFragmentConnection.addFormParam("userID", userId); loginFragmentConnection.addFormParam("userPass", userPass); - - } - - public void doPut(){ loginFragmentConnection.doPut(); } + } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusUserModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusUserModel.java new file mode 100644 index 0000000..7b6fe9c --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/CactusUserModel.java @@ -0,0 +1,25 @@ +package org.ntlab.radishforandroidstudio.cactusClient.models; + +/** + * Controllerが扱うユーザを表すクラス + */ +public class CactusUserModel { + private final String userId; + private String userPass; + + public CactusUserModel(String userId) { + this.userId = userId; + } + + public String getUserId() { + return userId; + } + + public String getUserPass() { + return userPass; + } + + public void setUserPass(String userPass) { + this.userPass = userPass; + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/CactusUserModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/CactusUserModel.java deleted file mode 100644 index a138851..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/account/CactusUserModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient.models.account; - -public class CactusUserModel { -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java index 9b688d6..65dcff8 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java @@ -17,24 +17,22 @@ public class LoginFragment extends Fragment { - - private Boolean testFlag = false; //trueにすると、通信せずにインスタンス画面へ遷移します。つまり、通信なしでテストするなら"true"にせい + Cactus cactus; + UserLoginController userLoginController; + boolean isUserLogin; + EditText userName; + EditText passWord; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.login_fragment, container, false); - } - - @Override - public void onStart() { - super.onStart(); + View view = inflater.inflate(R.layout.login_fragment, container, false); //サインアップ画面に移動 - Button button = (Button) getActivity().findViewById(R.id.signUP1); + Button button = (Button) view.findViewById(R.id.signUP1); button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - //Toast.makeText(getActivity(), "hoge!", Toast.LENGTH_SHORT).show(); + //サインアップ画面に移動 FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); transaction.addToBackStack(null); @@ -44,23 +42,12 @@ }); //ログイン処理 - Button loginButton = (Button) getActivity().findViewById(R.id.login); + Button loginButton = (Button) view.findViewById(R.id.login); loginButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - EditText userName = (EditText) getActivity().findViewById(R.id.inputUserName); - EditText passWord = (EditText) getActivity().findViewById(R.id.checkPassword); - -// /**************************************************************** -// if (testFlag) { -// FragmentManager manager = getFragmentManager(); -// FragmentTransaction transaction = manager.beginTransaction(); -// transaction.replace(R.id.fragment_place, new InstancesFragment()); -// transaction.commit(); -// return; -// } -// **********************************************************************/ - + userName = (EditText) getActivity().findViewById(R.id.inputUserName); + passWord = (EditText) getActivity().findViewById(R.id.checkPassword); if (userName.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show(); @@ -72,15 +59,10 @@ //通信処理 - String userID = userName.getText().toString(); - String userPass = passWord.getText().toString(); - boolean isUserLogin; - Cactus cactus = (Cactus) getActivity().getApplication(); - UserLoginController userLoginController = new UserLoginController(cactus,userID, userPass); + cactus = (Cactus) getActivity().getApplication(); + userLoginController = new UserLoginController(cactus, userName, passWord); isUserLogin = userLoginController.login(); - - if (isUserLogin) { Toast.makeText(getActivity(), "ログインに成功しました。", Toast.LENGTH_SHORT).show(); //画面遷移 @@ -92,11 +74,13 @@ Toast.makeText(getActivity(), "ログインに失敗しました。", Toast.LENGTH_SHORT).show(); } - userLoginController.addUserFormParam(); - if (testFlag==false)userLoginController.doPut(); } }); + + UserLoginController userLoginController = new UserLoginController(); + userLoginController.addUserFormParam(); + return view; } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java index 5ab28fd..a665386 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java @@ -10,10 +10,7 @@ import android.view.ViewGroup; import android.widget.Button; -import net.arnx.jsonic.JSON; - import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; public class StartFragment extends Fragment {