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

乗車状態のときに第三者通報を行うと、FireBaseとの同期がズレるバグを解消しました

Browse Source
This commit is contained in:
it232115 2024-01-19 01:46:33 +09:00
parent a87a2d150a
commit c196399c24
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,6 +146,7 @@ public class MainActivity extends AppCompatActivity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
changessituation();
Log.d("onResume", "called"); Log.d("onResume", "called");
Log.d("onResume", "mDocRef is null"); Log.d("onResume", "mDocRef is null");
SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE); SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
@ -178,10 +179,9 @@ public class MainActivity extends AppCompatActivity {
Log.d("nt", "レスポンスを検知しました1"); Log.d("nt", "レスポンスを検知しました1");
if (documentSnapshot.getBoolean("isReported")==false ) { if (documentSnapshot.getBoolean("isReported")==false ) {
if (fragment instanceof HomeFragment) { if (fragment instanceof HomeFragment) {
((HomeFragment) fragment).onEvent(isInCar); changessituation();
} }
}else if(isInCar){ }else if(isInCar){
ResetReported();
int importance = NotificationManager.IMPORTANCE_DEFAULT; int importance = NotificationManager.IMPORTANCE_DEFAULT;
NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通報通知", importance); NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通報通知", importance);
channel.setDescription("第3者からの通報を検知しました"); channel.setDescription("第3者からの通報を検知しました");
@ -189,6 +189,7 @@ public class MainActivity extends AppCompatActivity {
notificationManager.createNotificationChannel(channel); notificationManager.createNotificationChannel(channel);
Log.d("nt", "レスポンスを検知しました2"); Log.d("nt", "レスポンスを検知しました2");
notifyMain(); notifyMain();
ResetReported();
} else{ } else{
ResetReported(); ResetReported();
Log.d("nt", "何もなし" ); Log.d("nt", "何もなし" );
@ -274,7 +275,6 @@ public class MainActivity extends AppCompatActivity {
db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
DocumentReference isReported = db.collection("status").document(IdPref); DocumentReference isReported = db.collection("status").document(IdPref);
Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言 Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言
DEFAULT_ITEM.put("isReported", false);
isReported.update("isReported",false).addOnSuccessListener(new OnSuccessListener<Void>() { isReported.update("isReported",false).addOnSuccessListener(new OnSuccessListener<Void>() {
@Override @Override
public void onSuccess(Void unused) { public void onSuccess(Void unused) {
@ -287,11 +287,22 @@ public class MainActivity extends AppCompatActivity {
} }
}); });
} }
public void changessituation(){
SharedPreferences sharedPreferences = getSharedPreferences("app_situation",MODE_PRIVATE);
//共有プリファレンス 書き込みの準備
SharedPreferences.Editor E = sharedPreferences.edit();
Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView);
Boolean isInCar = sharedPreferences.getBoolean("isInCarPref", false);//現在の乗降状態を保存する共有プリファレンス
((HomeFragment) fragment).onEvent(!isInCar);
}
@Override @Override
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
Intent intent = new Intent(getApplication(), TestService.class); Intent intent = new Intent(getApplication(), TestService.class);
startService(intent); startService(intent);
} }
} }