diff --git a/app/src/main/java/com/example/cosmosclient/entities/AreaInformation.java b/app/src/main/java/com/example/cosmosclient/entities/AreaInformation.java index 812b702..9bd78c9 100644 --- a/app/src/main/java/com/example/cosmosclient/entities/AreaInformation.java +++ b/app/src/main/java/com/example/cosmosclient/entities/AreaInformation.java @@ -5,7 +5,7 @@ import java.util.HashMap; public class AreaInformation { - public Location location; + public Location location = new Location(); public HashMap> feature = new HashMap<>(); public Time lastUpdated; diff --git a/app/src/main/java/com/example/cosmosclient/entities/Feature.java b/app/src/main/java/com/example/cosmosclient/entities/Feature.java index 37a6d2c..adfc4d5 100644 --- a/app/src/main/java/com/example/cosmosclient/entities/Feature.java +++ b/app/src/main/java/com/example/cosmosclient/entities/Feature.java @@ -3,5 +3,5 @@ public class Feature { public String name; public int code; - public Location location; + public Location location = new 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 d266d44..371839f 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java @@ -18,6 +18,7 @@ import com.example.cosmosclient.R; import com.example.cosmosclient.app.Cosmos; +import com.example.cosmosclient.entities.AreaInformation; import com.example.cosmosclient.entities.SigninResponse; import com.example.cosmosclient.resources.UsersRest; @@ -100,46 +101,52 @@ app.setToken(result.token); app.setuId(UserIdText.getText().toString()); +// AreaInformation area = new AreaInformation(); +// area.location.longitude = 23.222; +// area.location.latitude = 23.333; +// app.setAreaInfo(area.location.hashCode(),area); +// AreaInformation aaa = app.getAreaInfo(123456); + //画面遷移 Intent intent = new Intent(getApplication(), GroupListActivity.class); startActivity(intent); Toast.makeText(SigninActivity.this, "ログインしました", Toast.LENGTH_SHORT).show(); - //通知オブジェクトの用意と初期化 - Notification notification = null; - - //システムから通知マネージャー取得 - NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE); - //アプリ名をチャンネルIDとして利用 - String chID = getString(R.string.app_name); - - //アンドロイドのバージョンで振り分け - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { //APIが「26」以上の場合 - - //通知チャンネルIDを生成してインスタンス化 - NotificationChannel notificationChannel = new NotificationChannel(chID, chID, NotificationManager.IMPORTANCE_DEFAULT); - //通知の説明のセット - notificationChannel.setDescription(chID); - //通知チャンネルの作成 - notificationManager.createNotificationChannel(notificationChannel); - //通知の生成と設定とビルド - notification = new Notification.Builder(SigninActivity.this, chID) - .setContentTitle(getString(R.string.app_name)) //通知タイトル - .setContentText("通知確認") //通知内容 - .setSmallIcon(R.drawable.default_icon_image) //通知用アイコン - .build(); //通知のビルド - } else { - //APIが「25」以下の場合 - //通知の生成と設定とビルド -// notification = new Notification.Builder(SigninActivity.this) -// .setContentTitle(getString(R.string.app_name)) -// .setContentText("アプリ通知テスト25まで") -// .setSmallIcon(R.drawable.default_icon_image) -// .build(); - } - //通知の発行 - notificationManager.notify(1, notification); +// //通知オブジェクトの用意と初期化 +// Notification notification = null; +// +// //システムから通知マネージャー取得 +// NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE); +// //アプリ名をチャンネルIDとして利用 +// String chID = getString(R.string.app_name); +// +// //アンドロイドのバージョンで振り分け +// if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { //APIが「26」以上の場合 +// +// //通知チャンネルIDを生成してインスタンス化 +// NotificationChannel notificationChannel = new NotificationChannel(chID, chID, NotificationManager.IMPORTANCE_DEFAULT); +// //通知の説明のセット +// notificationChannel.setDescription(chID); +// //通知チャンネルの作成 +// notificationManager.createNotificationChannel(notificationChannel); +// //通知の生成と設定とビルド +// notification = new Notification.Builder(SigninActivity.this, chID) +// .setContentTitle(getString(R.string.app_name)) //通知タイトル +// .setContentText("通知確認") //通知内容 +// .setSmallIcon(R.drawable.default_icon_image) //通知用アイコン +// .build(); //通知のビルド +// } else { +// //APIが「25」以下の場合 +// //通知の生成と設定とビルド +//// notification = new Notification.Builder(SigninActivity.this) +//// .setContentTitle(getString(R.string.app_name)) +//// .setContentText("アプリ通知テスト25まで") +//// .setSmallIcon(R.drawable.default_icon_image) +//// .build(); +// } +// //通知の発行 +// notificationManager.notify(1, notification); finish(); }else{