diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java deleted file mode 100644 index b86e81e..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient; - - -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.EditText; -import android.widget.Toast; - -import org.ntlab.radishforandroidstudio.R; - -public class LoginFragment extends Fragment { - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.login_fragment, container, false); - - } - - - @Override - public void onStart() { - super.onStart(); - - Button button = (Button)getActivity().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.replace(R.id.fragment_place, new SignUpFragment()); - - transaction.commit(); - } - }); - //↑↑↑↑↑画面遷移↑↑↑↑↑↑ - - Button loginButton = (Button)getActivity().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.inputPassword); - - CharSequence userNameText = userName.getText(); - CharSequence passWordText = passWord.getText(); - - - Toast tp = Toast.makeText(getActivity(), passWordText, Toast.LENGTH_SHORT); - tp.setGravity(Gravity.TOP, 0, 0); - tp.show(); - - } - }); - - - - } -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java index 4b3e368..9f1ffe9 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java @@ -5,7 +5,7 @@ import android.support.v7.app.AppCompatActivity; import org.ntlab.radishforandroidstudio.R; - +import org.ntlab.radishforandroidstudio.cactusClient.views.LoginFragment; public class MainActivity extends AppCompatActivity { diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java deleted file mode 100644 index 8396843..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient; - - -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; - -import org.ntlab.radishforandroidstudio.R; - -public class SignUpFragment extends Fragment { - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.sign_up_fragment, container, false); - - } - - //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ - @Override - public void onStart() { - super.onStart(); - - Button button = (Button)getActivity().findViewById(R.id.LoginButton2); - 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.replace(R.id.fragment_place, new LoginFragment()); - transaction.replace(R.id.fragment_place, new LoginFragment()); - - transaction.commit(); - } - }); - - } -} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/test.txt b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/test.txt new file mode 100644 index 0000000..2839ac9 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/test.txt @@ -0,0 +1 @@ +ここに、??connection.javaをいれるぅ \ No newline at end of file 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 new file mode 100644 index 0000000..8a6bb3f --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java @@ -0,0 +1,97 @@ +package org.ntlab.radishforandroidstudio.cactusClient.views; + + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import org.ntlab.radishforandroidstudio.R; + +public class LoginFragment extends Fragment { +// private URIAddressedEntity connection; + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.login_fragment, container, false); + + } + + + @Override + public void onStart() { + super.onStart(); + + Button button = (Button)getActivity().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.replace(R.id.fragment_place, new SignUpFragment()); + + transaction.commit(); + } + }); + //↑↑↑↑↑画面遷移↑↑↑↑↑↑ + + Button loginButton = (Button)getActivity().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); + + CharSequence userNameText = userName.getText(); + CharSequence passWordText = passWord.getText(); + + + + Toast tp = Toast.makeText(getActivity(), passWordText, Toast.LENGTH_SHORT); + tp.setGravity(Gravity.BOTTOM, 0, 0); + tp.show(); + + + + + +// if (userName.getText().toString().isEmpty()) { +// Toast.makeText(getActivity(), "値が未記入です", Toast.LENGTH_SHORT).show(); +// } else { +// +// connection = new URIAddressedEntity(); +// +// connection.setCallBack(new CallBack() { +// @Override +// public void onResponse(String response) { +// //通信した時の処理を書くのだ +// } +// +// }); +// connection.addFormParam("userName", userName.getText().toString()); +// connection.doPost(); +// } + + + + + + } + }); + + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java new file mode 100644 index 0000000..c58c776 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java @@ -0,0 +1,79 @@ +package org.ntlab.radishforandroidstudio.cactusClient.views; + + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; +import org.ntlab.radishforandroidstudio.R; + +public class SignUpFragment extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.sign_up_fragment, container, false); + + } + + //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ + @Override + public void onStart() { + super.onStart(); + + Button button = (Button) getActivity().findViewById(R.id.LoginButton2); + 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.replace(R.id.fragment_place, new LoginFragment()); + transaction.replace(R.id.fragment_place, new LoginFragment()); + + transaction.commit(); + } + }); + + Button sihnupButton = (Button) getActivity().findViewById(R.id.signUp2); + sihnupButton.setOnClickListener(new View.OnClickListener(){ + @Override + public void onClick(View view) { + EditText inputPassword = (EditText)getActivity().findViewById(R.id.inputPassword2); + EditText checkPassWord = (EditText)getActivity().findViewById(R.id.checkPassword); + + String strInputPassword = EditTextChangeToString(inputPassword); + String strCheckPassWord = EditTextChangeToString(checkPassWord); + + if (strInputPassword.isEmpty()) { + Toast.makeText(getActivity(), "パスワードを入力してください", Toast.LENGTH_SHORT).show(); + } else if (strCheckPassWord.isEmpty()) { + Toast.makeText(getActivity(), "確認用パスワードを入力してください", Toast.LENGTH_SHORT).show(); + } else if (!strInputPassword.equals(strCheckPassWord )) { + Toast.makeText(getActivity(), "パスワードが一致しません", Toast.LENGTH_SHORT).show(); + }else{ + Toast.makeText(getActivity(), "アカウント作成に成功しましたよ", Toast.LENGTH_SHORT).show(); + } + } + }); + } + + private static String EditTextChangeToString(EditText text){ + + CharSequence CharSequenceText = text.getText(); + + String str = CharSequenceText.toString(); + + return str; + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/test b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/test deleted file mode 100644 index e69de29..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/test +++ /dev/null diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/CallBack.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/CallBack.java new file mode 100644 index 0000000..1e9238b --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/CallBack.java @@ -0,0 +1,6 @@ +package org.ntlab.radishforandroidstudio.framework.network; + + +public interface CallBack { + public void onResponse(String response); +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java index 2f1fb80..cd6bf85 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java @@ -1,101 +1,111 @@ package org.ntlab.radishforandroidstudio.framework.network; -import android.app.Activity; -import android.os.AsyncTask; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.xml.sax.InputSource; +import android.os.AsyncTask; +import android.util.Log; import java.io.BufferedReader; -import java.io.BufferedWriter; import java.io.IOException; import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.StringReader; +import java.io.OutputStream; import java.net.HttpURLConnection; -import java.net.MalformedURLException; import java.net.URL; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - abstract public class HttpAsyncConnection extends AsyncTask { - private HttpURLConnection conn; - private StringBuffer message = new StringBuffer(); - protected Activity activity = null; + private HttpURLConnection conn = null; + private String baseUrl = null; + private String queryParams = ""; + private String pathParams = ""; + private String formParams = ""; + private CallBack callBack = null; + + + private String method; private static String clientSessionID = null; - public HttpAsyncConnection(String url) { - try { - conn = (HttpURLConnection) new URL(url).openConnection(); - } catch (MalformedURLException e) { - - e.printStackTrace(); - } catch (IOException e) { - - e.printStackTrace(); - } + baseUrl = url; } - public HttpAsyncConnection(String url, Activity activity) { - this(url); - this.activity = activity; - try { - conn = (HttpURLConnection) new URL(url).openConnection(); - } catch (MalformedURLException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } + public void doPost() { + setMethod("POST"); + execute(); + } + + public void doGet() { + setMethod("GET"); + execute(); + } + + public void doPut() { + setMethod("PUT"); + execute(); + } + + public void doDelete() { + setMethod("DELETE"); + execute(); + } + + public void setCallBack(CallBack callBack) { + this.callBack = callBack; + } + + private void setMethod(String method) { + this.method = method; } @Override protected String doInBackground(Void... urls) { - doPost(); - return doGet(); + doAnything(); + return doReceive(); } - // Parse XML - public void onPostExecute(String result) { - // CLLog.debug(""+result); - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + /* (non-Javadoc) + * @see android.os.AsyncTask#onPostExecute(java.lang.Object) + */ + public void onPostExecute(String response) { try { - DocumentBuilder builder = factory.newDocumentBuilder(); - InputSource is = new InputSource(); - is.setCharacterStream(new StringReader(result)); - Document dom = builder.parse(is); - Element root = dom.getDocumentElement(); - receive(root); - }catch(Exception e) { - e.printStackTrace(); + if (callBack != null) callBack.onResponse(response); + } catch (Exception e) { + // TODO: handle exception + Log.d("error", "�G���[�I"); } } - abstract protected void receive(Element root); // request - public void doPost() { + public void doAnything() { try { + if(conn == null) { + if(queryParams == null || queryParams.length() == 0){ + conn = (HttpURLConnection) new URL(baseUrl + pathParams).openConnection(); + } else { + conn = (HttpURLConnection) new URL(baseUrl + pathParams + "?" + queryParams).openConnection(); + } + } conn.setReadTimeout(10000 /* milliseconds */); conn.setConnectTimeout(15000 /* milliseconds */); - // POST or GET - conn.setRequestMethod("POST"); - //conn.setRequestMethod("GET"); + // POST or GET or PUT or DELETE + conn.setRequestMethod(method); - conn.setDoOutput(true); - if(clientSessionID != null) { - conn.setRequestProperty("Cookie", clientSessionID); + if (formParams.length() > 0) { + conn.setDoOutput(true); + if(clientSessionID != null) { + conn.setRequestProperty("Cookie", clientSessionID); + } + OutputStream out = conn.getOutputStream(); + out.write(formParams.getBytes("UTF-8")); + out.flush(); + out.close(); + formParams = ""; } - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream(), "UTF-8")); - writer.write(message.toString()); - message.delete(0,message.length()); - writer.flush(); - writer.close(); + pathParams = ""; + queryParams = ""; + conn.connect(); if(clientSessionID == null ) { clientSessionID = conn.getHeaderField("Set-Cookie"); @@ -108,7 +118,7 @@ } // response - public String doGet() { + public String doReceive() { BufferedReader reader; try { reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); @@ -117,9 +127,11 @@ while((line = reader.readLine()) != null) builder.append(line); reader.close(); + if (conn != null) conn.disconnect(); return builder.toString(); } catch (IOException e) { e.printStackTrace(); + if (conn != null) conn.disconnect(); return null; } @@ -132,20 +144,21 @@ * @param key * @param value */ - public void addParam(String key, String value) { - if(message.length() > 0) { - message.append("&"); + public void addQueryParam(String key, String value) { + if(queryParams.length() > 0) { + queryParams += ("&"); } - message.append(key+"="+value); + queryParams += (key + "=" + value); } - public Activity getActivity() { - return activity; + public void addFormParam(String key, String value) { + if(formParams.length() > 0) { + formParams += "&"; + } + formParams += (key + "=" + value); } - public void setActivity(Activity activity) { - this.activity = activity; - - + public void addPathParam(String param){ + pathParams += "/" + param; } } diff --git a/app/src/main/res/layout/login_fragment.xml b/app/src/main/res/layout/login_fragment.xml index 4d93d9a..b78eccb 100644 --- a/app/src/main/res/layout/login_fragment.xml +++ b/app/src/main/res/layout/login_fragment.xml @@ -37,7 +37,7 @@ android:text="Please enter UserID" /> diff --git a/app/src/main/res/layout/sign_up_fragment.xml b/app/src/main/res/layout/sign_up_fragment.xml index 17563da..1417077 100644 --- a/app/src/main/res/layout/sign_up_fragment.xml +++ b/app/src/main/res/layout/sign_up_fragment.xml @@ -6,15 +6,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/background_light" - tools:context=".cactusClient.SignUpFragment"> + tools:context=".cactusClient.views.SignUpFragment"> @@ -22,9 +20,9 @@ android:id="@+id/password" android:layout_width="150dp" android:layout_height="20dp" - android:layout_alignStart="@+id/inputPassword" - android:layout_below="@+id/inputPassword" - android:layout_marginTop="-107dp" + android:layout_alignParentBottom="true" + android:layout_alignStart="@+id/checkPassword" + android:layout_marginBottom="113dp" android:text="check Password" />