diff --git a/.gitignore b/.gitignore
index 5b82029..d9f7d9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
+/.idea/caches
.DS_Store
/build
/captures
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 3ad325b..327a66c 100644
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
Binary files differ
diff --git a/app/build.gradle b/app/build.gradle
index 14b2299..e7dd389 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,4 +30,5 @@
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+ implementation files('/Users/matsumotoayaju/AndroidStudioProjects/Cactus２/lib/jsonic-1.3.9/jsonic-1.3.9.jar')
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0b3dc16..1eef02c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
android:required="false" />
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -55,6 +44,8 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
new file mode 100644
index 0000000..c4a6c46
--- /dev/null
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
@@ -0,0 +1,64 @@
+package org.ntlab.radishforandroidstudio.cactusClient;
+
+import android.accounts.Account;
+import android.app.Activity;
+import android.app.Application;
+import android.os.Bundle;
+
+public class Cactus extends Application {
+
+ private Account myAccount = null;
+
+ public Cactus() {
+
+ registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
+ @Override
+ public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+
+ }
+
+ @Override
+ public void onActivityStarted(Activity activity) {
+
+
+ }
+
+ @Override
+ public void onActivityResumed(Activity activity) {
+
+ }
+
+ @Override
+ public void onActivityPaused(Activity activity) {
+
+ }
+
+ @Override
+ public void onActivityStopped(Activity activity) {
+
+ }
+
+ @Override
+ public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+
+ }
+
+ @Override
+ public void onActivityDestroyed(Activity activity) {
+
+ }
+ });
+ }
+
+ //MyAccountの追加
+ public Account getMyAccount(){
+ return myAccount;
+ }
+
+ public void setMyAccount(Account ac){
+ myAccount = ac;
+ }
+
+}
+
+
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 a39069b..0000000
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.ntlab.radishforandroidstudio.cactusClient;
-
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-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, container, false);
- }
-}
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 9e21f6f..ca51f9c 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 {
@@ -17,24 +17,8 @@
Fragment fragment;
fragment = new LoginFragment();
- getSupportFragmentManager().beginTransaction()
- .replace(R.id.fragment_place, fragment)
- .commit();
+ getSupportFragmentManager().beginTransaction().add(R.id.fragment_place, fragment).commit();
}
-
-
-// public void ChangeFragment(View view) {
-// Fragment fragment;
-// //inportに注意：import android.support.v4.app.Fragment;
-//
-//
-// if (view == findViewById(R.id.loginButton)) {
-// fragment = new LoginFragment();
-// getSupportFragmentManager().beginTransaction()
-// .replace(R.id.fragment_place, fragment)
-// .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/viewModels/test b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test
index e69de29..d75fa73 100644
--- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test
+++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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..84b31ad
--- /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/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c5ea249..ef10842 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,17 +5,19 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".cactusClient.MainActivity"
+ android:id="@+id/fragment_place"
tools:layout_editor_absoluteY="73dp">
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/login.xml b/app/src/main/res/layout/login.xml
deleted file mode 100644
index 17221f5..0000000
--- a/app/src/main/res/layout/login.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/login_fragment.xml b/app/src/main/res/layout/login_fragment.xml
new file mode 100644
index 0000000..b78eccb
--- /dev/null
+++ b/app/src/main/res/layout/login_fragment.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/sign_up_fragment.xml b/app/src/main/res/layout/sign_up_fragment.xml
new file mode 100644
index 0000000..1417077
--- /dev/null
+++ b/app/src/main/res/layout/sign_up_fragment.xml
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file