レイアウトを変更

# Conflicts:
#	app/src/main/java/com/example/childguard/TestService.java

.idea/gradle.xml

@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

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

@@ -1,6 +1,5 @@
 package com.example.childguard;
 
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
@@ -8,6 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.core.content.res.ResourcesCompat;
@@ -133,11 +133,58 @@ public class HomeFragment extends Fragment implements OnEventListener{
         return true;
     }
 
+    private boolean updateBluetoothSituation(Boolean Bluetoothconnect){
+        FrameLayout frameLayout;
+        TextView textView;
+        ImageView imageView;
+        try {
+            frameLayout=requireView().findViewById(R.id.situation_bg2);
+            textView=requireView().findViewById(R.id.Bluetoothsituation);
+            imageView=requireView().findViewById(R.id.Bluetoothsituationimage);
+        }catch (NullPointerException e) {
+            Log.d("HomeFragment", "updateUiState: view is null");
+            return false;
+        } catch (IllegalStateException e) {
+            Log.d("HomeFragment", "updateUiState: view is not attached");
+            getParentFragmentManager().beginTransaction().replace(R.id.fragmentContainerView, HomeFragment.newInstance("test", "test")).commit();
+            updateBluetoothSituation(Bluetoothconnect);
+            return false;
+        }
+        String connect="接続中";
+        String disconnect="切断中";
+        if (Bluetoothconnect) {
+            //接続状態にする
+            frameLayout.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
+            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);
+        }
+
+        return true;
+    }
+
+
     @Override
-    public boolean onEvent(boolean isInCar) {
+    public boolean onEvent(boolean isInCar) {//乗車状態と降車状態の変更を受け取ってupdateUiState()に渡す
         Log.d("HomeFragment", "onEvent: called");
 
         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

@@ -4,9 +4,7 @@ import android.annotation.SuppressLint;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
-import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -17,6 +15,7 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -24,6 +23,7 @@ import android.widget.FrameLayout;
 import android.widget.Toast;
 
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.core.app.ActivityCompat;
@@ -36,14 +36,16 @@ import com.google.firebase.firestore.FirebaseFirestore;
 import com.journeyapps.barcodescanner.ScanContract;
 import com.journeyapps.barcodescanner.ScanOptions;
 
+// Manifest
+import android.Manifest;
+
 import java.util.HashMap;
 import java.util.Map;
 
 public class MainActivity extends AppCompatActivity {
 
     FirebaseFirestore db;
-    BluetoothManager bluetoothManager;
+
-    BluetoothAdapter bluetoothAdapter;
 
     DocumentReference mDocRef;
 
@@ -52,6 +54,7 @@ public class MainActivity extends AppCompatActivity {
     public static final String TAG = "InspirationQuote";
 
 
+
     private final ActivityResultLauncher<ScanOptions> QrLauncher = registerForActivityResult(
             new ScanContract(),
             result -> {
@@ -60,28 +63,34 @@ public class MainActivity extends AppCompatActivity {
                     Toast.makeText(this, "QRコードが読み取れませんでした", Toast.LENGTH_LONG).show();
                 } else {
                     if (!contents.contains("https://practicefirestore1-8808c.web.app/")) {
-                        Toast.makeText(this, "Chiled Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
+                        Toast.makeText(this, "Child Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
                     } else {
-                        //URLの表示
+                        changeisInCar();
-                        Toast.makeText(this, contents, Toast.LENGTH_SHORT).show();
-                        //ブラウザを起動し、URL先のサイトを開く
-                        CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
-                        CustomTabsIntent customTabsIntent = builder.build();
-                        customTabsIntent.launchUrl(this, Uri.parse(contents));
                     }
                 }
             }
     );
 
+    @SuppressLint("MissingInflatedId")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
+
+        //Bluetooth接続判定用
+        SharedPreferences pref=PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences.Editor e=pref.edit();
+        e.putBoolean("connection_status",false);
+
+
+
+        if (!hasPermissions()) {
+            requestPermissions();
+        }
 
         BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);
 
-        this.homeFragment = HomeFragment.newInstance("test", "tset");
+        this.homeFragment = HomeFragment.newInstance("test", "test");
 
         bottomNavigationView.setOnNavigationItemSelectedListener(v ->
 
@@ -94,7 +103,6 @@ public class MainActivity extends AppCompatActivity {
                         .commit();
                 firebaselink();
 
-
             } else if (v.getItemId() == findViewById(R.id.navigation_settings).getId()) {
                 findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE);
                 getSupportFragmentManager().beginTransaction()
@@ -103,6 +111,7 @@ public class MainActivity extends AppCompatActivity {
                         .commit();
             }
             firebaselink();
+            Bluetooth_status();
             return true;
         });
 
@@ -120,6 +129,7 @@ public class MainActivity extends AppCompatActivity {
         intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
         intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
 
+        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
         if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
             Log.d("BT", "No permission to connect bluetooth devices");
             return;
@@ -127,8 +137,10 @@ public class MainActivity extends AppCompatActivity {
             Log.d("BT", "Permission to connect bluetooth devices granted");
         }
         registerReceiver(receiver, intentFilter);
+
     }
 
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -154,8 +166,8 @@ public class MainActivity extends AppCompatActivity {
                 E.apply();//確定処理
                 Log.d("nt", "レスポンスを検知しました1");
                 //FireBaseで更新された情報の判定
-                if (documentSnapshot.getBoolean("isReported") == false) {//isReportedがfalseのとき=サイト上で保護者ボタンが押されたとき
+                if (!documentSnapshot.getBoolean("isReported")) {//isReportedがfalseのとき=サイト上で保護者ボタンが押されたとき
-                    if (fragment instanceof HomeFragment) {//fragementがHomeFragmentのインスタンスかの判定
+                    if (fragment instanceof HomeFragment) {//fragmentがHomeFragmentのインスタンスかの判定
 //                        changessituation();//  changessituation()メソッドを処理→アプリ側の乗降状態を変化
                         ((HomeFragment) fragment).onEvent(!isInCar);
                     }
@@ -178,41 +190,45 @@ public class MainActivity extends AppCompatActivity {
 
     }
 
+    private boolean hasPermissions() {
+        return ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_ADMIN) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.VIBRATE) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.FOREGROUND_SERVICE) == PackageManager.PERMISSION_GRANTED;
+    }
 
-    //Bluetoothの検知機能
+    private void requestPermissions() {
-    private final BroadcastReceiver receiver = new BroadcastReceiver() {
+        ActivityCompat.requestPermissions(this,
+                new String[]{
+                        Manifest.permission.BLUETOOTH,
+                        Manifest.permission.BLUETOOTH_ADMIN,
+                        Manifest.permission.BLUETOOTH_SCAN,
+                        Manifest.permission.BLUETOOTH_CONNECT,
+                        Manifest.permission.ACCESS_FINE_LOCATION,
+                        Manifest.permission.ACCESS_COARSE_LOCATION,
+                        Manifest.permission.POST_NOTIFICATIONS,
+                        Manifest.permission.VIBRATE,
+                        Manifest.permission.FOREGROUND_SERVICE
+                },
+                2);
+    }
 
     @Override
-        public void onReceive(Context context, Intent intent) {
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-            String action = intent.getAction(); // may need to chain this to a recognizing function
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+        if (requestCode == 2) {
-//            HomeFragment homeFragment=new HomeFragment();
+            if (!hasPermissions()) {
-
+                Toast.makeText(this, "Permissions not granted.", Toast.LENGTH_SHORT).show();
-            if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
-                Log.d("BT", "No permission to connect bluetooth devices");
-                return;
-            }
-            String deviceHardwareAddress = device.getAddress(); // MAC address
-
-            if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
-                //Do something if connected
-                Log.d("BT", "Device connected");
-
-                String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
-
-                Log.d("BT_Judge", "Registered: " + registeredId);
-
-                if (deviceHardwareAddress.equals(registeredId)) {
-                    Log.d("BT_Judge", "登録済み");
-                } else Log.d("BT_Judge", "未登録");
-
-            } else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
-                //Do something if disconnected
-                Log.d("BT", "Device disconnected");
-
             }
         }
-    };
+    }
+
+
 
 
     public void firebaselink() {//Firebaseのドキュメントの取得
@@ -239,6 +255,25 @@ public class MainActivity extends AppCompatActivity {
         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;
         //通知チャネルの実装
@@ -297,6 +332,7 @@ public class MainActivity extends AppCompatActivity {
         notificationManager.notify(R.string.app_name, builder.build());//通知の表示
     }
 
+
     @Override
     public void onStop() {//アプリをバックグラウンドにした時のメソッド
         super.onStop();
@@ -304,5 +340,146 @@ public class MainActivity extends AppCompatActivity {
         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);
+        intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
+
+        if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
+            Log.d("BT", "No permission to connect bluetooth devices");
+            return;
+        } else {
+            Log.d("BT", "Permission to connect bluetooth devices granted");
+        }
+        registerReceiver(receiver, intentFilter);
+    }
+
+
+    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);
+            SharedPreferences.Editor e=pref.edit();
+            String action = intent.getAction(); // may need to chain this to a recognizing function
+            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+            Boolean isInCar = pref.getBoolean("isInCarPref", false);
+            Boolean Bluetoothconnect = pref.getBoolean("change", false);
+            if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
+                Log.d("BT", "No permission to connect bluetooth devices");
+                return;
+            }
+            String deviceHardwareAddress = device.getAddress(); // MAC address
+
+            String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
+
+            if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
+                //Do something if connected
+                //Bluetoothデバイスが接続されたときの処理
+                e.putBoolean("change", true);
+                e.apply();
+                changeBluetooth();//HomeFragmentの表示を接続にする
+                Log.d("BT", "Device connected");
+
+                Log.d("BT_Judge", "Registered: " + registeredId);
+
+                if (deviceHardwareAddress.equals(registeredId)) {
+                    //登録済みのデバイスだったときの処理
+                    Log.d("BT_Judge", "登録済み");
+                    e.putBoolean("connection_status",true);
+
+                } else{
+                    //登録していないデバイスだったときの処理
+                    Log.d("BT_Judge", "未登録");
+                    e.putBoolean("connection_status",false);
+                }
+                e.apply();
+
+            } else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)&&!isInCar) {//bluetoothが切断されたときに乗車状態のとき
+
+                //Do something if disconnected
+                //デバイスが切断されたときの処理
+                e.putBoolean("change", false);
+                e.apply();
+                changeBluetooth();//HomeFragmentの表示を切断にする
+                if (deviceHardwareAddress.equals(registeredId)) {
+                    // 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 *60*1000); // 5分をミリ秒に変換
+                }
+            }else {
+                Log.d("BT", "Device disconnected");
+            }
+        }
+    };
+
+    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/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/java/com/example/childguard/QrUtils.java

@@ -48,7 +48,7 @@ public class QrUtils {
             throw new AndroidRuntimeException("Barcode Error.", e);
         }
         // 画像合成の準備
-        Bitmap bitmap = BitmapFactory.decodeResource(this.context.getResources(), R.drawable.a_group_qr_sos);
+        Bitmap bitmap = BitmapFactory.decodeResource(this.context.getResources(), R.drawable.a_group_qr_sos_2);
         int width = bitmap.getWidth();
         int height = bitmap.getHeight();
         QRGazou = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
@@ -72,7 +72,7 @@ public class QrUtils {
 
         // 画面密度に基づいてQRコードのサイズを計算
         float density = context.getResources().getDisplayMetrics().density;
-        return (int) (800 * density);
+        return (int) (700 * density);
     }
 
 }

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

@@ -9,18 +9,16 @@ import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
-import android.os.Looper;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.util.Log;
-import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
@@ -38,11 +36,11 @@ public class TestService extends Service {
 
     public static final String TAG = "InspirationQuote";
 
-    public PeriodicTaskManager periodicTaskManager;
-
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+
+
         //共有プリファレンス全体の準備
         SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
         String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
@@ -52,12 +50,16 @@ public class TestService extends Service {
             mDocRef = FirebaseFirestore.getInstance().document("status/" + IdPref);//現在の位置を取得
             initNotification(mDocRef);//現在の位置を引数に initNotification()を処理
         }
+
+        Bluetooth_status();
         return flags;
+
+
     }
 
     private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
         // PeriodicTaskManagerのインスタンス化
-        periodicTaskManager = new PeriodicTaskManager();
+
         // 共有プリファレンス全体の準備
         SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
         //車の乗り降りを管理するtrue=乗車、false=降車
@@ -79,9 +81,7 @@ public class TestService extends Service {
                         NotificationSetting();//通知に関する設定のメソッド
                         Notification(getApplicationContext());//通知を行うメソッド
                     }
-                } else if(!isInCar){//isReportedがfalse=サイト上で降車状態のとき
+                } else {//isReportedがfalse=サイト上で降車状態のとき
-                    ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする
-                }else {
                     ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする
                 }
             }
@@ -158,7 +158,8 @@ public class TestService extends Service {
         }
         notificationManager.notify(R.string.app_name, builder.build());//通知の表示
     }
-    public void NotificationBluetooth(Context context, int time) {//実際に通知を行うメソッド
+
+    public void NotificationBluetooth(Context context) {//実際に通知を行うメソッド
         final String CHANNEL_ID = "my_channel_id";
         // 通知がクリックされたときに送信されるIntent
         Intent intent = new Intent(context, MainActivity.class);
@@ -173,7 +174,7 @@ public class TestService extends Service {
         @SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
                 .setSmallIcon(android.R.drawable.ic_menu_info_details)
                 .setContentTitle("子供の置き去りをしていませんか？")//通知のタイトル
-                .setContentText("Bluetootと車の切断から"+time+"分が経過しました")//通知の本文
+                .setContentText("Bluetoothと車の切断から5分が経過しました")//通知の本文
                 .setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
                 .setAutoCancel(true)//通知をタップすると削除する
                 .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
@@ -204,60 +205,89 @@ public class TestService extends Service {
         }
         notificationManager.notify(R.string.app_name, builder.build());//通知の表示
     }
-    public class PeriodicTaskManager {//Bluetoothの切断後に乗車状態にならなかった場合に５分毎に通知を送るメソッド
 
-        private static final long INTERVAL = 5 * 1000; //300秒
-        private final Handler handler;
-        private final Runnable periodicTask;
 
-        public PeriodicTaskManager() {
+    public void Bluetooth_status() {
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
+        intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
 
-            handler = new Handler(Looper.getMainLooper());
+        if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
-            periodicTask = new Runnable() {
+            Log.d("BT", "No permission to connect bluetooth devices");
-
+            return;
-                public void run() {
-
-                    //共有プリファレンス全体の準備
-                    SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
-
-                    int time=sharedPreferences.getInt("time",0);
-                    //共有プリファレンス 書き込みの準備
-                    SharedPreferences.Editor E = sharedPreferences.edit();
-                    if(time==0) {//Bluetoot切断からの時間経過(5分刻み)
-                        E.putInt("time",5);
-                        E.apply();;
         } else {
-                        E.putInt("time",time+5);
+            Log.d("BT", "Permission to connect bluetooth devices granted");
-                        E.apply();
+        }
+        registerReceiver(receiver, intentFilter);
     }
 
-                    // 5分毎に実行される処理
-                    NotificationBluetooth(getApplicationContext(),time);
-                    Log.d("PeriodicTask", "５分後に処理を実行します");
 
-                    handler.postDelayed(this, INTERVAL);
+    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);
+            SharedPreferences.Editor e = pref.edit();
+            String action = intent.getAction(); // may need to chain this to a recognizing function
+            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+            Boolean isInCar = pref.getBoolean("isInCarPref", false);
+
+
+            if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
+                Log.d("BT", "No permission to connect bluetooth devices");
+                return;
+            }
+            String deviceHardwareAddress = device.getAddress(); // MAC address
+
+            String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
+
+            if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
+                //Do something if connected
+                //Bluetoothデバイスが接続されたときの処理
+                Log.d("BT", "Device connected");
+
+
+                Log.d("BT_Judge", "Registered: " + registeredId);
+
+                if (deviceHardwareAddress.equals(registeredId)) {
+                    //登録済みのデバイスだったときの処理
+                    Log.d("BT_Judge", "登録済み");
+                    e.putBoolean("connection_status", true);
+
+                } else {
+                    //登録していないデバイスだったときの処理
+                    Log.d("BT_Judge", "未登録");
+                    e.putBoolean("connection_status", false);
+                }
+                e.apply();
+
+            } else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action) && !isInCar) {//bluetoothが切断されたときに乗車状態のとき
+
+                //Do something if disconnected
+                //デバイスが切断されたときの処理
+                if (deviceHardwareAddress.equals(registeredId)) {
+                    // 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 * 60 * 1000); // 5分をミリ秒に変換
+                }
+            } else {
+                Log.d("BT", "Device disconnected");
+            }
         }
     };
-        }
 
-        public void startPeriodicTask() {
-            // 最初の実行
-            handler.postDelayed(periodicTask,INTERVAL);//一回目は5分後に行う
-        }
 
-        public void stopPeriodicTask() {
-            //共有プリファレンス全体の準備
-            SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
-
-            int time=sharedPreferences.getInt("time",0);
-            //共有プリファレンス 書き込みの準備
-            SharedPreferences.Editor E = sharedPreferences.edit();
-            E.putInt("time",0);
-            E.apply();
-            // 定期的な処理の停止
-            handler.removeCallbacks(periodicTask);
-        }
-    }
     @Nullable
     @Override
     public IBinder onBind(Intent intent) {

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

@@ -49,6 +49,7 @@
         </FrameLayout>
 
         <FrameLayout
+            android:id="@+id/situation_bg2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
@@ -57,6 +58,7 @@
             android:background="@drawable/frame_style">
 
             <TextView
+                android:id="@+id/Bluetoothsituation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
@@ -73,6 +75,7 @@
                 android:textAlignment="center" />
 
             <ImageView
+                android:id="@+id/Bluetoothsituationimage"
                 android:layout_width="match_parent"
                 android:layout_height="100dp"
                 android:layout_marginTop="50dp"

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

@@ -6,11 +6,19 @@
     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"
+            android:layout_weight="9">
-        >
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView1"
@@ -20,4 +28,8 @@
 
         </LinearLayout>
 
+
+    </LinearLayout>
+
+
 </FrameLayout>

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

@@ -7,18 +7,50 @@
     tools:context=".SettingFragment"
     android:padding="16dp">
 
-    <Button
+
-        android:id="@+id/button_print_qr"
+    <ImageView
-        android:layout_width="match_parent"
+        android:src="@drawable/bluetooth_and_qr2"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:layout_marginTop="150dp"
+        />
+    <TextView
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="QRコード印刷"
+        android:textColor="@color/black"
-        android:layout_marginVertical="8dp"/>
+        android:text="QRコード印刷とBluetooth設定"
+        android:layout_gravity="center_horizontal"
+        android:textStyle="bold"
+        android:textSize="18dp"
+        android:layout_marginTop="20dp"
+        />
 
     <Button
         android:id="@+id/button_bluetooth_setting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Bluetooth設定"
-        android:layout_marginVertical="8dp"/>
+        android:layout_marginTop="120dp"
+        android:layout_marginBottom="20dp"/>
+
+    <Button
+        android:id="@+id/button_print_qr"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="QRコード印刷"/>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="bottom">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="QRコードは株式会社デンソーウェーブの登録商標です"
+            android:textColor="@color/black" />
+    </LinearLayout>
 
 </LinearLayout>