From 9649cc3a6e794e631e291136985603ed379196a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= <nem@nem.x0.to>
Date: Wed, 17 Jan 2024 13:44:23 +0900
Subject: [PATCH] =?UTF-8?q?hotfix:=20UI=E3=81=8C=E5=B4=A9=E5=A3=8A?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/childguard/MainActivity.java  | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/example/childguard/MainActivity.java b/app/src/main/java/com/example/childguard/MainActivity.java
index 165ab5c..be0ba76 100644
--- a/app/src/main/java/com/example/childguard/MainActivity.java
+++ b/app/src/main/java/com/example/childguard/MainActivity.java
@@ -68,7 +68,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        super.onStart();
+//        super.onStart();
 
         BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);
 
@@ -94,11 +94,24 @@ public class MainActivity extends AppCompatActivity {
 
         });
 
+        //Bluetooth検知機能
+        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);
+
     }
 
     @Override
     protected void onResume() {
-        super.onResume();
         SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
         String IdPref = sharedPreferences.getString("ID", null);
         if (IdPref == null) {
@@ -106,7 +119,9 @@ public class MainActivity extends AppCompatActivity {
             return;
         }
         DocumentReference mDocRef = FirebaseFirestore.getInstance().document("users/" + IdPref);//現在の位置を取得
-        initNotification(mDocRef);
+//        initNotification(mDocRef);
+
+        super.onResume();
     }
 
     private void initNotification(DocumentReference mDocRef) {
@@ -170,20 +185,6 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
-        //Bluetooth検知機能
-        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);
-
     }