Compare commits

..

No commits in common. "main" and "hotfix-notifivation" have entirely different histories.

7 changed files with 283 additions and 111 deletions

View File

@ -35,7 +35,7 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<service android:name=".SurveillanceService" /> <service android:name=".TestService" />
</application> </application>
</manifest> </manifest>

View File

@ -20,7 +20,7 @@ import androidx.fragment.app.FragmentTransaction;
* Use the {@link HomeFragment#newInstance} factory method to * Use the {@link HomeFragment#newInstance} factory method to
* create an instance of this fragment. * create an instance of this fragment.
*/ */
public class HomeFragment extends Fragment { public class HomeFragment extends Fragment implements OnEventListener {
// TODO: Rename parameter arguments, choose names that match // TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@ -82,7 +82,6 @@ public class HomeFragment extends Fragment {
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
Log.d("HomeFragment", "onResume: called"); Log.d("HomeFragment", "onResume: called");
Log.d("isIncar", "onResume: " + getIsInCarLocal());
this.updateUiState(getIsInCarLocal()); this.updateUiState(getIsInCarLocal());
this.updateBluetoothSituation(isBluetoothConnected()); this.updateBluetoothSituation(isBluetoothConnected());
} }
@ -94,9 +93,21 @@ public class HomeFragment extends Fragment {
private boolean getIsInCarLocal() { private boolean getIsInCarLocal() {
SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE); SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
Boolean isInCar = pref.getBoolean("isInCarPref", false); return pref.getBoolean("isInCar", false);
Log.d("isInCarPref","isInCar"+ isInCar); }
return isInCar;
//画面遷移メソッド
private void replaceFragment(Fragment fragment) {
// フラグメントマネージャーの取得
FragmentManager manager = getParentFragmentManager(); // アクティビティではgetSupportFragmentManager()?
// フラグメントトランザクションの開始
FragmentTransaction transaction = manager.beginTransaction();
// レイアウトをfragmentに置き換え追加
transaction.replace(R.id.fragmentContainerView, fragment);
// 置き換えのトランザクションをバックスタックに保存する
transaction.addToBackStack(null);
// フラグメントトランザクションをコミット
transaction.commit();
} }
/** /**
@ -104,13 +115,12 @@ public class HomeFragment extends Fragment {
*/ */
private boolean updateUiState(boolean isInCar) { private boolean updateUiState(boolean isInCar) {
Log.d("HomeFragment", "updateUiState: called"); Log.d("HomeFragment", "updateUiState: called");
Log.d("HomeFragment", "updateUiState:"+isInCar);
// Init // Init
TextView tv; TextView tv;
FrameLayout fl; FrameLayout fl;
try { try {
tv = requireView().findViewById(R.id.car_situation); tv = requireView().findViewById(R.id.situation);
fl = requireView().findViewById(R.id.car_situation_bg); fl = requireView().findViewById(R.id.situation_bg);
} catch (NullPointerException e) { } catch (NullPointerException e) {
Log.d("HomeFragment", "updateUiState: view is null"); Log.d("HomeFragment", "updateUiState: view is null");
return false; return false;
@ -121,7 +131,7 @@ public class HomeFragment extends Fragment {
return false; return false;
} }
if (isInCar) { if (!isInCar) {
//乗車状態にする //乗車状態にする
fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null)); fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
tv.setText(GET_ON); tv.setText(GET_ON);
@ -137,7 +147,7 @@ public class HomeFragment extends Fragment {
/** /**
* Bluetoothの接続状態の画面を切り替える * Bluetoothの接続状態の画面を切り替える
*/ */
boolean updateBluetoothSituation(Boolean BluetoothConnect) { private boolean updateBluetoothSituation(Boolean BluetoothConnect) {
FrameLayout frameLayout; FrameLayout frameLayout;
TextView textView; TextView textView;
ImageView imageView; ImageView imageView;
@ -171,5 +181,12 @@ public class HomeFragment extends Fragment {
return true; return true;
} }
@Override
public boolean onEvent(boolean isInCar) {//乗車状態と降車状態の変更を受け取ってupdateUiState()に渡す
Log.d("HomeFragment", "onEvent: called");
return updateUiState(isInCar);
}
} }

View File

@ -14,6 +14,7 @@ import android.content.pm.PackageManager;
import android.graphics.Color; import android.graphics.Color;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.os.Vibrator; import android.os.Vibrator;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
@ -25,6 +26,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.fragment.app.Fragment;
import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.firebase.firestore.DocumentReference; import com.google.firebase.firestore.DocumentReference;
@ -45,7 +47,7 @@ public class MainActivity extends AppCompatActivity {
DocumentReference mDocRef; DocumentReference mDocRef;
private HomeFragment homeFragment = HomeFragment.newInstance("test", "test");; private HomeFragment homeFragment;
public static final String TAG = "InspirationQuote"; public static final String TAG = "InspirationQuote";
@ -71,7 +73,7 @@ public class MainActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
Log.d(TAG, "onCreate: called");
//Bluetooth接続判定用 //Bluetooth接続判定用
SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
SharedPreferences.Editor e = pref.edit(); SharedPreferences.Editor e = pref.edit();
@ -85,26 +87,19 @@ public class MainActivity extends AppCompatActivity {
BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view); BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);
this.homeFragment = HomeFragment.newInstance("test", "test"); this.homeFragment = HomeFragment.newInstance("test", "test");
if(savedInstanceState == null){
getSupportFragmentManager().beginTransaction()
.replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment)
.addToBackStack(null)
.commit();
}
bottomNavigationView.setOnNavigationItemSelectedListener(v -> bottomNavigationView.setOnNavigationItemSelectedListener(v ->
{ {
if (v.getItemId() == findViewById(R.id.navigation_home).getId()) { if (v.getItemId() == findViewById(R.id.navigation_home).getId()) {
Log.d("MainActivity", "navigation_home: called");
findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.VISIBLE); findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.VISIBLE);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment) .replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment)
.addToBackStack(null) .addToBackStack(null)
.commit(); .commit();
//firebaseLink(); firebaseLink();
} else if (v.getItemId() == findViewById(R.id.navigation_settings).getId()) { } else if (v.getItemId() == findViewById(R.id.navigation_settings).getId()) {
Log.d("MainActivity", "navigation_settings: called");
findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE); findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.replace(findViewById(R.id.fragmentContainerView).getId(), SettingFragment.newInstance()) .replace(findViewById(R.id.fragmentContainerView).getId(), SettingFragment.newInstance())
@ -122,6 +117,7 @@ public class MainActivity extends AppCompatActivity {
ScanOptions options = new ScanOptions(); ScanOptions options = new ScanOptions();
options.setPrompt("QRコードを読み取ってください"); options.setPrompt("QRコードを読み取ってください");
QrLauncher.launch(options); QrLauncher.launch(options);
}); });
//Bluetooth検知機能 //Bluetooth検知機能
@ -138,7 +134,7 @@ public class MainActivity extends AppCompatActivity {
} }
registerReceiver(receiver, intentFilter); registerReceiver(receiver, intentFilter);
//startForegroundService(new Intent(this, SurveillanceService.class)); startForegroundService(new Intent(this, TestService.class));
} }
@ -146,45 +142,50 @@ public class MainActivity extends AppCompatActivity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
Log.d("MainActivity onResume", "called"); Log.d("onResume", "called");
// Log.d("MainActivity onResume", "mDocRef is null"); Log.d("onResume", "mDocRef is null");
firebaseLink(); firebaseLink();
} }
/**
* 乗車状態の変更 private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
*/ // 共有プリファレンス全体の準備
public void changeIsInCar() { SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
//共有プリファレンス全体の準備
SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE); mDocRef.addSnapshotListener(this, (documentSnapshot, e) -> {
Log.d("nt", "イベント開始");
//共有プリファレンス 書き込みの準備 //共有プリファレンス 書き込みの準備
SharedPreferences.Editor E = sharedPreferences.edit(); SharedPreferences.Editor E = sharedPreferences.edit();
SharedPreferences.Editor E2 = sharedPreferences.edit(); //車の乗り降りを管理するtrue=乗車false=降車
String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得 if (documentSnapshot.exists()) {//exists()でdocumentSnapshotの中のファイルの存在の確認
Log.d("MainActivity", "changeIsInCar: ID= " + IdPref); Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView);
boolean change = sharedPreferences.getBoolean("change", false); Boolean isInCar = sharedPreferences.getBoolean("isInCarPref", false);//現在の乗降状態を保存する共有プリファレンス
Log.d("MainActivity", "changeIsInCar: " + change); E.putBoolean("isInCarPref", documentSnapshot.getBoolean("isInCar"));//乗降状態の判定
db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ E.apply();//確定処理
DocumentReference isReported = db.collection("status").document(IdPref);//更新するドキュメントとの紐づけ Log.d("nt", "レスポンスを検知しました1");
Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言 //FireBaseで更新された情報の判定
if (!change) { if (!documentSnapshot.getBoolean("isReported")) {//isReportedがfalseのとき=サイト上で保護者ボタンが押されたとき
//isInCarをtrueに更新 if (fragment instanceof HomeFragment) {//fragmentがHomeFragmentのインスタンスかの判定
Log.d("MainActivity", "change:"+change); // changes-situation();// changes-situation()メソッドを処理アプリ側の乗降状態を変化
E.putBoolean("change", true); ((HomeFragment) fragment).onEvent(!isInCar);
E.apply();
Log.d("MainActivity", "change:"+sharedPreferences.getBoolean("change",false));
} else {
Log.d("MainActivity", "change:"+change);
E.putBoolean("change", false);
E.apply();
Log.d("MainActivity", "change:"+sharedPreferences.getBoolean("change",false));
} }
Log.d("MainActivity", "changeIsInCar: "+sharedPreferences.getBoolean("change",false)); } else if (isInCar) {//第三者ボタンが押されたときにisInCarがtrueのとき乗車状態のときいたずら防止
isReported.update("isInCar", sharedPreferences.getBoolean("change",false)).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e)); int importance = NotificationManager.IMPORTANCE_DEFAULT;
E2.putBoolean("isInCarPref", sharedPreferences.getBoolean("change",false)); NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通報通知", importance);
E2.apply(); channel.setDescription("第3者からの通報を検知しました");
NotificationManager notificationManager = getSystemService(NotificationManager.class);
notificationManager.createNotificationChannel(channel);
Log.d("nt", "レスポンスを検知しました2");
NotificationSetting();//通知に関する設定のメソッド
Notification(getApplicationContext());//通知を行うメソッド
ResetReported();// ResetReported();メソッドを処理FireBaseのisReportedをfalseにする
} else {//第三者ボタンが押されたときにisInCarがfalseのとき=降車状態のとき
ResetReported();// ResetReported();を処理FireBaseのisReportedをfalseにする
Log.d("nt", "何もなし");
}
}
});
} }
private boolean hasPermissions() { private boolean hasPermissions() {
return ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_GRANTED && return ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_GRANTED &&
@ -229,17 +230,171 @@ public class MainActivity extends AppCompatActivity {
* FireBaseのIDの取得 * FireBaseのIDの取得
*/ */
public void firebaseLink() {//Firebaseのドキュメントの取得 public void firebaseLink() {//Firebaseのドキュメントの取得
Log.d("MainActivity", "firebaseLink: called");
//共有プリファレンス全体の準備 //共有プリファレンス全体の準備
SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE); SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得 String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
if (IdPref == null) { if (IdPref == null) {//FireBaseのIDがアプリに登録されているとき
Log.d("onResume", "ID not initialized."); Log.d("onResume", "ID not initialized.");
} else { } else {
mDocRef = FirebaseFirestore.getInstance().document("status/" + IdPref);//現在の位置を取得 mDocRef = FirebaseFirestore.getInstance().document("status/" + IdPref);//現在の位置を取得
//updateIsInCarPref(mDocRef);//現在の位置を引数に initNotification()を処理 initNotification(mDocRef);//現在の位置を引数に initNotification()を処理
} }
} }
/**
* FireBaseのisReportedをfalseに初期化するメソッド
*/
public void ResetReported() {
//共有プリファレンス全体の準備
SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
DocumentReference isReported = db.collection("status").document(IdPref);//更新するドキュメントとの紐づけ
Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言
//isReportedをfalseに更新
isReported.update("isReported", false).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
}
/**
* 乗車状態の変更
*/
public void changeIsInCar() {
//共有プリファレンス全体の準備
SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
//共有プリファレンス 書き込みの準備
SharedPreferences.Editor E = sharedPreferences.edit();
String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
Boolean change = sharedPreferences.getBoolean("change", false);
db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
DocumentReference isReported = db.collection("status").document(IdPref);//更新するドキュメントとの紐づけ
Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言
if (!change) {
//isInCarをtrueに更新
E.putBoolean("change", true);
} else {
E.putBoolean("change", false);
}
isReported.update("isInCar", change).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
E.apply();
}
/**
* 第三者通知に関する設定のメソッド
*/
public void NotificationSetting() {//通知に関する設定の処理を行うメソッド
int importance = NotificationManager.IMPORTANCE_DEFAULT;
//通知チャネルの実装
NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通知", importance);
channel.setDescription("第三者により置き去りの通報が行われたときに通知します。");
NotificationManager notificationManager = getSystemService(NotificationManager.class);
notificationManager.createNotificationChannel(channel);
}
/**
* 第三者通知を行うメソッド
*/
public void Notification(Context context) {//実際に通知を行うメソッド
final String CHANNEL_ID = "my_channel_id";
// 通知がクリックされたときに送信されるIntent
Intent intent = new Intent(context, MainActivity.class);
intent.setAction("OPEN_ACTIVITY");
// PendingIntentの作成
int requestCode = 100;
int flags = 0;
PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent, flags | PendingIntent.FLAG_IMMUTABLE);
((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(2000);//バイブレーション
@SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
.setSmallIcon(android.R.drawable.ic_menu_info_details)
.setContentTitle("子供の置き去りをしていませんか?")//通知のタイトル
.setContentText("第三者からの通報が行われました。")//通知の本文
.setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
.setAutoCancel(true)//通知をタップすると削除する
.setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
// NotificationChannelの作成Android 8.0以降
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
if (notificationManager != null) {
NotificationChannel channel = new NotificationChannel(
CHANNEL_ID,
"Channel Name",
NotificationManager.IMPORTANCE_HIGH
);
channel.setDescription("Channel Description");
channel.enableLights(true);
channel.setLightColor(Color.RED);
channel.enableVibration(true);
notificationManager.createNotificationChannel(channel);
}
}
NotificationManager notificationManager = (NotificationManager) context.getSystemService(context.NOTIFICATION_SERVICE);
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
return;
}
notificationManager.notify(R.string.app_name, builder.build());//通知の表示
}
@Override
public void onStop() {//アプリをバックグラウンドにした時のメソッド
super.onStop();
// Intent intent = new Intent(getApplication(), TestService.class);
// startService(intent);//TestServiceを起動
}
public void NotificationBluetooth(Context context) {//実際に通知を行うメソッド
final String CHANNEL_ID = "my_channel_id";
// 通知がクリックされたときに送信されるIntent
Intent intent = new Intent(context, MainActivity.class);
intent.setAction("OPEN_ACTIVITY");
// PendingIntentの作成
int requestCode = 100;
int flags = 0;
PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent, flags | PendingIntent.FLAG_IMMUTABLE);
((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(2000);//バイブレーション
@SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
.setSmallIcon(android.R.drawable.ic_menu_info_details)
.setContentTitle("子供の置き去りをしていませんか?")//通知のタイトル
.setContentText("Bluetoothと車の切断から5分が経過しました")//通知の本文
.setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
.setAutoCancel(true)//通知をタップすると削除する
.setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
// NotificationChannelの作成Android 8.0以降
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
if (notificationManager != null) {
NotificationChannel channel = new NotificationChannel(
CHANNEL_ID,
"Channel Name",
NotificationManager.IMPORTANCE_HIGH
);
channel.setDescription("Channel Description");
channel.enableLights(true);
channel.setLightColor(Color.RED);
channel.enableVibration(true);
notificationManager.createNotificationChannel(channel);
}
}
NotificationManager notificationManager = (NotificationManager) context.getSystemService(context.NOTIFICATION_SERVICE);
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
return;
}
notificationManager.notify(R.string.app_name, builder.build());//通知の表示
}
public void Bluetooth_status() { public void Bluetooth_status() {
IntentFilter intentFilter = new IntentFilter(); IntentFilter intentFilter = new IntentFilter();
@ -257,6 +412,10 @@ public class MainActivity extends AppCompatActivity {
private final BroadcastReceiver receiver = new BroadcastReceiver() { private final BroadcastReceiver receiver = new BroadcastReceiver() {
//PreferenceManager.getDefaultSharedPreferences("myPreferences",Context.MODE_PRIVATE);
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
SharedPreferences pref = getSharedPreferences("Bluetooth_situation", MODE_PRIVATE); SharedPreferences pref = getSharedPreferences("Bluetooth_situation", MODE_PRIVATE);
@ -273,7 +432,9 @@ public class MainActivity extends AppCompatActivity {
String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none"); String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) { if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
//Do something if connected
//Bluetoothデバイスが接続されたときの処理 //Bluetoothデバイスが接続されたときの処理
changeBluetooth(true);
Log.d("BT", "Device connected"); Log.d("BT", "Device connected");
Log.d("BT_Judge", "Registered: " + registeredId); Log.d("BT_Judge", "Registered: " + registeredId);
@ -281,11 +442,8 @@ public class MainActivity extends AppCompatActivity {
if (deviceHardwareAddress.equals(registeredId)) { if (deviceHardwareAddress.equals(registeredId)) {
//登録済みのデバイスだったときの処理 //登録済みのデバイスだったときの処理
Log.d("BT_Judge", "登録済み"); Log.d("BT_Judge", "登録済み");
changeBluetooth(true);
e.putBoolean("connection_status", true); e.putBoolean("connection_status", true);
if(homeFragment != null && homeFragment.isVisible()){
homeFragment.updateBluetoothSituation(true);
}
} else { } else {
//登録していないデバイスだったときの処理 //登録していないデバイスだったときの処理
Log.d("BT_Judge", "未登録"); Log.d("BT_Judge", "未登録");
@ -293,12 +451,26 @@ public class MainActivity extends AppCompatActivity {
} }
e.apply(); e.apply();
}else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) { }else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action) && !isInCar) {//bluetoothが切断されたときに乗車状態のとき
//bluetoothデバイスが切断されたときの処理 //
// //Do something if disconnected
//デバイスが切断されたときの処理
changeBluetooth(false); changeBluetooth(false);
if(homeFragment != null && homeFragment.isVisible()){ // if (deviceHardwareAddress.equals(registeredId)) {
homeFragment.updateBluetoothSituation(false); // // 5分待機する
} // Handler handler = new Handler();
// handler.postDelayed(new Runnable() {
// @Override
// public void run() {
// if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action) && !isInCar) {//その後bluetoothを再接続したり降車状態になったりしていない置き去りが発生した可能性大
// NotificationBluetooth(getApplicationContext());//通知を行うメソッド
// }
// }
//
// }, 5 * 1000); // 5分をミリ秒に変換
// }
// } else {
// Log.d("BT", " Device disconnected");
} }
} }
}; };

View File

@ -53,15 +53,15 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
.setMessage("このデバイスを登録しますか?") .setMessage("このデバイスを登録しますか?")
.setPositiveButton(android.R.string.ok, (dialog, which) -> { .setPositiveButton(android.R.string.ok, (dialog, which) -> {
// OK button pressed // OK button pressed
// Toast.makeText(v.getContext(), "OK button clicked", Toast.LENGTH_SHORT).show(); Toast.makeText(v.getContext(), "OK button clicked", Toast.LENGTH_SHORT).show();
//共有プリファレンスに保存 //共有プリファレンスに保存
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this.applicationContext); SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this.applicationContext);
sharedPreferences.edit().putString("bluetooth_device_id", deviceList.get(position)[1]).apply(); sharedPreferences.edit().putString("bluetooth_device_id", deviceList.get(position)[1]).apply();
sharedPreferences.edit().putString("bluetooth_device_name", deviceList.get(position)[0]).apply(); sharedPreferences.edit().putString("bluetooth_device_name", deviceList.get(position)[0]).apply();
// Toast.makeText(v.getContext(), PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_id", "none"), Toast.LENGTH_SHORT).show(); Toast.makeText(v.getContext(), PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_id", "none"), Toast.LENGTH_SHORT).show();
TextView textView = this.parentView.findViewById(R.id.registered_device); TextView textView = this.parentView.findViewById(R.id.registered_device);
textView.setText(PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_name", "登録されていません")); textView.setText(PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_name", "none"));
}) })

View File

@ -3,8 +3,6 @@ package com.example.childguard;
import static android.content.ContentValues.TAG; import static android.content.ContentValues.TAG;
import static android.content.Context.MODE_PRIVATE; import static android.content.Context.MODE_PRIVATE;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
@ -97,7 +95,6 @@ public class SettingFragment extends Fragment {
SharedPreferences.Editor editor = sharedPreferences1.edit(); SharedPreferences.Editor editor = sharedPreferences1.edit();
editor.putString("ID", documentReference.getId()); editor.putString("ID", documentReference.getId());
editor.apply(); editor.apply();
startTestService();
Toast.makeText(getActivity(), "初回登録", Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "初回登録", Toast.LENGTH_SHORT).show();
getParentFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.fragmentContainerView, GenerateQrFragment.newInstance(documentReference.getId())).commit(); getParentFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.fragmentContainerView, GenerateQrFragment.newInstance(documentReference.getId())).commit();
@ -109,11 +106,4 @@ public class SettingFragment extends Fragment {
} }
}); });
} }
private void startTestService() {
Context context = getContext();
if (context != null) {
Intent serviceIntent = new Intent(context, SurveillanceService.class);
context.startForegroundService(serviceIntent);
}
}
} }

View File

@ -27,7 +27,9 @@ import androidx.core.app.NotificationManagerCompat;
import com.google.firebase.firestore.DocumentReference; import com.google.firebase.firestore.DocumentReference;
import com.google.firebase.firestore.FirebaseFirestore; import com.google.firebase.firestore.FirebaseFirestore;
public class SurveillanceService extends Service { import org.checkerframework.checker.index.qual.LengthOf;
public class TestService extends Service {
private final Handler handler = new Handler(); private final Handler handler = new Handler();
private Runnable notificationRunnable; private Runnable notificationRunnable;
@ -67,9 +69,9 @@ public class SurveillanceService extends Service {
private static final String REPORTED_CHANNEL_ID = "child_guard_reported"; private static final String REPORTED_CHANNEL_ID = "child_guard_reported";
private static final String BACKGROUND_CHANNEL_ID = "child_guard_background"; private static final String BACKGROUND_CHANNEL_ID = "child_guard_background";
private static final int REQUEST_CODE = 100; private static final int REQUEST_CODE = 100;
private static final int NOTIFICATION_DELAY = 5 * 60 * 1000; // 5 minutes // private static final int NOTIFICATION_DELAY = 5 * 60 * 1000; // 5 minutes
// DEBUG
private static final int NOTIFICATION_DELAY = 5 * 1000; // 15 seconds
private static final NotificationContent REPORTED_NOTIFICATION = private static final NotificationContent REPORTED_NOTIFICATION =
new NotificationContent("子供の置き去りをしていませんか?", "第三者からの通報が行われました。", REPORTED_CHANNEL_ID, 2); new NotificationContent("子供の置き去りをしていませんか?", "第三者からの通報が行われました。", REPORTED_CHANNEL_ID, 2);
private static final NotificationContent BLUETOOTH_NOTIFICATION = private static final NotificationContent BLUETOOTH_NOTIFICATION =
@ -79,7 +81,6 @@ public class SurveillanceService extends Service {
@Override @Override
public int onStartCommand(Intent intent, int flags, int startId) { public int onStartCommand(Intent intent, int flags, int startId) {
Log.d(TAG, "onStartCommand: ");
this.userId = getSharedPreferences("app_situation", MODE_PRIVATE).getString("ID", null); this.userId = getSharedPreferences("app_situation", MODE_PRIVATE).getString("ID", null);
if (this.userId == null) { if (this.userId == null) {
Log.d("onResume", "ID not initialized."); Log.d("onResume", "ID not initialized.");
@ -220,9 +221,8 @@ public class SurveillanceService extends Service {
editor.apply(); editor.apply();
Log.d("nt", "レスポンスを検知しました1"); Log.d("nt", "レスポンスを検知しました1");
Log.d("SurveillanceService", "Bluetooth: "+sharedPreferences.getBoolean("BluetoothStatusLocal", false));
if (isInCar&&!sharedPreferences.getBoolean("BluetoothStatusLocal", false)) { if (isInCar) {
if (Boolean.TRUE.equals(documentSnapshot.getBoolean("isReported"))) { if (Boolean.TRUE.equals(documentSnapshot.getBoolean("isReported"))) {
resetReported(); resetReported();
sendNotification(getApplicationContext(), REPORTED_NOTIFICATION); sendNotification(getApplicationContext(), REPORTED_NOTIFICATION);
@ -256,7 +256,7 @@ public class SurveillanceService extends Service {
private PendingIntent getPendingIntent(Context context) { private PendingIntent getPendingIntent(Context context) {
Intent intent = new Intent(context, MainActivity.class); Intent intent = new Intent(context, MainActivity.class);
intent.setAction("OPEN_ACTIVITY"); intent.setAction("OPEN_ACTIVITY");
return PendingIntent.getActivity(context, SurveillanceService.REQUEST_CODE, intent, PendingIntent.FLAG_IMMUTABLE); return PendingIntent.getActivity(context, TestService.REQUEST_CODE, intent, PendingIntent.FLAG_IMMUTABLE);
} }
/** /**
@ -317,32 +317,27 @@ public class SurveillanceService extends Service {
Log.d("BT_Judge", "Not registered device"); Log.d("BT_Judge", "Not registered device");
return; return;
} }
boolean isInCar = getSharedPreferences("app_situation", MODE_PRIVATE).getBoolean("change", false); boolean isInCar = !getSharedPreferences("app_situation", MODE_PRIVATE).getBoolean("change", false);
// if (!isInCar) { if (!isInCar) {
// Log.d("BT_Judge", "Not in car"); Log.d("BT_Judge", "Not in car");
// return; return;
// } }
// ----------------------------------------------------- // -----------------------------------------------------
// debug log // debug log
Log.d("BT", "Bluetooth device found: " + deviceHardwareAddress); Log.d("BT", "Bluetooth device found: " + deviceHardwareAddress);
Log.d("BT", "Registered device: " + registeredId); Log.d("BT", "Registered device: " + registeredId);
Log.d("BT", "Is in car: " + isInCar); Log.d("BT", "Is in car: " + isInCar);
SharedPreferences sharedPreferences = SurveillanceService.this.getSharedPreferences("app_situation", MODE_PRIVATE);
SharedPreferences.Editor E = sharedPreferences.edit();
String action = intent.getAction(); // may need to chain this to a recognizing function String action = intent.getAction(); // may need to chain this to a recognizing function
if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) { if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
E.putBoolean("BluetoothStatusLocal", false);
// bluetoothが切断されたときに乗車状態のとき // bluetoothが切断されたときに乗車状態のとき
if (isInCar) {
notificationRunnable = () -> { notificationRunnable = () -> {
// 5分経過した時点でも車に乗っていない場合 // 5分経過した時点でも車に乗っていない場合
sendNotification(context, BLUETOOTH_NOTIFICATION); sendNotification(context, BLUETOOTH_NOTIFICATION);
}; };
}
handler.postDelayed(notificationRunnable, NOTIFICATION_DELAY); handler.postDelayed(notificationRunnable, NOTIFICATION_DELAY);
} else if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) { } else if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
E.putBoolean("BluetoothStatusLocal", true);
// 再接続された場合通知をキャンセルする // 再接続された場合通知をキャンセルする
if (notificationRunnable != null) { if (notificationRunnable != null) {
handler.removeCallbacks(notificationRunnable); handler.removeCallbacks(notificationRunnable);
@ -350,8 +345,6 @@ public class SurveillanceService extends Service {
Log.d("BT", "Notification canceled due to reconnection"); Log.d("BT", "Notification canceled due to reconnection");
} }
} }
E.apply();
Log.d("SurveillanceService:BT", "Bluetooth status: " + sharedPreferences.getBoolean("BluetoothStatusLocal", false));
} }
}; };

View File

@ -19,7 +19,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<FrameLayout <FrameLayout
android:id="@+id/car_situation_bg" android:id="@+id/situation_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
@ -37,7 +37,7 @@
android:textSize="25dp" /> android:textSize="25dp" />
<TextView <TextView
android:id="@+id/car_situation" android:id="@+id/situation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" android:layout_height="200dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"