diff --git a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java index ac5e45a..d050520 100644 --- a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java +++ b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java @@ -9,6 +9,7 @@ import com.example.cosmosclient.entities.Group; import android.content.SharedPreferences; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -18,6 +19,7 @@ private HashMap groups = new HashMap<>(); private String uId=null; private HashMap areaInfo = new HashMap<>(); + private ArrayList areaInfoKey= new ArrayList<>(); private String TAG = Cosmos.class.getSimpleName(); public Cosmos() { @@ -153,4 +155,11 @@ return areaInfo.get(areaId); } + public ArrayList AreaInfoGetKey(){ + for(int key : areaInfo.keySet()){ + areaInfoKey.add(key); + } + return areaInfoKey; + } + } diff --git a/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java b/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java index d194049..9ac43be 100644 --- a/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java +++ b/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java @@ -234,6 +234,9 @@ // Log.d(TAG, "onLocationChanged"); Log.d(TAG, "lat:" + location.getLatitude()); Log.d(TAG, "lon:" + location.getLongitude()); + + updateAreaInformation(location); + } @@ -345,4 +348,8 @@ startActivity(settingsIntent); } + private void updateAreaInformation(Location location){ + + } + } diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java index b5cfe59..9b75c51 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java @@ -66,6 +66,14 @@ Cosmos app = (Cosmos) getApplication(); String account = app.getuId(); + String token = app.getToken(); + +// //ログアウトしていない場合singnin画面を表示しない +// if(token != ""){ +// Intent intent = new Intent(getApplication(), GroupListActivity.class); +// startActivity(intent); +// finish(); +// } // 空チェック if (account != null && account.length() > 0) {