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

Merge pull request #16 from child-guardian/fix-1

Browse Source 
Fix 1
This commit is contained in:
ろむねこ 2024-01-17 20:07:45 +09:00 committed by GitHub
commit c90d0b8f6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Vibrator; import android.os.Vibrator;
@ -85,7 +86,8 @@ public class MainActivity extends AppCompatActivity {
String contents = result.getContents(); String contents = result.getContents();
if (contents == null) { if (contents == null) {
Toast.makeText(this, "QRコードが読み取れませんでした", Toast.LENGTH_LONG).show(); Toast.makeText(this, "QRコードが読み取れませんでした", Toast.LENGTH_LONG).show();
} else if (!contents.contains("https://practicefirestore1-8808c.web.app/")) { } else {
if (!contents.contains("https://practicefirestore1-8808c.web.app/")) {
Toast.makeText(this, "Chiled Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show(); Toast.makeText(this, "Chiled Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
} else { } else {
//URLの表示 //URLの表示
@ -96,6 +98,7 @@ public class MainActivity extends AppCompatActivity {
customTabsIntent.launchUrl(this, Uri.parse(contents)); customTabsIntent.launchUrl(this, Uri.parse(contents));
} }
} }
}
); );
@Override @Override
@ -134,7 +137,7 @@ public class MainActivity extends AppCompatActivity {
}); });
findViewById(R.id.fab_scan_qr_code).setOnClickListener(v -> { findViewById(R.id.fab_scan_qr_code).setOnClickListener(v -> {
Log.d("QRFragment", "onClick: called"); Log.d("MainActivity/Fab", "onClick: called");
//QRリーダ起動 //QRリーダ起動
ScanOptions options = new ScanOptions(); ScanOptions options = new ScanOptions();
options.setPrompt("QRコードを読み取ってください"); options.setPrompt("QRコードを読み取ってください");
@ -159,19 +162,18 @@ public class MainActivity extends AppCompatActivity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume();
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);
String IdPref = sharedPreferences.getString("ID", null); String IdPref = sharedPreferences.getString("ID", null);
if (IdPref == null) { if (IdPref == null) {
Log.d("onResume", "ID not initialized."); Log.d("onResume", "ID not initialized.");
return; } else {
}
mDocRef = FirebaseFirestore.getInstance().document("users/" + IdPref);//現在の位置を取得 mDocRef = FirebaseFirestore.getInstance().document("users/" + IdPref);//現在の位置を取得
this.flg = false; this.flg = false;
initNotification(mDocRef); initNotification(mDocRef);
}
super.onResume();
} }
private void initNotification(DocumentReference mDocRef) { private void initNotification(DocumentReference mDocRef) {
@ -192,6 +194,7 @@ public class MainActivity extends AppCompatActivity {
String parent = documentSnapshot.getString("parent"); String parent = documentSnapshot.getString("parent");
Log.d("nt", "レスポンスを検知しました1"); Log.d("nt", "レスポンスを検知しました1");
assert parent != null;
if (parent.equals("s")) {//FireBaseの更新情報が"S"のとき＝サイト上で第三者ボタンが押されたとき if (parent.equals("s")) {//FireBaseの更新情報が"S"のとき＝サイト上で第三者ボタンが押されたとき
if (isInCar) { if (isInCar) {
int importance = NotificationManager.IMPORTANCE_DEFAULT; int importance = NotificationManager.IMPORTANCE_DEFAULT;
@ -203,13 +206,8 @@ public class MainActivity extends AppCompatActivity {
notifyMain(); notifyMain();
} }
} else { } else {
if (isInCar) { E.putBoolean("car", !isInCar);
E.putBoolean("car", false);
E.apply(); E.apply();
} else {
E.putBoolean("car", true);
E.apply();
}
// SupportFragmentManagerが現在表示しているFragmentを取得 // SupportFragmentManagerが現在表示しているFragmentを取得
Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView); Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentContainerView);
if (fragment instanceof HomeFragment) { if (fragment instanceof HomeFragment) {
@ -291,14 +289,12 @@ public class MainActivity extends AppCompatActivity {
} }
@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);
// }
}
//Bluetooth_setupの戻るボタン //Bluetooth_setupの戻るボタン
public void setupBackButton(boolean enableBackButton) { public void setupBackButton(boolean enableBackButton) {