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

Merge branch 'main' into improve/refactor_service

Browse Source
This commit is contained in:
ろむねこ 2024-07-11 16:31:39 +09:00
commit 238f32addd
No known key found for this signature in database
GPG Key ID: FA1F39A1BA37D168
3 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/example/childguard/HomeFragment.java
View File

@ -80,6 +80,12 @@ public class HomeFragment extends Fragment implements OnEventListener {
super.onResume(); super.onResume();
Log.d("HomeFragment", "onResume: called"); Log.d("HomeFragment", "onResume: called");
this.updateUiState(getIsInCarLocal()); 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() { private boolean getIsInCarLocal() {
@ -174,17 +180,5 @@ public class HomeFragment extends Fragment implements OnEventListener {
return updateUiState(isInCar); return updateUiState(isInCar);
} }
@Override
public void onEvent2(boolean BluetoothConnect) {
return;
}
@Override
public boolean onEvent2(Boolean BluetoothConnect) {//Bluetoothの接続切断を受け取ってupdateBluetoothSituation()に渡す
updateBluetoothSituation(BluetoothConnect);
return false;
}
} }

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

@ -429,9 +429,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);
@ -452,9 +450,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();
@ -473,12 +469,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);
} }
} }

4
app/src/main/java/com/example/childguard/OnEventListener.java
View File

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