Compare commits

..
Author SHA1 Message Date
r-ca aa6ee4f035 void onEvent2, boolean onEvent2を削除 2024-07-11 14:08:51 +09:00
r-ca d817dfaf58 onResumeでSharedPreferenceから読み取ってUIを更新するように 2024-07-11 14:01:16 +09:00
r-ca dfc9440ab5 変更を検知したときにSharedPreferenceを書き換えるように 2024-07-11 14:00:58 +09:00
Asura146 b49c73d6b2 Merge pull request #24 from child-guardian/kyou/Bluetooth
レイアウトを変更
2024-02-05 16:36:26 +09:00
asura146 d6a5638d5c レイアウトを変更 2024-02-05 16:27:06 +09:00
磯野 895732b1b3 タイポをところどころ修正しました。 2024-02-01 15:31:02 +09:00
asura146 aef4ba4bea "QRコードは株式会社デンソーウェーブの登録商標です"を追加 2024-01-30 10:20:09 +09:00
it232115 d3f4c83d2b アプリでQRを読み取った瞬間に乗降状態が変更されるように処理を変更 2024-01-24 12:56:02 +09:00
r-ca fab0f75d1a 権限の要求を追加 2024-01-23 09:45:08 +09:00
it232115 235afb92cb 提出段階のver 2024-01-23 09:29:42 +09:00
it232115 75b4be9ff1 Bluetoothの切断接続に応じて、HomeFrgmentの表示を変化させる機能を実装 2024-01-23 03:44:35 +09:00
it232115 1077db14b0 コメントを追加 2024-01-23 02:59:54 +09:00
it232115 10fc0d7251 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/src/main/java/com/example/childguard/TestService.java
2024-01-23 02:57:59 +09:00
it232115 3a9decb0f8 アプリに登録されているBluetoothデバイスの切断時に乗車状態のとき5分間のタイマを起動し、5分後にもBluetoothが切断されたままで乗車状態であるときに通知が送られるようにしました。また、同様の記述をMainActivityにも行い、バックグラウンド時だけでなくアプリ起動時も使えるようにしました。 2024-01-23 02:57:28 +09:00
Asura146 b4dd341b23 Merge pull request #23 from child-guardian/kyou/Bluetooth
コメントを追加
2024-01-23 02:50:18 +09:00
asura146 94d717e419 コメントを追加 2024-01-23 02:47:31 +09:00
Asura146 660d8a772a Merge pull request #22 from child-guardian/kyou/Bluetooth
Kyou/bluetooth
2024-01-23 02:15:51 +09:00
asura146 6b3b4cf925 Merge branch 'main' into kyou/Bluetooth 2024-01-23 02:13:27 +09:00
it232115 9ec7f37f4a Bluetoothの切断と同時に通知が送られるようにしました 2024-01-23 02:08:40 +09:00
asura146 3680ead6e1 登録済みのデバイスが切断されたときの判定を追加 2024-01-23 02:08:38 +09:00
Asura146 944f08f988 Merge pull request #21 from child-guardian/kyou/Bluetooth
Bluetoothの接続状態を返却する機能を追加
2024-01-23 01:14:53 +09:00
asura146 8b34b0ab69 Bluetoothの接続状態を返却する機能を追加 2024-01-23 01:11:21 +09:00
it232115 71b7407e04 Merge remote-tracking branch 'origin/main' 2024-01-22 22:30:52 +09:00
it232115 5abd9ec086 各種バグの修正
通知のリスト化昨日の断念
2024-01-22 22:30:23 +09:00
N-YOKU-jp f396950009 Merge pull request #20 from child-guardian/last
各種バグの修正
2024-01-22 22:07:38 +09:00
磯野 6ef92ad3c1 リスト化する機能をつけました。(一部微修正しました) 2024-01-22 04:23:50 +09:00
磯野 cf3da5b3e2 Merge remote-tracking branch 'origin/main' 2024-01-21 16:33:21 +09:00
磯野 2575b074a7 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	app/src/main/java/com/example/childguard/MainActivity.java
2024-01-19 10:41:47 +09:00
磯野 3fa1fe412a 通知を送る機能を追加しました。 2024-01-16 11:21:54 +09:00
22 changed files with 446 additions and 161 deletions

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@
<GradleProjectSettings> <GradleProjectSettings>
<option name="testRunner" value="GRADLE" /> <option name="testRunner" value="GRADLE" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="Embedded JDK" /> <option name="gradleJvm" value="jbr-17" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
+1 -1
View File
@@ -1,6 +1,6 @@
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
Binary file not shown.
+20
View File
@@ -0,0 +1,20 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.example.childguard",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 1,
"versionName": "1.0",
"outputFile": "app-release.apk"
}
],
"elementType": "File"
}
@@ -1,22 +0,0 @@
package com.example.childguard;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import androidx.appcompat.app.AppCompatActivity;
public class Bluetooth_device_save {
SharedPreferences pref;
// public void device_save(String deviceAddress){
// pref = PreferenceManager.getDefaultSharedPreferencesName()
// SharedPreferences.Editor e=pref.edit();
// e.putString("bluetooth_device1",deviceAddress);
// e.apply();
// }
public String device_info(){
return pref.getString("bluetooth_device1","not_device");
}
}
@@ -1,14 +1,18 @@
package com.example.childguard; package com.example.childguard;
import android.annotation.SuppressLint;
import android.os.Bundle; import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
public class First_Start extends AppCompatActivity { public class First_Start extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.first_start); setContentView(R.layout.first_start);
} }
} }
@@ -23,6 +23,7 @@ public class GenerateQrFragment extends Fragment {
public GenerateQrFragment() { public GenerateQrFragment() {
// Required empty public constructor // Required empty public constructor
} }
public static GenerateQrFragment newInstance(String key) { public static GenerateQrFragment newInstance(String key) {
GenerateQrFragment fragment = new GenerateQrFragment(); GenerateQrFragment fragment = new GenerateQrFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
@@ -1,6 +1,5 @@
package com.example.childguard; package com.example.childguard;
import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
@@ -8,6 +7,7 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.core.content.res.ResourcesCompat; import androidx.core.content.res.ResourcesCompat;
@@ -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() {
@@ -133,8 +139,43 @@ public class HomeFragment extends Fragment implements OnEventListener{
return true; return true;
} }
private boolean updateBluetoothSituation(Boolean BluetoothConnect) {
FrameLayout frameLayout;
TextView textView;
ImageView imageView;
try {
frameLayout = requireView().findViewById(R.id.situation_bg2);
textView = requireView().findViewById(R.id.Bluetoothsituation);
imageView = requireView().findViewById(R.id.Bluetoothsituationimage);
} catch (NullPointerException e) {
Log.d("HomeFragment", "updateUiState: view is null");
return false;
} catch (IllegalStateException e) {
Log.d("HomeFragment", "updateUiState: view is not attached");
getParentFragmentManager().beginTransaction().replace(R.id.fragmentContainerView, HomeFragment.newInstance("test", "test")).commit();
updateBluetoothSituation(BluetoothConnect);
return false;
}
String connect = "接続中";
String disconnect = "切断中";
if (BluetoothConnect) {
//接続状態にする
frameLayout.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
textView.setText(connect);
imageView.setVisibility(View.GONE);
} else {
//降車状態にする
frameLayout.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null));
textView.setText(disconnect);
imageView.setVisibility(View.VISIBLE);
}
return true;
}
@Override @Override
public boolean onEvent(boolean isInCar) { public boolean onEvent(boolean isInCar) {//乗車状態と降車状態の変更を受け取ってupdateUiState()に渡す
Log.d("HomeFragment", "onEvent: called"); Log.d("HomeFragment", "onEvent: called");
return updateUiState(isInCar); return updateUiState(isInCar);
@@ -4,9 +4,7 @@ import android.annotation.SuppressLint;
import android.app.NotificationChannel; import android.app.NotificationChannel;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -14,9 +12,9 @@ import android.content.IntentFilter;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Color; import android.graphics.Color;
import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.os.Vibrator; import android.os.Vibrator;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
@@ -24,8 +22,8 @@ import android.widget.FrameLayout;
import android.widget.Toast; import android.widget.Toast;
import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.browser.customtabs.CustomTabsIntent;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@@ -36,14 +34,16 @@ import com.google.firebase.firestore.FirebaseFirestore;
import com.journeyapps.barcodescanner.ScanContract; import com.journeyapps.barcodescanner.ScanContract;
import com.journeyapps.barcodescanner.ScanOptions; import com.journeyapps.barcodescanner.ScanOptions;
// Manifest
import android.Manifest;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
FirebaseFirestore db; FirebaseFirestore db;
BluetoothManager bluetoothManager;
BluetoothAdapter bluetoothAdapter;
DocumentReference mDocRef; DocumentReference mDocRef;
@@ -52,6 +52,7 @@ public class MainActivity extends AppCompatActivity {
public static final String TAG = "InspirationQuote"; public static final String TAG = "InspirationQuote";
private final ActivityResultLauncher<ScanOptions> QrLauncher = registerForActivityResult( private final ActivityResultLauncher<ScanOptions> QrLauncher = registerForActivityResult(
new ScanContract(), new ScanContract(),
result -> { result -> {
@@ -60,28 +61,34 @@ public class MainActivity extends AppCompatActivity {
Toast.makeText(this, "QRコードが読み取れませんでした", Toast.LENGTH_LONG).show(); Toast.makeText(this, "QRコードが読み取れませんでした", Toast.LENGTH_LONG).show();
} else { } else {
if (!contents.contains("https://practicefirestore1-8808c.web.app/")) { if (!contents.contains("https://practicefirestore1-8808c.web.app/")) {
Toast.makeText(this, "Chiled Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show(); Toast.makeText(this, "Child Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
} else { } else {
//URLの表示 changeIsInCar();
Toast.makeText(this, contents, Toast.LENGTH_SHORT).show();
//ブラウザを起動し、URL先のサイトを開く
CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
CustomTabsIntent customTabsIntent = builder.build();
customTabsIntent.launchUrl(this, Uri.parse(contents));
} }
} }
} }
); );
@SuppressLint("MissingInflatedId")
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
//Bluetooth接続判定用
SharedPreferences pref=PreferenceManager.getDefaultSharedPreferences(this);
SharedPreferences.Editor e=pref.edit();
e.putBoolean("connection_status",false);
if (!hasPermissions()) {
requestPermissions();
}
BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view); BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);
this.homeFragment = HomeFragment.newInstance("test", "tset"); this.homeFragment = HomeFragment.newInstance("test", "test");
bottomNavigationView.setOnNavigationItemSelectedListener(v -> bottomNavigationView.setOnNavigationItemSelectedListener(v ->
@@ -92,8 +99,7 @@ public class MainActivity extends AppCompatActivity {
.replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment) .replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment)
.addToBackStack(null) .addToBackStack(null)
.commit(); .commit();
firebaselink(); firebaseLink();
} else if (v.getItemId() == findViewById(R.id.navigation_settings).getId()) { } else if (v.getItemId() == findViewById(R.id.navigation_settings).getId()) {
findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE); findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE);
@@ -102,7 +108,8 @@ public class MainActivity extends AppCompatActivity {
.addToBackStack(null) .addToBackStack(null)
.commit(); .commit();
} }
firebaselink(); firebaseLink();
Bluetooth_status();
return true; return true;
}); });
@@ -120,6 +127,7 @@ public class MainActivity extends AppCompatActivity {
intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED); intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED); intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) { if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
Log.d("BT", "No permission to connect bluetooth devices"); Log.d("BT", "No permission to connect bluetooth devices");
return; return;
@@ -127,14 +135,16 @@ public class MainActivity extends AppCompatActivity {
Log.d("BT", "Permission to connect bluetooth devices granted"); Log.d("BT", "Permission to connect bluetooth devices granted");
} }
registerReceiver(receiver, intentFilter); registerReceiver(receiver, intentFilter);
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
Log.d("onResume", "called"); Log.d("onResume", "called");
Log.d("onResume", "mDocRef is null"); Log.d("onResume", "mDocRef is null");
firebaselink(); firebaseLink();
} }
private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理 private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
@@ -154,9 +164,9 @@ public class MainActivity extends AppCompatActivity {
E.apply();//確定処理 E.apply();//確定処理
Log.d("nt", "レスポンスを検知しました1"); Log.d("nt", "レスポンスを検知しました1");
//FireBaseで更新された情報の判定 //FireBaseで更新された情報の判定
if (documentSnapshot.getBoolean("isReported") == false) {//isReportedがfalseのとき=サイト上で保護者ボタンが押されたとき if (!documentSnapshot.getBoolean("isReported")) {//isReportedがfalseのとき=サイト上で保護者ボタンが押されたとき
if (fragment instanceof HomeFragment) {//fragementがHomeFragmentのインスタンスかの判定 if (fragment instanceof HomeFragment) {//fragmentがHomeFragmentのインスタンスかの判定
// changessituation();// changessituation()メソッドを処理→アプリ側の乗降状態を変化 // changes-situation();// changes-situation()メソッドを処理→アプリ側の乗降状態を変化
((HomeFragment) fragment).onEvent(!isInCar); ((HomeFragment) fragment).onEvent(!isInCar);
} }
} else if (isInCar) {//第三者ボタンが押されたときにisInCarがtrueのとき=乗車状態のとき→いたずら防止 } else if (isInCar) {//第三者ボタンが押されたときにisInCarがtrueのとき=乗車状態のとき→いたずら防止
@@ -178,44 +188,48 @@ public class MainActivity extends AppCompatActivity {
} }
private boolean hasPermissions() {
return ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_GRANTED &&
ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_ADMIN) == PackageManager.PERMISSION_GRANTED &&
ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED &&
ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED &&
ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
ActivityCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED &&
ActivityCompat.checkSelfPermission(this, Manifest.permission.VIBRATE) == PackageManager.PERMISSION_GRANTED &&
ActivityCompat.checkSelfPermission(this, Manifest.permission.FOREGROUND_SERVICE) == PackageManager.PERMISSION_GRANTED;
}
//Bluetoothの検知機能 private void requestPermissions() {
private final BroadcastReceiver receiver = new BroadcastReceiver() { ActivityCompat.requestPermissions(this,
new String[]{
Manifest.permission.BLUETOOTH,
Manifest.permission.BLUETOOTH_ADMIN,
Manifest.permission.BLUETOOTH_SCAN,
Manifest.permission.BLUETOOTH_CONNECT,
Manifest.permission.ACCESS_FINE_LOCATION,
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.POST_NOTIFICATIONS,
Manifest.permission.VIBRATE,
Manifest.permission.FOREGROUND_SERVICE
},
2);
}
@Override @Override
public void onReceive(Context context, Intent intent) { public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
String action = intent.getAction(); // may need to chain this to a recognizing function super.onRequestPermissionsResult(requestCode, permissions, grantResults);
BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE); if (requestCode == 2) {
// HomeFragment homeFragment=new HomeFragment(); if (!hasPermissions()) {
Toast.makeText(this, "Permissions not granted.", Toast.LENGTH_SHORT).show();
if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
Log.d("BT", "No permission to connect bluetooth devices");
return;
} }
String deviceHardwareAddress = device.getAddress(); // MAC address
if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
//Do something if connected
Log.d("BT", "Device connected");
String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
Log.d("BT_Judge", "Registered: " + registeredId);
if (deviceHardwareAddress.equals(registeredId)) {
Log.d("BT_Judge", "登録済み");
} else Log.d("BT_Judge", "未登録");
} else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
//Do something if disconnected
Log.d("BT", "Device disconnected");
} }
} }
};
public void firebaselink() {//Firebaseのドキュメントの取得
public void firebaseLink() {//Firebaseのドキュメントの取得
//共有プリファレンス全体の準備 //共有プリファレンス全体の準備
SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE); SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
String IdPref = sharedPreferences.getString("ID", null);////アプリに記録されているIDの取得 String IdPref = sharedPreferences.getString("ID", null);////アプリに記録されているIDの取得
@@ -239,6 +253,25 @@ public class MainActivity extends AppCompatActivity {
isReported.update("isReported", false).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e)); isReported.update("isReported", false).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
} }
public void changeIsInCar() {
//共有プリファレンス全体の準備
SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
//共有プリファレンス 書き込みの準備
SharedPreferences.Editor E = sharedPreferences.edit();
String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
Boolean change=sharedPreferences.getBoolean("change",false);
db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
DocumentReference isReported = db.collection("status").document(IdPref);//更新するドキュメントとの紐づけ
Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言
if (!change) {
//isInCarをtrueに更新
E.putBoolean("change",true);
}else{
E.putBoolean("change",false);
}
isReported.update("isInCar", change).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
E.apply();
}
public void NotificationSetting() {//通知に関する設定の処理を行うメソッド public void NotificationSetting() {//通知に関する設定の処理を行うメソッド
int importance = NotificationManager.IMPORTANCE_DEFAULT; int importance = NotificationManager.IMPORTANCE_DEFAULT;
//通知チャネルの実装 //通知チャネルの実装
@@ -297,6 +330,7 @@ public class MainActivity extends AppCompatActivity {
notificationManager.notify(R.string.app_name, builder.build());//通知の表示 notificationManager.notify(R.string.app_name, builder.build());//通知の表示
} }
@Override @Override
public void onStop() {//アプリをバックグラウンドにした時のメソッド public void onStop() {//アプリをバックグラウンドにした時のメソッド
super.onStop(); super.onStop();
@@ -304,5 +338,137 @@ public class MainActivity extends AppCompatActivity {
startService(intent);//TestServiceを起動 startService(intent);//TestServiceを起動
} }
public void NotificationBluetooth(Context context) {//実際に通知を行うメソッド
final String CHANNEL_ID = "my_channel_id";
// 通知がクリックされたときに送信されるIntent
Intent intent = new Intent(context, MainActivity.class);
intent.setAction("OPEN_ACTIVITY");
// PendingIntentの作成
int requestCode = 100;
int flags = 0;
PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent, flags | PendingIntent.FLAG_IMMUTABLE);
((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(2000);//バイブレーション
@SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
.setSmallIcon(android.R.drawable.ic_menu_info_details)
.setContentTitle("子供の置き去りをしていませんか?")//通知のタイトル
.setContentText("Bluetoothと車の切断から5分が経過しました")//通知の本文
.setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
.setAutoCancel(true)//通知をタップすると削除する
.setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
// NotificationChannelの作成(Android 8.0以降)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
if (notificationManager != null) {
NotificationChannel channel = new NotificationChannel(
CHANNEL_ID,
"Channel Name",
NotificationManager.IMPORTANCE_HIGH
);
channel.setDescription("Channel Description");
channel.enableLights(true);
channel.setLightColor(Color.RED);
channel.enableVibration(true);
notificationManager.createNotificationChannel(channel);
}
}
NotificationManager notificationManager = (NotificationManager)context.getSystemService(context.NOTIFICATION_SERVICE);
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
return;
}
notificationManager.notify(R.string.app_name, builder.build());//通知の表示
}
public void Bluetooth_status() {
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
Log.d("BT", "No permission to connect bluetooth devices");
return;
} else {
Log.d("BT", "Permission to connect bluetooth devices granted");
}
registerReceiver(receiver, intentFilter);
}
private final BroadcastReceiver receiver = new BroadcastReceiver() {
//PreferenceManager.getDefaultSharedPreferences("myPreferences",Context.MODE_PRIVATE);
@Override
public void onReceive(Context context, Intent intent) {
SharedPreferences pref=getSharedPreferences("Bluetooth_situation",MODE_PRIVATE);
SharedPreferences.Editor e=pref.edit();
String action = intent.getAction(); // may need to chain this to a recognizing function
BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
Boolean isInCar = pref.getBoolean("isInCarPref", false);
if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
Log.d("BT", "No permission to connect bluetooth devices");
return;
}
String deviceHardwareAddress = device.getAddress(); // MAC address
String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
//Do something if connected
//Bluetoothデバイスが接続されたときの処理
changeBluetooth(true);
Log.d("BT", "Device connected");
Log.d("BT_Judge", "Registered: " + registeredId);
if (deviceHardwareAddress.equals(registeredId)) {
//登録済みのデバイスだったときの処理
Log.d("BT_Judge", "登録済み");
e.putBoolean("connection_status",true);
} else{
//登録していないデバイスだったときの処理
Log.d("BT_Judge", "未登録");
e.putBoolean("connection_status",false);
}
e.apply();
} else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)&&!isInCar) {//bluetoothが切断されたときに乗車状態のとき
//Do something if disconnected
//デバイスが切断されたときの処理
changeBluetooth(false);
if (deviceHardwareAddress.equals(registeredId)) {
// 5分待機する
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
public void run() {
if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)&&!isInCar) {//その後bluetoothを再接続したり降車状態になったりしていない=置き去りが発生した可能性大
NotificationBluetooth(getApplicationContext());//通知を行うメソッド
}}
}, 5 *60*1000); // 5分をミリ秒に変換
}
}else {
Log.d("BT", "Device disconnected");
}
}
};
public void changeBluetooth(boolean actual){
getSharedPreferences("Bluetooth_situation",MODE_PRIVATE).edit().putBoolean("status",actual).apply();
}
} }
@@ -5,6 +5,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
public class NotificationReceiver extends BroadcastReceiver {//通知をタップしたときにアプリを起動する処理 public class NotificationReceiver extends BroadcastReceiver {//通知をタップしたときにアプリを起動する処理
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (intent.getAction() != null && intent.getAction().equals("OPEN_ACTIVITY")) {// 通知がタップされたときの処理 if (intent.getAction() != null && intent.getAction().equals("OPEN_ACTIVITY")) {// 通知がタップされたときの処理
@@ -1,19 +1,14 @@
package com.example.childguard; package com.example.childguard;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.drawable.BitmapDrawable;
import android.util.AndroidRuntimeException; import android.util.AndroidRuntimeException;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.ImageView;
import androidx.print.PrintHelper;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.WriterException; import com.google.zxing.WriterException;
@@ -30,40 +25,41 @@ public class QrUtils {
public Bitmap getBitmap(String key) { public Bitmap getBitmap(String key) {
Log.d("getBitmap", "getBitmap: " + key); Log.d("getBitmap", "getBitmap: " + key);
String KoteiURL = "https://practicefirestore1-8808c.web.app/?id="; String fixationURL = "https://practicefirestore1-8808c.web.app/?id=";
//すべてのドメイン //すべてのドメイン
String AllURL; String AllURL;
//IdPrefにの値が初期値の場合 //IdPrefにの値が初期値の場合
AllURL=KoteiURL+key; AllURL = fixationURL + key;
int qrCodeSize = calculateQRCodeSize(); // 画面密度に応じてサイズを計算 int qrCodeSize = calculateQRCodeSize(); // 画面密度に応じてサイズを計算
Bitmap QRGazou; Bitmap QRImage;
Bitmap bitmapqr; Bitmap bitmapQR;
try { try {
//QRコード生成 //QRコード生成
BarcodeEncoder barcodeEncoder = new BarcodeEncoder(); BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
bitmapqr = barcodeEncoder.encodeBitmap(AllURL, BarcodeFormat.QR_CODE, qrCodeSize, qrCodeSize); bitmapQR = barcodeEncoder.encodeBitmap(AllURL, BarcodeFormat.QR_CODE, qrCodeSize, qrCodeSize);
} catch (WriterException e) { } catch (WriterException e) {
throw new AndroidRuntimeException("Barcode Error.", e); throw new AndroidRuntimeException("Barcode Error.", e);
} }
// 画像合成の準備 // 画像合成の準備
Bitmap bitmap = BitmapFactory.decodeResource(this.context.getResources(), R.drawable.a_group_qr_sos); Bitmap bitmap = BitmapFactory.decodeResource(this.context.getResources(), R.drawable.a_group_qr_sos_2);
int width = bitmap.getWidth(); int width = bitmap.getWidth();
int height = bitmap.getHeight(); int height = bitmap.getHeight();
QRGazou = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); QRImage = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
// Canvasの準備 // Canvasの準備
Canvas canvas = new Canvas(QRGazou); Canvas canvas = new Canvas(QRImage);
// 画像のサイズの調整 // 画像のサイズの調整
int disWidth = (width - bitmapqr.getWidth()) / 2; int disWidth = (width - bitmapQR.getWidth()) / 2;
int disHeight = (int) ((height - bitmapqr.getHeight()) / 1.5); int disHeight = (int) ((height - bitmapQR.getHeight()) / 1.5);
canvas.drawBitmap(bitmap, 0, 0, (Paint) null); canvas.drawBitmap(bitmap, 0, 0, (Paint) null);
canvas.drawBitmap(bitmapqr, disWidth, disHeight, (Paint) null); // 画像合成 canvas.drawBitmap(bitmapQR, disWidth, disHeight, (Paint) null); // 画像合成
//Androidからプリンターへ印刷指示を出すサポートライブラリ //Androidからプリンターへ印刷指示を出すサポートライブラリ
return QRGazou; return QRImage;
} }
private int calculateQRCodeSize() { private int calculateQRCodeSize() {
// 画面解像度を取得 // 画面解像度を取得
DisplayMetrics metrics = new DisplayMetrics(); DisplayMetrics metrics = new DisplayMetrics();
@@ -72,7 +68,7 @@ public class QrUtils {
// 画面密度に基づいてQRコードのサイズを計算 // 画面密度に基づいてQRコードのサイズを計算
float density = context.getResources().getDisplayMetrics().density; float density = context.getResources().getDisplayMetrics().density;
return (int) (800 * density); return (int) (700 * density);
} }
} }
@@ -23,6 +23,7 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
Context applicationContext; Context applicationContext;
View parentView; View parentView;
// Constructor // Constructor
public RecyclerAdapter(ArrayList<String[]> deviceList, Context applicationContext, View parentView) { public RecyclerAdapter(ArrayList<String[]> deviceList, Context applicationContext, View parentView) {
// Init // Init
@@ -30,6 +31,7 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
this.deviceList = deviceList; this.deviceList = deviceList;
this.applicationContext = applicationContext; this.applicationContext = applicationContext;
this.parentView = parentView; this.parentView = parentView;
} }
@NonNull @NonNull
@@ -62,7 +64,6 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
textView.setText(PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_name", "none")); textView.setText(PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_name", "none"));
}) })
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.show(); .show();
@@ -26,6 +26,7 @@ import java.util.Map;
public class SettingFragment extends Fragment { public class SettingFragment extends Fragment {
FirebaseFirestore db; FirebaseFirestore db;
public SettingFragment() { public SettingFragment() {
// Required empty public constructor // Required empty public constructor
} }
@@ -9,18 +9,16 @@ import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Color; import android.graphics.Color;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Looper;
import android.os.Vibrator; import android.os.Vibrator;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
import android.widget.Toast;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
@@ -38,11 +36,11 @@ public class TestService extends Service {
public static final String TAG = "InspirationQuote"; public static final String TAG = "InspirationQuote";
public PeriodicTaskManager periodicTaskManager;
@Override @Override
public int onStartCommand(Intent intent, int flags, int startId) { public int onStartCommand(Intent intent, int flags, int startId) {
//共有プリファレンス全体の準備 //共有プリファレンス全体の準備
SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE); SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得 String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
@@ -52,12 +50,16 @@ public class TestService extends Service {
mDocRef = FirebaseFirestore.getInstance().document("status/" + IdPref);//現在の位置を取得 mDocRef = FirebaseFirestore.getInstance().document("status/" + IdPref);//現在の位置を取得
initNotification(mDocRef);//現在の位置を引数に initNotification()を処理 initNotification(mDocRef);//現在の位置を引数に initNotification()を処理
} }
Bluetooth_status();
return flags; return flags;
} }
private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理 private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
// PeriodicTaskManagerのインスタンス化 // PeriodicTaskManagerのインスタンス化
periodicTaskManager = new PeriodicTaskManager();
// 共有プリファレンス全体の準備 // 共有プリファレンス全体の準備
SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE); SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
//車の乗り降りを管理するtrue=乗車、false=降車 //車の乗り降りを管理するtrue=乗車、false=降車
@@ -75,13 +77,12 @@ public class TestService extends Service {
Log.d("nt", "レスポンスを検知しました1"); Log.d("nt", "レスポンスを検知しました1");
if (isInCar) {//isReportedがtrue=サイト上で乗車状態のとき if (isInCar) {//isReportedがtrue=サイト上で乗車状態のとき
if (documentSnapshot.getBoolean("isReported")) { if (documentSnapshot.getBoolean("isReported")) {
//ここスタート(リサイクル)
ResetReported();// ResetReported();を処理→FireBaseのisReportedをfalseにする ResetReported();// ResetReported();を処理→FireBaseのisReportedをfalseにする
NotificationSetting();//通知に関する設定のメソッド NotificationSetting();//通知に関する設定のメソッド
Notification(getApplicationContext());//通知を行うメソッド Notification(getApplicationContext());//通知を行うメソッド
} }
} else if(!isInCar){//isReportedがfalse=サイト上で降車状態のとき } else {//isReportedがfalse=サイト上で降車状態のとき
ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする
}else {
ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする
} }
} }
@@ -158,7 +159,8 @@ public class TestService extends Service {
} }
notificationManager.notify(R.string.app_name, builder.build());//通知の表示 notificationManager.notify(R.string.app_name, builder.build());//通知の表示
} }
public void NotificationBluetooth(Context context, int time) {//実際に通知を行うメソッド
public void NotificationBluetooth(Context context) {//実際に通知を行うメソッド
final String CHANNEL_ID = "my_channel_id"; final String CHANNEL_ID = "my_channel_id";
// 通知がクリックされたときに送信されるIntent // 通知がクリックされたときに送信されるIntent
Intent intent = new Intent(context, MainActivity.class); Intent intent = new Intent(context, MainActivity.class);
@@ -173,7 +175,7 @@ public class TestService extends Service {
@SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID") @SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
.setSmallIcon(android.R.drawable.ic_menu_info_details) .setSmallIcon(android.R.drawable.ic_menu_info_details)
.setContentTitle("子供の置き去りをしていませんか?")//通知のタイトル .setContentTitle("子供の置き去りをしていませんか?")//通知のタイトル
.setContentText("Bluetootと車の切断から"+time+"分が経過しました")//通知の本文 .setContentText("Bluetoothと車の切断から5分が経過しました")//通知の本文
.setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する .setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
.setAutoCancel(true)//通知をタップすると削除する .setAutoCancel(true)//通知をタップすると削除する
.setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定 .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
@@ -204,60 +206,89 @@ public class TestService extends Service {
} }
notificationManager.notify(R.string.app_name, builder.build());//通知の表示 notificationManager.notify(R.string.app_name, builder.build());//通知の表示
} }
public class PeriodicTaskManager {//Bluetoothの切断後に乗車状態にならなかった場合に5分毎に通知を送るメソッド
private static final long INTERVAL = 5 * 1000; //300秒
private final Handler handler;
private final Runnable periodicTask;
public PeriodicTaskManager() { public void Bluetooth_status() {
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
handler = new Handler(Looper.getMainLooper()); if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
periodicTask = new Runnable() { Log.d("BT", "No permission to connect bluetooth devices");
return;
public void run() {
//共有プリファレンス全体の準備
SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
int time=sharedPreferences.getInt("time",0);
//共有プリファレンス 書き込みの準備
SharedPreferences.Editor E = sharedPreferences.edit();
if(time==0) {//Bluetoot切断からの時間経過(5分刻み)
E.putInt("time",5);
E.apply();;
} else { } else {
E.putInt("time",time+5); Log.d("BT", "Permission to connect bluetooth devices granted");
E.apply(); }
registerReceiver(receiver, intentFilter);
} }
// 5分毎に実行される処理
NotificationBluetooth(getApplicationContext(),time);
Log.d("PeriodicTask", "5分後に処理を実行します");
handler.postDelayed(this, INTERVAL); private final BroadcastReceiver receiver = new BroadcastReceiver() {
//PreferenceManager.getDefaultSharedPreferences("myPreferences",Context.MODE_PRIVATE);
@Override
public void onReceive(Context context, Intent intent) {
SharedPreferences pref = getSharedPreferences("Bluetooth_situation", MODE_PRIVATE);
SharedPreferences.Editor e = pref.edit();
String action = intent.getAction(); // may need to chain this to a recognizing function
BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
Boolean isInCar = pref.getBoolean("isInCarPref", false);
if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
Log.d("BT", "No permission to connect bluetooth devices");
return;
}
String deviceHardwareAddress = device.getAddress(); // MAC address
String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
//Do something if connected
//Bluetoothデバイスが接続されたときの処理
Log.d("BT", "Device connected");
Log.d("BT_Judge", "Registered: " + registeredId);
if (deviceHardwareAddress.equals(registeredId)) {
//登録済みのデバイスだったときの処理
Log.d("BT_Judge", "登録済み");
e.putBoolean("connection_status", true);
} else {
//登録していないデバイスだったときの処理
Log.d("BT_Judge", "未登録");
e.putBoolean("connection_status", false);
}
e.apply();
} else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action) && !isInCar) {//bluetoothが切断されたときに乗車状態のとき
//Do something if disconnected
//デバイスが切断されたときの処理
if (deviceHardwareAddress.equals(registeredId)) {
// 5分待機する
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
public void run() {
if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action) && !isInCar) {//その後bluetoothを再接続したり降車状態になったりしていない=置き去りが発生した可能性大
NotificationBluetooth(getApplicationContext());//通知を行うメソッド
}
}
}, 5 * 60 * 1000); // 5分をミリ秒に変換
}
} else {
Log.d("BT", "Device disconnected");
}
} }
}; };
}
public void startPeriodicTask() {
// 最初の実行
handler.postDelayed(periodicTask,INTERVAL);//一回目は5分後に行う
}
public void stopPeriodicTask() {
//共有プリファレンス全体の準備
SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
int time=sharedPreferences.getInt("time",0);
//共有プリファレンス 書き込みの準備
SharedPreferences.Editor E = sharedPreferences.edit();
E.putInt("time",0);
E.apply();
// 定期的な処理の停止
handler.removeCallbacks(periodicTask);
}
}
@Nullable @Nullable
@Override @Override
public IBinder onBind(Intent intent) { public IBinder onBind(Intent intent) {
@@ -126,7 +126,6 @@ public class bluetooth_setupFragment extends Fragment {
for (BluetoothDevice device : pairedDevices) { for (BluetoothDevice device : pairedDevices) {
String[] deviceInfo = new String[2]; String[] deviceInfo = new String[2];
deviceInfo[0] = device.getName(); deviceInfo[0] = device.getName();
deviceInfo[1] = device.getAddress(); // MAC address deviceInfo[1] = device.getAddress(); // MAC address
@@ -147,7 +146,6 @@ public class bluetooth_setupFragment extends Fragment {
textView.setText(PreferenceManager.getDefaultSharedPreferences(requireActivity().getApplicationContext()).getString("bluetooth_device_name", "none")); textView.setText(PreferenceManager.getDefaultSharedPreferences(requireActivity().getApplicationContext()).getString("bluetooth_device_name", "none"));
} }
return view; return view;
Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

@@ -49,6 +49,7 @@
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:id="@+id/situation_bg2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
@@ -57,6 +58,7 @@
android:background="@drawable/frame_style"> android:background="@drawable/frame_style">
<TextView <TextView
android:id="@+id/Bluetoothsituation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
@@ -73,6 +75,7 @@
android:textAlignment="center" /> android:textAlignment="center" />
<ImageView <ImageView
android:id="@+id/Bluetoothsituationimage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_marginTop="50dp" android:layout_marginTop="50dp"
@@ -6,11 +6,19 @@
tools:context=".NotificationFragment"> tools:context=".NotificationFragment">
<!-- TODO: Update blank fragment layout --> <!-- TODO: Update blank fragment layout -->
<LinearLayout 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:weightSum="10"
android:orientation="vertical"
tools:context=".MainActivity">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="9" android:layout_weight="9">
>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView1" android:id="@+id/recyclerView1"
@@ -20,4 +28,8 @@
</LinearLayout> </LinearLayout>
</LinearLayout>
</FrameLayout> </FrameLayout>
+38 -6
View File
@@ -7,18 +7,50 @@
tools:context=".SettingFragment" tools:context=".SettingFragment"
android:padding="16dp"> android:padding="16dp">
<Button
android:id="@+id/button_print_qr" <ImageView
android:layout_width="match_parent" android:src="@drawable/bluetooth_and_qr2"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="200dp"
android:layout_marginTop="150dp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="QRコード印刷" android:textColor="@color/black"
android:layout_marginVertical="8dp"/> android:text="QRコード印刷とBluetooth設定"
android:layout_gravity="center_horizontal"
android:textStyle="bold"
android:textSize="18dp"
android:layout_marginTop="20dp"
/>
<Button <Button
android:id="@+id/button_bluetooth_setting" android:id="@+id/button_bluetooth_setting"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Bluetooth設定" android:text="Bluetooth設定"
android:layout_marginVertical="8dp"/> android:layout_marginTop="120dp"
android:layout_marginBottom="20dp"/>
<Button
android:id="@+id/button_print_qr"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="QRコード印刷"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="QRコードは株式会社デンソーウェーブの登録商標です"
android:textColor="@color/black" />
</LinearLayout>
</LinearLayout> </LinearLayout>