diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f93e69f..c2eb7d1 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..88aeebb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,6 +27,7 @@ implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support.constraint:constraint-layout:1.1.0' + implementation 'org.apache.commons:commons-lang3:3.6' 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' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e329a11..52afd6c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ android:required="false" /> - - - - + + + + diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java index 184ea00..0542318 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java @@ -1,7 +1,59 @@ package org.ntlab.radishforandroidstudio.cactusClient; +import android.app.Activity; import android.app.Application; +import android.os.Bundle; + +import org.ntlab.radishforandroidstudio.cactusClient.models.AccountsConnection; public class Cactus extends Application { + private AccountsConnection accountsConnection = 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) { + + } + }); + } + + //accountの設定 + public AccountsConnection getAccountsConnection() { +// accountsConnection = new AccountsConnection(); + return accountsConnection; + } } + diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java new file mode 100644 index 0000000..4718069 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java @@ -0,0 +1,63 @@ +package org.ntlab.radishforandroidstudio.cactusClient.models; + +import static org.apache.commons.lang3.RandomStringUtils.random; + + +public class Account { + private String id,name, pass, token; + private boolean login = false; + + public Account(String userName, String userPass) { + setName(userName); + setPass(userPass); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPass() { + return pass; + } + + public void setPass(String pass) { + this.pass = pass; + } + + public boolean isLogin() { + return login; + } + + public void setLogin(boolean login) { + this.login = login; + } + + public String getToken() { + return token; + } + + public String formToken() { + token = random(64, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"); + return token; + } + + public Account getAccount(String token) { + if (this.token == token) { + return this; + } else { + return null; + } + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AccountsConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AccountsConnection.java new file mode 100644 index 0000000..4dfeaaf --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AccountsConnection.java @@ -0,0 +1,20 @@ +package org.ntlab.radishforandroidstudio.cactusClient.models; + +import org.ntlab.radishforandroidstudio.framework.network.HttpAsyncConnection; +import org.w3c.dom.Element; + +public class AccountsConnection extends HttpAsyncConnection { + public AccountsConnection(String url) { + super(url); + } + + @Override + protected void receive(Element root) { + + } +// public AccountsConnection() { +// super("http://nitta-lab-www2.is.konan-u.ac.jp:8080/Cactus/accounts"); +// +// } + +}