ChildGuard/child_guard
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HomeFragment以外でBluetoothの状態が変化するとクラッシュする不具合を修正 #25

Merged
asura146 merged 2 commits from improve/fix_bt into main 2024-07-11 06:29:51 +00:00
Conversation 0 Commits 2 Files Changed 2 +4 -12
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dfc9440ab5 - Show all commits

16
app/src/main/java/com/example/childguard/MainActivity.java
View File

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