Compare commits

...
Author SHA1 Message Date
r-ca c45ce0d178 make text smaller 2025-01-29 16:40:38 +09:00
r-ca 95c244b7f2 fix layout overflow 2025-01-29 16:39:55 +09:00
r-ca b720877fa5 fix 2025-01-29 16:23:30 +09:00
r-ca 0a4680e7b8 test 2025-01-29 16:23:18 +09:00
r-ca 89f51e1b38 fix permission check 2025-01-29 16:20:59 +09:00
3 changed files with 54 additions and 22 deletions

No files matched your search

@@ -130,10 +130,11 @@ public class MainActivity extends AppCompatActivity {
return;
} else {
Log.d("BT", "Permission to connect bluetooth devices granted");
}
registerReceiver(receiver, intentFilter);
//startForegroundService(new Intent(this, SurveillanceService.class));
startForegroundService(new Intent(this, SurveillanceService.class));
}
}
@@ -1,5 +1,6 @@
package com.example.childguard;
import android.Manifest;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
@@ -12,6 +13,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Handler;
import android.os.IBinder;
import android.os.VibrationEffect;
@@ -169,7 +171,8 @@ public class SurveillanceService extends Service {
* @return Bluetoothの権限の有無 true: 許可されていない false: 許可されている
*/
private boolean isNotBluetoothGranted() {
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
String btPermission = getBluetoothConnectPermission();
if (ActivityCompat.checkSelfPermission(this, btPermission) != PackageManager.PERMISSION_GRANTED) {
Log.d(TAG, "Bluetoothの権限が許可されていません");
return true;
} else {
@@ -190,6 +193,16 @@ public class SurveillanceService extends Service {
registerReceiver(receiver, intentFilter);
}
/**
* Bluetoothの接続権限を取得
* @return Bluetoothの接続権限
*/
private String getBluetoothConnectPermission() {
return (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) ?
android.Manifest.permission.BLUETOOTH_CONNECT :
Manifest.permission.BLUETOOTH;
}
/**
* Firestoreのスナップショットリスナーを設定
* @param mDocRef Firestoreのドキュメントリファレンス
+37 -19
View File
@@ -1,38 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".SettingFragment"
android:padding="16dp">
android:padding="16dp"
tools:context=".SettingFragment">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:src="@drawable/bluetooth_and_qr2"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="200dp"
android:layout_marginTop="150dp"
/>
android:layout_gravity="center_horizontal"
android:src="@drawable/bluetooth_and_qr2" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:text="QRコード印刷とBluetooth設定"
android:layout_gravity="center_horizontal"
android:textStyle="bold"
android:textSize="18dp"
android:layout_marginTop="20dp"
/>
android:text="QRコード印刷とBluetooth設定"
android:textColor="@color/black"
android:textSize="18dp"
android:textStyle="bold" />
<Button
android:id="@+id/button_bluetooth_setting"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Bluetooth設定"
android:layout_marginTop="120dp"
android:layout_marginBottom="20dp"/>
android:layout_marginBottom="20dp"
android:text="Bluetooth設定" />
<Button
android:id="@+id/button_print_qr"
@@ -40,17 +49,26 @@
android:layout_height="wrap_content"
android:text="QRコード印刷" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom">
android:layout_height="wrap_content"
android:gravity="bottom"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
tools:layout_editor_absoluteX="16dp">
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="QRコードは株式会社デンソーウェーブの登録商標です"
android:textColor="@color/black" />
</LinearLayout>
android:textColor="@color/black"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>