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 751da75..6fd5f59 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java @@ -1,11 +1,14 @@ package org.ntlab.radishforandroidstudio.cactusClient; import android.app.Activity; +import android.app.ActivityManager; import android.app.Application; import android.os.Bundle; import org.ntlab.radishforandroidstudio.cactusClient.models.Account; +import java.util.List; + public class Cactus extends Application { private Account myAccount = null; @@ -15,12 +18,20 @@ registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() { @Override public void onActivityCreated(Activity activity, Bundle savedInstanceState) { + ActivityManager activityManager = ((ActivityManager) getSystemService(ACTIVITY_SERVICE)); + List taskInfo = activityManager.getRunningTasks(5); + int activity_num = taskInfo.get(0).numRunning; + if (activity_num <= 1) { + // loadの処理 + + } } @Override public void onActivityStarted(Activity activity) { + } @Override @@ -35,6 +46,13 @@ @Override public void onActivityStopped(Activity activity) { + ActivityManager activityManager = ((ActivityManager) getSystemService(ACTIVITY_SERVICE)); + List taskInfo = activityManager.getRunningTasks(5); + int activity_num = taskInfo.get(0).numRunning; + if (activity_num <= 1) { + // saveの処理 + + } } @@ -54,14 +72,13 @@ public Account getMyAccount(){ - return null; + return myAccount; } - public Account setMyAccount(Account ac){ - - return ac; + public void setMyAccount(Account ac){ + myAccount = ac; } - + } 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 index 87d46d4..1d9fb3c 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java @@ -1,14 +1,16 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; -import static org.apache.commons.lang3.RandomStringUtils.random; - //あとで最新版に変える必要がある public class Account { - private String id,name, pass, token; + private String id, name, token; + @JSONHint(ignore = true) + private String pass, uniqueID; + @JSONHint(ignore = true) private boolean login = false; - public Account(String userName, String userPass) { + public Account(String userID, String userName, String userPass) { + setId(userID); setName(userName); setPass(userPass); } @@ -50,15 +52,15 @@ } public String formToken() { - token = random(64, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"); + token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC); return token; } - public Account getAccount(String token) { - if (this.token == token) { - return this; - } else { - return null; - } + public String getUniqueID() { + return uniqueID; + } + + public void setUniqueID(String uniqueID) { + this.uniqueID = uniqueID; } } \ No newline at end of file