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

Fix 1 #16

Merged
r-ca merged 4 commits from fix-1 into main 2024-01-17 11:07:45 +00:00
Conversation 0 Commits 4 Files Changed 1 +8 -9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 87fbf5659e - Show all commits

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

@ -137,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コードを読み取ってください");
@ -194,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;
@ -288,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) {