NotificationFragmentを削除

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

@@ -80,12 +80,6 @@ public class HomeFragment extends Fragment implements OnEventListener {
         super.onResume();
         Log.d("HomeFragment", "onResume: called");
         this.updateUiState(getIsInCarLocal());
-        this.updateBluetoothSituation(isBluetoothConnected());
-    }
-
-    private boolean isBluetoothConnected() {
-        SharedPreferences pref = requireActivity().getSharedPreferences("Bluetooth_situation", requireActivity().MODE_PRIVATE);
-        return pref.getBoolean("status", false);
     }
 
     private boolean getIsInCarLocal() {
@@ -180,5 +174,17 @@ public class HomeFragment extends Fragment implements OnEventListener {
 
         return updateUiState(isInCar);
     }
+
+    @Override
+    public void onEvent2(boolean BluetoothConnect) {
+        return;
+    }
+
+
+    @Override
+    public boolean onEvent2(Boolean BluetoothConnect) {//Bluetoothの接続切断を受け取ってupdateBluetoothSituation()に渡す
+        updateBluetoothSituation(BluetoothConnect);
+        return false;
+    }
 }
 

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

@@ -427,7 +427,9 @@ public class MainActivity extends AppCompatActivity {
             if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
                 //Do something if connected
                 //Bluetoothデバイスが接続されたときの処理
-                changeBluetooth(true);
+                e.putBoolean("change", true);
+                e.apply();
+                changeBluetooth();//HomeFragmentの表示を接続にする
                 Log.d("BT", "Device connected");
 
                 Log.d("BT_Judge", "Registered: " + registeredId);
@@ -448,7 +450,9 @@ public class MainActivity extends AppCompatActivity {
 
                 //Do something if disconnected
                 //デバイスが切断されたときの処理
-                changeBluetooth(false);
+                e.putBoolean("change", false);
+                e.apply();
+                changeBluetooth();//HomeFragmentの表示を切断にする
                 if (deviceHardwareAddress.equals(registeredId)) {
                     // 5分待機する
                     Handler handler = new Handler();
@@ -467,8 +471,12 @@ public class MainActivity extends AppCompatActivity {
         }
     };
 
-    public void changeBluetooth(boolean actual){
-        getSharedPreferences("Bluetooth_situation",MODE_PRIVATE).edit().putBoolean("status",actual).apply();
+    public void changeBluetooth(){
+        SharedPreferences pref=getSharedPreferences("Bluetooth_situation",MODE_PRIVATE);
+        SharedPreferences.Editor e=pref.edit();
+        Boolean BluetoothConnect = pref.getBoolean("change", false);
+        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView);
+        ((HomeFragment) fragment).onEvent2(BluetoothConnect);
     }
 }
 

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

@@ -1,64 +0,0 @@
-package com.example.childguard;
-
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link NotificationFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-public class NotificationFragment extends Fragment {
-
-    // TODO: Rename parameter arguments, choose names that match
-    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
-
-    // TODO: Rename and change types of parameters
-    private String mParam1;
-    private String mParam2;
-
-    public NotificationFragment() {
-        // Required empty public constructor
-    }
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param param1 Parameter 1.
-     * @param param2 Parameter 2.
-     * @return A new instance of fragment NotificationFragment.
-     */
-    // TODO: Rename and change types and number of parameters
-    public static NotificationFragment newInstance(String param1, String param2) {
-        NotificationFragment fragment = new NotificationFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_notification, container, false);
-    }
-}

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

@@ -3,4 +3,8 @@ package com.example.childguard;
 public interface OnEventListener {
 
     boolean onEvent(boolean state);
+
+    void onEvent2(boolean BluetoothConnect);
+
+    boolean onEvent2(Boolean BluetoothConnect);
 }

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

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".NotificationFragment">
-
-    <!-- TODO: Update blank fragment layout -->
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:weightSum="10"
-        android:orientation="vertical"
-        tools:context=".MainActivity">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="9">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recyclerView1"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scrollbars="vertical"/>
-
-        </LinearLayout>
-
-
-    </LinearLayout>
-
-
-</FrameLayout>