Merge pull request '微修正' (#37) from hotfix-Fine-adjustment into main

Reviewed-on: #37

app/src/main/AndroidManifest.xml

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

app/src/main/java/com/example/childguard/HomeFragment.java

@@ -20,7 +20,7 @@ import androidx.fragment.app.FragmentTransaction;
  * Use the {@link HomeFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
-public class HomeFragment extends Fragment implements OnEventListener {
+public class HomeFragment extends Fragment  {
 
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -31,6 +31,9 @@ public class HomeFragment extends Fragment implements OnEventListener {
     private String str_key;
     private String mParam2;
 
+    final String GET_ON = "\n乗車状態";
+    final String GET_OFF = "\n降車状態";
+
 
     public HomeFragment() {
         // Required empty public constructor
@@ -79,6 +82,7 @@ public class HomeFragment extends Fragment implements OnEventListener {
     public void onResume() {
         super.onResume();
         Log.d("HomeFragment", "onResume: called");
+        Log.d("isIncar", "onResume: " + getIsInCarLocal());
         this.updateUiState(getIsInCarLocal());
         this.updateBluetoothSituation(isBluetoothConnected());
     }
@@ -90,31 +94,23 @@ public class HomeFragment extends Fragment implements OnEventListener {
 
     private boolean getIsInCarLocal() {
         SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
-        return pref.getBoolean("isInCar", false);
+        Boolean isInCar = pref.getBoolean("isInCarPref", 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();
     }
 
+    /**
+     * 乗車状態の画面を切り替える
+     */
     private boolean updateUiState(boolean isInCar) {
         Log.d("HomeFragment", "updateUiState: called");
+        Log.d("HomeFragment", "updateUiState:"+isInCar);
         // Init
         TextView tv;
         FrameLayout fl;
         try {
-            tv = requireView().findViewById(R.id.situation);
+            tv = requireView().findViewById(R.id.car_situation);
-            fl = requireView().findViewById(R.id.situation_bg);
+            fl = requireView().findViewById(R.id.car_situation_bg);
         } catch (NullPointerException e) {
             Log.d("HomeFragment", "updateUiState: view is null");
             return false;
@@ -124,16 +120,15 @@ public class HomeFragment extends Fragment implements OnEventListener {
             updateUiState(isInCar);
             return false;
         }
-        String get_on = "\n乗車状態";
+
-        String get_off = "\n降車状態";
+        if (isInCar) {
-        if (!isInCar) {
             //乗車状態にする
             fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
-            tv.setText(get_on);
+            tv.setText(GET_ON);
         } else {
             //降車状態にする
             fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null));
-            tv.setText(get_off);
+            tv.setText(GET_OFF);
         }
 
         return true;
@@ -142,7 +137,7 @@ public class HomeFragment extends Fragment implements OnEventListener {
     /**
      * Bluetoothの接続状態の画面を切り替える
      */
-    private boolean updateBluetoothSituation(Boolean BluetoothConnect) {
+    boolean updateBluetoothSituation(Boolean BluetoothConnect) {
         FrameLayout frameLayout;
         TextView textView;
         ImageView imageView;
@@ -167,7 +162,7 @@ public class HomeFragment extends Fragment implements OnEventListener {
             textView.setText(CONNECT);
             imageView.setVisibility(View.GONE);
         } else {
-            //降車状態にする
+            //切断状態にする
             frameLayout.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null));
             textView.setText(DISCONNECT);
             imageView.setVisibility(View.VISIBLE);
@@ -176,12 +171,5 @@ public class HomeFragment extends Fragment implements OnEventListener {
         return true;
     }
 
-
-    @Override
-    public boolean onEvent(boolean isInCar) {//乗車状態と降車状態の変更を受け取ってupdateUiState()に渡す
-        Log.d("HomeFragment", "onEvent: called");
-
-        return updateUiState(isInCar);
-    }
 }
 

app/src/main/java/com/example/childguard/MainActivity.java

@@ -14,7 +14,6 @@ import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -26,7 +25,6 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.NotificationCompat;
-import androidx.fragment.app.Fragment;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.firebase.firestore.DocumentReference;
@@ -47,7 +45,7 @@ public class MainActivity extends AppCompatActivity {
 
     DocumentReference mDocRef;
 
-    private HomeFragment homeFragment;
+    private HomeFragment homeFragment = HomeFragment.newInstance("test", "test");;
 
     public static final String TAG = "InspirationQuote";
 
@@ -73,7 +71,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
+        Log.d(TAG, "onCreate: called");
         //Bluetooth接続判定用
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
         SharedPreferences.Editor e = pref.edit();
@@ -87,19 +85,26 @@ public class MainActivity extends AppCompatActivity {
         BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);
 
         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 ->
-
         {
             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);
                 getSupportFragmentManager().beginTransaction()
                         .replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment)
                         .addToBackStack(null)
                         .commit();
-                firebaseLink();
+                //firebaseLink();
 
             } 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);
                 getSupportFragmentManager().beginTransaction()
                         .replace(findViewById(R.id.fragmentContainerView).getId(), SettingFragment.newInstance())
@@ -117,7 +122,6 @@ public class MainActivity extends AppCompatActivity {
             ScanOptions options = new ScanOptions();
             options.setPrompt("QRコードを読み取ってください");
             QrLauncher.launch(options);
-
         });
 
         //Bluetooth検知機能
@@ -134,7 +138,7 @@ public class MainActivity extends AppCompatActivity {
         }
         registerReceiver(receiver, intentFilter);
 
-        startForegroundService(new Intent(this, TestService.class));
+        //startForegroundService(new Intent(this, SurveillanceService.class));
 
     }
 
@@ -142,51 +146,46 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        Log.d("onResume", "called");
+        Log.d("MainActivity onResume", "called");
-        Log.d("onResume", "mDocRef is null");
+//        Log.d("MainActivity onResume", "mDocRef is null");
         firebaseLink();
     }
-
+    /**
-    private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
+     * 乗車状態の変更
-        // 共有プリファレンス全体の準備
+     */
-        SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
+    public void changeIsInCar() {
-
+        //共有プリファレンス全体の準備
-        mDocRef.addSnapshotListener(this, (documentSnapshot, e) -> {
+        SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
-
-            Log.d("nt", "イベント開始");
         //共有プリファレンス 書き込みの準備
         SharedPreferences.Editor E = sharedPreferences.edit();
-            //車の乗り降りを管理するtrue=乗車、false=降車
+        SharedPreferences.Editor E2 = sharedPreferences.edit();
-            if (documentSnapshot.exists()) {//exists()でdocumentSnapshotの中のファイルの存在の確認
+        String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
-                Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView);
+        Log.d("MainActivity", "changeIsInCar: ID= " + IdPref);
-                Boolean isInCar = sharedPreferences.getBoolean("isInCarPref", false);//現在の乗降状態を保存する共有プリファレンス
+        boolean change = sharedPreferences.getBoolean("change", false);
-                E.putBoolean("isInCarPref", documentSnapshot.getBoolean("isInCar"));//乗降状態の判定
+        Log.d("MainActivity", "changeIsInCar: " + change);
-                E.apply();//確定処理
+        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
-                Log.d("nt", "レスポンスを検知しました1");
+        DocumentReference isReported = db.collection("status").document(IdPref);//更新するドキュメントとの紐づけ
-                //FireBaseで更新された情報の判定
+        Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言
-                if (!documentSnapshot.getBoolean("isReported")) {//isReportedがfalseのとき=サイト上で保護者ボタンが押されたとき
+        if (!change) {
-                    if (fragment instanceof HomeFragment) {//fragmentがHomeFragmentのインスタンスかの判定
+            //isInCarをtrueに更新
-//                        changes-situation();//  changes-situation()メソッドを処理→アプリ側の乗降状態を変化
+            Log.d("MainActivity", "change:"+change);
-                        ((HomeFragment) fragment).onEvent(!isInCar);
+            E.putBoolean("change", true);
+            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));
         }
-                } else if (isInCar) {//第三者ボタンが押されたときにisInCarがtrueのとき＝乗車状態のとき→いたずら防止
+        Log.d("MainActivity", "changeIsInCar: "+sharedPreferences.getBoolean("change",false));
-                    int importance = NotificationManager.IMPORTANCE_DEFAULT;
+        isReported.update("isInCar", sharedPreferences.getBoolean("change",false)).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
-                    NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通報通知", importance);
+        E2.putBoolean("isInCarPref", sharedPreferences.getBoolean("change",false));
-                    channel.setDescription("第3者からの通報を検知しました");
+        E2.apply();
-                    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() {
         return ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_GRANTED &&
                 ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_ADMIN) == PackageManager.PERMISSION_GRANTED &&
@@ -230,162 +229,18 @@ public class MainActivity extends AppCompatActivity {
      * FireBaseのIDの取得
      */
     public void firebaseLink() {//Firebaseのドキュメントの取得
+        Log.d("MainActivity", "firebaseLink: called");
         //共有プリファレンス全体の準備
         SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
         String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
-        if (IdPref == null) {//FireBaseのIDがアプリに登録されているとき
+        if (IdPref == null) {
             Log.d("onResume", "ID not initialized.");
         } else {
             mDocRef = FirebaseFirestore.getInstance().document("status/" + IdPref);//現在の位置を取得
-            initNotification(mDocRef);//現在の位置を引数に initNotification()を処理
+            //updateIsInCarPref(mDocRef);//現在の位置を引数に initNotification()を処理
         }
     }
 
-    public void ResetReported() {//FireBaseのisReportedをfalseに初期化するメソッド
-        //共有プリファレンス全体の準備
-        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() {
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
@@ -402,10 +257,6 @@ public class MainActivity extends AppCompatActivity {
 
 
     private final BroadcastReceiver receiver = new BroadcastReceiver() {
-
-
-        //PreferenceManager.getDefaultSharedPreferences("myPreferences",Context.MODE_PRIVATE);
-
         @Override
         public void onReceive(Context context, Intent intent) {
             SharedPreferences pref = getSharedPreferences("Bluetooth_situation", MODE_PRIVATE);
@@ -422,9 +273,7 @@ public class MainActivity extends AppCompatActivity {
             String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
 
             if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
-                //Do something if connected
                 //Bluetoothデバイスが接続されたときの処理
-                changeBluetooth(true);
                 Log.d("BT", "Device connected");
 
                 Log.d("BT_Judge", "Registered: " + registeredId);
@@ -432,8 +281,11 @@ public class MainActivity extends AppCompatActivity {
                 if (deviceHardwareAddress.equals(registeredId)) {
                     //登録済みのデバイスだったときの処理
                     Log.d("BT_Judge", "登録済み");
+                    changeBluetooth(true);
                     e.putBoolean("connection_status", true);
-
+                    if(homeFragment != null && homeFragment.isVisible()){
+                        homeFragment.updateBluetoothSituation(true);
+                    }
                 } else {
                     //登録していないデバイスだったときの処理
                     Log.d("BT_Judge", "未登録");
@@ -441,30 +293,19 @@ public class MainActivity extends AppCompatActivity {
                 }
                 e.apply();
 
-            } else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action) && !isInCar) {//bluetoothが切断されたときに乗車状態のとき
+            }else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
-
+                //bluetoothデバイスが切断されたときの処理
-                //Do something if disconnected
-                //デバイスが切断されたときの処理
                 changeBluetooth(false);
-                if (deviceHardwareAddress.equals(registeredId)) {
+                if(homeFragment != null && homeFragment.isVisible()){
-                    // 5分待機する
+                    homeFragment.updateBluetoothSituation(false);
-                    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");
-            }
         }
     };
 
+    /**
+     * Bluetoothの接続状態を変更するメソッド
+     */
     public void changeBluetooth(boolean actual) {
         getSharedPreferences("Bluetooth_situation", MODE_PRIVATE).edit().putBoolean("status", actual).apply();
     }

app/src/main/java/com/example/childguard/RecyclerAdapter.java

@@ -53,15 +53,15 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
                     .setMessage("このデバイスを登録しますか？")
                     .setPositiveButton(android.R.string.ok, (dialog, which) -> {
                         // 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.edit().putString("bluetooth_device_id", deviceList.get(position)[1]).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.setText(PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_name", "none"));
+                        textView.setText(PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_name", "登録されていません"));
 
 
                     })

app/src/main/java/com/example/childguard/SettingFragment.java

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

app/src/main/java/com/example/childguard/SurveillanceService.java

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

app/src/main/res/layout/fragment_home.xml

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