Compare commits

..

221 Commits
QR ... main

Author SHA1 Message Date
c598e08129 Merge pull request '微修正' (#37) from hotfix-Fine-adjustment into main
Reviewed-on: #37
2024-08-13 19:25:34 +00:00
59b299028a 微修正 2024-08-14 04:24:10 +09:00
86c33fbb10 Merge pull request '微修正' (#36) from hotfix-Fine-adjustment into main
Reviewed-on: #36
2024-08-13 19:07:09 +00:00
f4a919e53e 微修正 2024-08-14 04:05:41 +09:00
b3cf353a80 Merge pull request 'すべてのバグを修正。たぶん' (#35) from hotfix-isInCar into main
Reviewed-on: #35
2024-08-13 15:53:50 +00:00
c5b82eb602 すべてのバグを修正。たぶん 2024-08-14 00:47:43 +09:00
266d228fc6 Merge pull request '修正中、バグあり' (#34) from hotfix-isInCar into main
Reviewed-on: #34
2024-08-10 14:04:38 +00:00
15c63f508a 修正中、バグあり 2024-08-10 22:55:17 +09:00
7fac075a8b Merge pull request 'Bluetoothの判定処理が正しく行われていないバグを修正' (#33) from hotfix-Bluetooth into main
Reviewed-on: #33
2024-08-04 17:34:16 +00:00
4f01f96bbc Bluetoothの判定処理が正しく行われていないバグを修正
ついでに、MainActivityの掃除もした
2024-08-05 02:33:27 +09:00
49aa1ac8a7 Merge pull request 'IDが生成されたときに、サービスの起動を行うようにした' (#32) from hotfix-notification into main
Reviewed-on: #32
2024-08-04 16:13:04 +00:00
16265d5d31 IDが生成されたときに、サービスの起動を行うようにした
ついでに、サービスの名前も変えた
2024-08-05 01:11:34 +09:00
4c4930ce65 Merge pull request 'hotfix-notifivation' (#31) from hotfix-notifivation into main
Reviewed-on: #31
2024-08-03 15:20:20 +00:00
9d92652385 コメントアウトとかいろいろ細かい修正を加えた 2024-08-04 00:18:43 +09:00
1cf5a920b8 Bluetoothの判定処理から通知機能を消し飛ばした 2024-08-01 10:20:24 +09:00
e4431e1218 Merge pull request 'キー修正, 否定追加, ログ追加' (#30) from fix/fix_service into main
Reviewed-on: #30
2024-07-30 06:09:24 +00:00
751d47aee7
キー修正, 否定追加, ログ追加 2024-07-29 17:54:37 +09:00
25879c4ad5 Merge pull request '変数とかの名前の修正' (#29) from hotfix-notification into main
Reviewed-on: #29
2024-07-25 17:59:54 +00:00
e906343619 変数とかの名前の修正 2024-07-26 01:08:23 +09:00
f21f684f17 Merge pull request 'TestServiceの全体的なリファクタリング' (#28) from improve/refactor_service into main
Reviewed-on: #28
2024-07-12 02:17:25 +00:00
3d54953110
微修正 2024-07-12 10:13:01 +09:00
5e15040c56
条件修正 2024-07-12 09:42:24 +09:00
54cf93769d
条件修正 2024-07-12 09:41:21 +09:00
2dcf6808f4
JavaDoc 2024-07-11 17:01:56 +09:00
ebceb27c99
invert 2024-07-11 17:01:10 +09:00
cf8260bdb3
fix dup 2024-07-11 16:55:11 +09:00
7653efa4e3
ミス修正 2024-07-11 16:53:41 +09:00
b6c1bbd213
通知IDを修正 2024-07-11 16:53:22 +09:00
dbbe4b2f1e
Bluetooth駆動の通知と通報を別チャンネルに(通知の上書きが起こらないように) 2024-07-11 16:48:29 +09:00
bc59f98e3d
debug 2024-07-11 16:36:33 +09:00
92f3cf1e0f
文言修正 2024-07-11 16:36:21 +09:00
e9b08942c4
通知の重要度を修正 2024-07-11 16:35:02 +09:00
238f32addd
Merge branch 'main' into improve/refactor_service 2024-07-11 16:31:39 +09:00
e257038e40
フォアグラウンドサービスとして開始するように 2024-07-11 16:31:14 +09:00
5f3e2c0e94
fix miss 2024-07-11 16:29:09 +09:00
efaefe4da3
fix 2024-07-11 16:26:39 +09:00
72b4a01018
Debug 2024-07-11 16:26:04 +09:00
14e6409fd5 Merge pull request 'NotificationFragmentを削除' (#27) from improve/remove_unused_fragment into main
Reviewed-on: #27
2024-07-11 07:15:54 +00:00
286c66ec9c Merge pull request '不要なコールバックを削除' (#26) from improve/remove_unused_callback into main
Reviewed-on: #26
2024-07-11 07:15:46 +00:00
4265b69a83
Debug 2024-07-11 16:08:06 +09:00
04ea92e8ae
行数の削減 2024-07-11 16:06:29 +09:00
7cf0bde8d1
待機時間を定数化 2024-07-11 16:06:07 +09:00
85811b7bd0
インスタンス変数である必要がないものを削除 2024-07-11 16:05:10 +09:00
8a8ac211ef
不要なグローバル変数を削除 2024-07-11 16:04:28 +09:00
496c3fe934
スコープ修正 2024-07-11 16:03:54 +09:00
021bf814a9
JavaDoc追加 2024-07-11 16:01:52 +09:00
d08eab2b15
JavaDoc追加 2024-07-11 16:01:33 +09:00
2bf618a3f2
JavaDoc追加 2024-07-11 16:01:02 +09:00
c299696b8d
コメント削除 2024-07-11 16:00:21 +09:00
9cdfc6bc70
リファクタ 2024-07-11 16:00:05 +09:00
dc7b45436c
fix 2024-07-11 15:59:50 +09:00
a928641410
不要なインスタンスを保持しないように 2024-07-11 15:58:59 +09:00
36cbb5975a
シンプル化 2024-07-11 15:57:40 +09:00
d2e633b387
リネーム 2024-07-11 15:56:46 +09:00
dfb6649a3b
WIP リファクタリング 2024-07-11 15:55:34 +09:00
2fd61f5d55
final化 2024-07-11 15:50:13 +09:00
f0e9989338
Simplify 2024-07-11 15:49:55 +09:00
523f101909
リネーム 2024-07-11 15:49:42 +09:00
4f808579c5
不要な引数は固定値を用いるように変更 2024-07-11 15:49:02 +09:00
e19ee4d623
整理 2024-07-11 15:48:06 +09:00
1231748f76
不要なインスタンスを作成しないように 2024-07-11 15:47:51 +09:00
cff730b60a
簡素化 2024-07-11 15:47:24 +09:00
0a2cabd0af
不要なインスタンスを作成しないように 2024-07-11 15:47:14 +09:00
da545e4a5e
5分以内に再接続されたとき,通知をキャンセルするように 2024-07-11 15:47:02 +09:00
286c178f7f
不要な処理を削除(同じ値を5分後に比較しても結果は変わらないため) 2024-07-11 15:39:52 +09:00
32538a43d9
不要な比較を削除 2024-07-11 15:38:33 +09:00
3692e0cbd3
不要な処理を削除 2024-07-11 15:37:50 +09:00
f4e3db8158
設定しているだけで未使用の処理を削除 2024-07-11 15:36:57 +09:00
fb1faa6d56
プリミティブ型に変更 2024-07-11 15:35:00 +09:00
66fdb04556
Bluetooth権限のチェックを削除(既にチェックされているため) 2024-07-11 15:34:47 +09:00
d53691236f
必要なデータがない場合などにできるだけ早く処理を中断するように 2024-07-11 15:33:51 +09:00
b88684ef9a Merge pull request 'HomeFragment以外でBluetoothの状態が変化するとクラッシュする不具合を修正' (#25) from improve/fix_bt into main
Reviewed-on: #25
2024-07-11 06:29:51 +00:00
f4f6dc0107
名称修正 2024-07-11 15:26:52 +09:00
8164ce8bd6
呼び出し箇所修正 2024-07-11 15:26:19 +09:00
40c84f4041
WIP 通知作成処理を統一 2024-07-11 15:24:02 +09:00
fd7826af16
不要なSuppressを削除 2024-07-11 15:16:03 +09:00
02f2c36735
削除漏れコメント削除 2024-07-11 15:15:49 +09:00
2b7b8b3e9d
Bluetoothの権限確認を隔離, メソッド改名など 2024-07-11 15:12:06 +09:00
712d33d607
JavaDoc追加 2024-07-11 15:06:30 +09:00
1d01e217b6
JavaDoc追加 2024-07-11 15:06:24 +09:00
131fdf7d87
JavaDoc修正 2024-07-11 15:05:56 +09:00
e53fdb04b9
Warn対処(真偽反転) 2024-07-11 15:05:46 +09:00
48c3bec004
権限確認処理を統一 2024-07-11 15:03:13 +09:00
207f551bad
重複した処理を削除 2024-07-11 14:55:19 +09:00
aca3a15686
デバイスをバイブレーションさせる処理を統一 2024-07-11 14:53:03 +09:00
6a998d5718
pendingIntentの生成処理を統一 2024-07-11 14:51:59 +09:00
37dd6b630a
改行修正 2024-07-11 14:46:12 +09:00
368d2368ba
ユーザーIDの取得を共通化 + インスタンス変数で管理するように 2024-07-11 14:45:42 +09:00
e9c10fc266
未使用処理を削除 2024-07-11 14:42:22 +09:00
61c2abcdad
add JavaDoc 2024-07-11 14:41:17 +09:00
2c5f0fe667
通知チャンネルの作成処理を統一 2024-07-11 14:40:34 +09:00
55334597c3
不要なSuppressを削除(不具合に気づけなくなるため) 2024-07-11 14:29:03 +09:00
8a4fa768a8
非推奨になったバイブレーション処理を置換 2024-07-11 14:27:52 +09:00
e77b50eee3
権限チェックはメソッドの最初で行うように 2024-07-11 14:25:05 +09:00
6667a63bff
notificationManagerを共有するように 2024-07-11 14:23:18 +09:00
d723165b76
不要な比較を削除(アプリの要求APIバージョンがもともと26(=8.0(=Oreo))のため) 2024-07-11 14:22:28 +09:00
6ef2c129c6
NotificationFragmentを削除 2024-07-11 14:16:52 +09:00
aa6ee4f035
void onEvent2, boolean onEvent2を削除 2024-07-11 14:08:51 +09:00
d817dfaf58
onResumeでSharedPreferenceから読み取ってUIを更新するように 2024-07-11 14:01:16 +09:00
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
d6a5638d5c レイアウトを変更 2024-02-05 16:27:06 +09:00
磯野
895732b1b3 タイポをところどころ修正しました。 2024-02-01 15:31:02 +09:00
aef4ba4bea "QRコードは株式会社デンソーウェーブの登録商標です"を追加 2024-01-30 10:20:09 +09:00
it232115
d3f4c83d2b アプリでQRを読み取った瞬間に乗降状態が変更されるように処理を変更 2024-01-24 12:56:02 +09:00
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
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
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
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
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
it232115
39e9336de0 各種バグの修正
通知のリスト化昨日の断念
2024-01-22 22:06:37 +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
it232115
b3972ef0e0 QR画像のサイズを調整 2024-01-20 14:31:16 +09:00
N-YOKU-jp
ffd307233b
Merge pull request #19 from child-guardian/housinnhennkougo
Housinnhennkougo
2024-01-19 14:12:11 +09:00
it232115
994bdb4b06 Merge remote-tracking branch 'origin/housinnhennkougo' into housinnhennkougo 2024-01-19 14:11:32 +09:00
it232115
b774658eb4 タイマの終了タイミングを調整しました 2024-01-19 14:11:06 +09:00
ろむねこ
3404e833e7
Merge pull request #18 from child-guardian/hotfix-1
Hotfix 1
2024-01-19 12:56:18 +09:00
54950e9d38
fix 2024-01-19 12:53:19 +09:00
9d431bd297
HomeFragmentがResumeされたときにローカルの最新を読み込むように 2024-01-19 12:53:01 +09:00
e84b21288f
changessituationを廃止 2024-01-19 12:49:09 +09:00
ろむねこ
b28911f386
Merge pull request #17 from child-guardian/housinnhennkougo
Housinnhennkougo
2024-01-19 12:20:35 +09:00
ろむねこ
d65ff52a00
Merge branch 'main' into housinnhennkougo 2024-01-19 12:20:14 +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
it232115
1f1570c982 不要なコードの削除
タイマ開始後の時間経過で通知の内容を変更するコードを追加しました
2024-01-19 10:24:05 +09:00
99201fda27 Bluetoothデバイスを登録済みか判定する機能を追加 2024-01-19 09:45:26 +09:00
it232115
85d596f610 デバイスによってQR画像のサイズが大きく違うバグの修正(テストはしていない) 2024-01-19 06:35:32 +09:00
it232115
19a4765bf0 画面遷移を原因とするFirebaseとの同期ズレを改善 2024-01-19 06:19:04 +09:00
it232115
0bdbc55518 Bluetooth切断後の5分毎のループによる通知を追加しました 2024-01-19 05:35:11 +09:00
it232115
844d7f43e5 第三者通報の通知をロック画面に表示しました 2024-01-19 04:42:53 +09:00
it232115
0c8c7c3d77 バナー通知をタップした時にMainActivityを開くコードを追加しました。 2024-01-19 04:28:17 +09:00
it232115
25bf332fa9 各種コメントを追加
現時点で把握しているバグ
・降車状態のときにQRリーダを起動し戻るとアプリの表示が乗車状態になる
・乗車状態のときにsettingsへ移動し戻るとアプリの表示が降車状態になる
2024-01-19 02:33:56 +09:00
it232115
c196399c24 乗車状態のときに第三者通報を行うと、FireBaseとの同期がズレるバグを解消しました 2024-01-19 01:46:33 +09:00
it232115
a87a2d150a バックグラウンド中の第三者通報によりバイブレーションをならせた 2024-01-19 00:57:33 +09:00
ろむねこ
c90d0b8f6e
Merge pull request #16 from child-guardian/fix-1
Fix 1
2024-01-17 20:07:45 +09:00
87fbf5659e
onStopをコメントアウト 2024-01-17 20:05:49 +09:00
39ebdf0259
条件式を変更 2024-01-17 19:55:30 +09:00
23be550762
onResumeの場所を変更 2024-01-17 19:50:41 +09:00
51fd91027d
ShardPreferenceのチェックが異常だったので修正 2024-01-17 19:49:28 +09:00
ろむねこ
e4aafc44c6
Merge pull request #15 from child-guardian/rca/fix_ui
Rca/fix UI
2024-01-17 19:27:28 +09:00
a9485d04ce
UI調整 2024-01-17 19:23:51 +09:00
b5c281b8dd
不要な処理を削除 2024-01-17 19:20:24 +09:00
1eea70f920
修正 2024-01-17 19:15:24 +09:00
d6af5b935b
WIP 2024-01-17 18:58:25 +09:00
6d636c514f
不要な処理を削除 2024-01-17 18:25:18 +09:00
b8caf9abf4
HomeFragmentに戻される原因を修正, SettingFragmentではFabを隠すように 2024-01-17 18:24:29 +09:00
272931c037
リネームなど 2024-01-17 18:07:47 +09:00
3bc8be8eb2
UI修正 2024-01-17 18:05:38 +09:00
cf797bda9c
Revert "アクティビティ作成"
This reverts commit 72c09a2eef.
2024-01-17 18:02:12 +09:00
7ccacec325
Revert "WIP"
This reverts commit 3538c61582.
2024-01-17 18:01:56 +09:00
3538c61582
WIP 2024-01-17 18:01:48 +09:00
f65331da84
WIP 2024-01-17 17:55:04 +09:00
a4527e5117
WIP 2024-01-17 17:55:00 +09:00
72c09a2eef
アクティビティ作成 2024-01-17 17:54:56 +09:00
fa7e8eae13
引数削除 2024-01-17 17:46:44 +09:00
44dacc7cdf
フラグメント作成 2024-01-17 17:46:26 +09:00
meato
a4178b6901 onStopを追加 2024-01-17 17:43:54 +09:00
349cc04e99
backStackに追加するように 2024-01-17 17:36:19 +09:00
953f3b81d0
Bluetooth設定を起動できるように 2024-01-17 17:23:07 +09:00
3d5c1cec09
ナビゲーションに追加 2024-01-17 17:22:54 +09:00
76bd76d915
UI調整 2024-01-17 17:22:46 +09:00
f9804c1569
UI調整 2024-01-17 16:59:59 +09:00
495672edde
引数削除 2024-01-17 16:56:14 +09:00
2a8231f544
SettingFragmentを作成 2024-01-17 16:55:44 +09:00
c09ba30fa1
修正 2024-01-17 16:55:05 +09:00
8bd8900286
MainActivity上でQRリーダーを呼ぶように 2024-01-17 16:54:21 +09:00
ae7af9d01a
例外キャッチを追加 2024-01-17 16:54:02 +09:00
8dd1745c1f
Fabを追加 2024-01-17 16:53:54 +09:00
7156c1b900
ナビゲーションからQRを削除 2024-01-17 16:29:27 +09:00
9332bff6ab
ナビゲーションに設定を追加, QRを削除 2024-01-17 16:29:01 +09:00
d5965658c4
設定アイコンを追加 2024-01-17 16:28:14 +09:00
38b509f5d2
hotfix: 全体的なリファクタリング, 切り替えに関する不具合の修正 2024-01-17 16:25:31 +09:00
9649cc3a6e
hotfix: UIが崩壊するのを修正 2024-01-17 13:44:23 +09:00
N-YOKU-jp
700f315bd3
Merge pull request #14 from child-guardian/itazuraboushi
Itazuraboushi
2024-01-17 12:25:41 +09:00
N-YOKU-jp
2093524f72
Merge branch 'main' into itazuraboushi 2024-01-17 12:24:30 +09:00
it232115
f9c4ff6aab 以下の処理を実装しました。
・乗車状態のときのみ第三者通報を有効にすることでいたずらを防止する処理
・画面の向きを変えたときに乗降状態がそれぞれの向きで独立してしまうバグの修正
・アプリを一度終了したときに乗降状態がリセットしてしまうバグの修正
・アプリをFireBaseのIDと紐づけることで、そのスマホで生成したQRコードのサイトでボタンを押したときにアプリの状態が変化する処理
2024-01-17 12:16:13 +09:00
Asura146
1d87ebaa4e
Merge pull request #13 from child-guardian/kyou/layout
Bluetoothデバイスを登録済みか判定する機能を追加
2024-01-17 12:12:31 +09:00
12239a269f Bluetoothデバイスを登録済みか判定する機能を追加 2024-01-17 12:07:01 +09:00
it232115
1eedc17a6c サイト上での保護者からの通知を受け取った時に乗降状態を変更する処理を追加しました。(完成) 2024-01-16 16:00:42 +09:00
it232115
473dde00aa サイト上での保護者からの通知を受け取った時に乗降状態を変更する処理を追加しました。(未完成) 2024-01-16 15:51:49 +09:00
Asura146
87aa82529c
Merge pull request #12 from child-guardian/kyou/layout
Kyou/layout
2024-01-16 11:56:08 +09:00
ろむねこ
cdea661646
Merge branch 'main' into kyou/layout 2024-01-16 11:55:46 +09:00
e1ec10e981 BluetoothDeviceを登録する機能を追加 2024-01-16 11:49:05 +09:00
磯野
3fa1fe412a 通知を送る機能を追加しました。 2024-01-16 11:21:54 +09:00
ろむねこ
800095eb61
Merge pull request #11 from child-guardian/QR
Qr
2024-01-16 11:15:25 +09:00
磯野
7d26985334 通知を送る機能を追加しました。 2024-01-15 16:41:09 +09:00
6fe06fbf48 Bluetoothデバイスを保存する機能を追加 2024-01-12 14:12:21 +09:00
磯野
8a7ab0b7a1 日付を取得できるようにしました 2024-01-12 12:23:22 +09:00
磯野
87c5af9f01 注釈を少し付け加えました 2024-01-12 12:17:43 +09:00
a69de31fa2
アイテムをタップしたときにアラートを表示するように 2024-01-12 11:55:02 +09:00
磯野
a81a4c07db Merge remote-tracking branch 'origin/main' 2024-01-12 11:53:50 +09:00
ろむねこ
d1ca79872e
Merge pull request #10 from child-guardian/QR
使用画像
2024-01-12 11:53:21 +09:00
磯野
a79d0fd75b Merge remote-tracking branch 'origin/main' 2024-01-12 11:37:41 +09:00
it232115
a25ed8d4d3 読み取ったQRコードがChiled Guard用サイトのドメインを含むかの判定を行う処理を追加しました。 2024-01-12 11:37:30 +09:00
it232115
8f769c8e04 印刷画像の生成に用いるxmlを追加しました。 2024-01-12 11:37:30 +09:00
it232115
67df5a3ec2 ユーザ毎のドメインからQRコードを生成し、プリンターへ印刷指示を出す処理を追加しました。 2024-01-12 11:37:29 +09:00
it232115
c37aee2751 QR画像を生成するフラグメントへの画像遷移を追加しました 2024-01-12 11:37:29 +09:00
ろむねこ
6759b2c831
Merge pull request #9 from child-guardian/QR
Qr
2024-01-12 11:36:57 +09:00
磯野
ff05035662 フォーマットを整えました 2024-01-12 11:08:34 +09:00
277999e536 Merge remote-tracking branch 'origin/main' 2024-01-12 10:49:23 +09:00
磯野
8a753ef1fe fragment_notification.xmlにリサイクラービューを追加しました。 2024-01-12 10:46:28 +09:00
a1f3a3c1bd Merge branch 'kyou/layout' 2024-01-12 10:41:04 +09:00
cd12c89081 Bluetoothデバイスを保存するクラスを作成 2024-01-12 10:37:44 +09:00
磯野
02b4134d41 通知関係の機能を一部修正しました。 2024-01-12 10:26:39 +09:00
磯野
0a210c5b94 Merge remote-tracking branch 'origin/main' 2024-01-11 16:58:15 +09:00
磯野
4beef55f9e Merge remote-tracking branch 'origin/main' 2024-01-11 16:52:16 +09:00
磯野
46102432da Merge remote-tracking branch 'origin/main' 2024-01-11 16:50:09 +09:00
it232115
ec6a94515d URLの受け渡しの処理を追加しました。 2024-01-11 16:45:10 +09:00
2eb6c6e685 add zxing 2024-01-11 16:45:10 +09:00
34 changed files with 1396 additions and 697 deletions

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$" />

View File

@ -59,6 +59,7 @@ dependencies {
implementation 'androidx.compose.ui:ui-graphics' implementation 'androidx.compose.ui:ui-graphics'
implementation 'androidx.compose.ui:ui-tooling-preview' implementation 'androidx.compose.ui:ui-tooling-preview'
implementation 'androidx.compose.material3:material3' implementation 'androidx.compose.material3:material3'
implementation 'com.google.firebase:firebase-firestore:24.4.1'
// Import the BoM for the Firebase platform // Import the BoM for the Firebase platform
implementation(platform("com.google.firebase:firebase-bom:32.7.0")) implementation(platform("com.google.firebase:firebase-bom:32.7.0"))

BIN
app/release/app-release.apk Normal file

Binary file not shown.

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"
}

View File

@ -10,6 +10,7 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<application <application
android:allowBackup="true" android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules" android:dataExtractionRules="@xml/data_extraction_rules"
@ -34,6 +35,7 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<service android:name=".SurveillanceService" />
</application> </application>
</manifest> </manifest>

View File

@ -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);
} }
} }

View File

@ -0,0 +1,70 @@
package com.example.childguard;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import androidx.print.PrintHelper;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.Toast;
/**
* A simple {@link Fragment} subclass.
* Use the {@link GenerateQrFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class GenerateQrFragment extends Fragment {
public GenerateQrFragment() {
// Required empty public constructor
}
public static GenerateQrFragment newInstance(String key) {
GenerateQrFragment fragment = new GenerateQrFragment();
Bundle args = new Bundle();
args.putString("key", key);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_generate_qr, container, false);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
QrUtils qrUtils = new QrUtils();
assert getArguments() != null;
Bitmap result = qrUtils.setContext(getContext()).getBitmap(getArguments().getString("key"));
ImageView imageView = view.findViewById(R.id.result_bitmap_image_view);
imageView.setImageBitmap(result);
view.findViewById(R.id.button_print).setOnClickListener(v -> {
PrintHelper photoPrinter = new PrintHelper(requireContext());
photoPrinter.setScaleMode(PrintHelper.SCALE_MODE_FIT);
photoPrinter.printBitmap("placeholder", result, () -> {
Toast.makeText(getContext(), "印刷完了", Toast.LENGTH_SHORT).show();
});
});
view.findViewById(R.id.button_cancel).setOnClickListener(v -> {
getParentFragmentManager().popBackStack();
});
}
}

View File

@ -1,42 +1,26 @@
package com.example.childguard; package com.example.childguard;
import static android.content.ContentValues.TAG;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.core.content.res.ResourcesCompat; import androidx.core.content.res.ResourcesCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import com.google.android.gms.tasks.OnFailureListener;
import com.google.android.gms.tasks.OnSuccessListener;
import com.google.firebase.firestore.DocumentReference;
import com.google.firebase.firestore.FirebaseFirestore;
import java.util.HashMap;
import java.util.Map;
/** /**
* A simple {@link Fragment} subclass. * A simple {@link Fragment} subclass.
* Use the {@link HomeFragment#newInstance} factory method to * Use the {@link HomeFragment#newInstance} factory method to
* create an instance of this fragment. * create an instance of this fragment.
*/ */
public class HomeFragment extends Fragment { public class HomeFragment extends Fragment {
FirebaseFirestore db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
// TODO: Rename parameter arguments, choose names that match // TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@ -47,6 +31,10 @@ public class HomeFragment extends Fragment {
private String str_key; private String str_key;
private String mParam2; private String mParam2;
final String GET_ON = "\n乗車状態";
final String GET_OFF = "\n降車状態";
public HomeFragment() { public HomeFragment() {
// Required empty public constructor // Required empty public constructor
} }
@ -72,131 +60,116 @@ public class HomeFragment extends Fragment {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (getArguments() != null) { if (getArguments() != null) {
// mParam1 = getArguments().getString(ARG_PARAM1); // mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2); mParam2 = getArguments().getString(ARG_PARAM2);
} }
} }
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
// Log.d("HomeFlagment_cnt", "aaaaa");
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_home, container, false); View view = inflater.inflate(R.layout.fragment_home, container, false);
MainActivity activity = (MainActivity) getActivity();
//共有プリファレンス 全体の準備
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
//QRコード印刷の処理
Button bt1 = view.findViewById(R.id.QRprinting);
bt1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
//初回起動かを保存する変数
boolean alreadySaved = preferences.getBoolean("alreadySaved", false);
//ボタン変数の宣言
Button parent = view.findViewById(R.id.QRprinting);
Button born = view.findViewById(R.id.QRprinting);
//falseのときにFirebaseへの登録
if (alreadySaved) {
Log.d("HomeFragment", "already printed");
//画面遷移ID受け渡し
Toast.makeText(getActivity(),"再印刷",Toast.LENGTH_SHORT).show();
QrPrintFragment qrPrintFragment = new QrPrintFragment();
replaceFragment(qrPrintFragment);
return;
} else Log.d("HomeFragment", "not printed yet"); // debug
String valueParent = parent.getText().toString();//変数に文字列を代入
String valueBorn = born.getText().toString();//変数に文字列を代入
Map<String, String> user = new HashMap<>();//mapの宣言
Log.d("HomeFragment", "onClick is called");
//mapに入れる
user.put("parent", valueParent);
user.put("born", valueBorn);
//新しいドキュメントにIDを作って追加
db.collection("users")
.add(user)
.addOnSuccessListener(new OnSuccessListener<DocumentReference>() {
@Override
public void onSuccess(DocumentReference documentReference) {
//成功したら
//documentReference.getId()でID取得
Log.d(TAG, "DocumentSnapshot added with ID: " + documentReference.getId());
SharedPreferences.Editor e = preferences.edit();
// キー"alreadySaved"の値をtrueにする
e.putBoolean("alreadySaved", true);
//確定処理
e.apply();
//画面遷移ID受け渡し
str_key = "" + documentReference.getId();
Toast.makeText(getActivity(),"初回登録",Toast.LENGTH_SHORT).show();
QrPrintFragment qrPrintFragment = new QrPrintFragment();
Bundle bundle = new Bundle();
bundle.putString("STR_KEY",str_key);
//値を書き込む
qrPrintFragment.setArguments(bundle);
replaceFragment(qrPrintFragment);
}
})
.addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(@NonNull Exception e) {
//失敗したら
Log.w(TAG, "Error adding document", e);
}
});
}
});
//bluetooth設定ボタンの処理
Button bt2 = view.findViewById(R.id.Bluetooth_setup);
bt2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
replaceFragment(new bluetooth_setupFragment());
}
});
return view; return view;
} }
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
Log.d("HomeFragment", "onResume: called"); Log.d("HomeFragment", "onResume: called");
TextView situationTextView = getView().findViewById(R.id.situation); Log.d("isIncar", "onResume: " + getIsInCarLocal());
FrameLayout situation_bg = getView().findViewById(R.id.situation_bg); this.updateUiState(getIsInCarLocal());
updateInCarStatus(situationTextView, situation_bg); this.updateBluetoothSituation(isBluetoothConnected());
} }
public void updateInCarStatus(TextView situationTextView, FrameLayout situation_bg) {
SharedPreferences sharedPreferences = getActivity().getSharedPreferences("default", 0);
Log.d("HomeFragment", "updateInCarStatus: " + sharedPreferences.getBoolean("inCar", false)); private boolean isBluetoothConnected() {
if (sharedPreferences.getBoolean("inCar", false)) { SharedPreferences pref = requireActivity().getSharedPreferences("Bluetooth_situation", requireActivity().MODE_PRIVATE);
situationTextView.setText("\n降車状態"); return pref.getBoolean("status", false);
situation_bg.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null)); }
private boolean getIsInCarLocal() {
SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
Boolean isInCar = pref.getBoolean("isInCarPref", false);
Log.d("isInCarPref","isInCar"+ isInCar);
return isInCar;
}
/**
* 乗車状態の画面を切り替える
*/
private boolean updateUiState(boolean isInCar) {
Log.d("HomeFragment", "updateUiState: called");
Log.d("HomeFragment", "updateUiState:"+isInCar);
// Init
TextView tv;
FrameLayout fl;
try {
tv = requireView().findViewById(R.id.car_situation);
fl = requireView().findViewById(R.id.car_situation_bg);
} 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();
updateUiState(isInCar);
return false;
}
if (isInCar) {
//乗車状態にする
fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
tv.setText(GET_ON);
} else { } else {
situationTextView.setText("\n乗車状態"); //降車状態にする
situation_bg.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null)); fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null));
tv.setText(GET_OFF);
}
return true;
}
/**
* Bluetoothの接続状態の画面を切り替える
*/
boolean updateBluetoothSituation(Boolean BluetoothConnect) {
FrameLayout frameLayout;
TextView textView;
ImageView imageView;
try {
frameLayout = requireView().findViewById(R.id.situation_bg_bluetooth);
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;
}
final String CONNECT = "接続中";
final 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;
} }
} }
//画面遷移メソッド
private void replaceFragment(Fragment fragment) {
// フラグメントマネージャーの取得
FragmentManager manager = getParentFragmentManager(); // アクティビティではgetSupportFragmentManager()?
// フラグメントトランザクションの開始
FragmentTransaction transaction = manager.beginTransaction();
// レイアウトをfragmentに置き換え追加
transaction.replace(R.id.fragmentContainerView, fragment);
// 置き換えのトランザクションをバックスタックに保存する
transaction.addToBackStack(null);
// フラグメントトランザクションをコミット
transaction.commit();
}
}

View File

@ -1,98 +1,313 @@
package com.example.childguard; package com.example.childguard;
import androidx.appcompat.app.ActionBar; import android.annotation.SuppressLint;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.os.Vibrator;
import android.preference.PreferenceManager;
import android.util.Log;
import android.widget.FrameLayout;
import android.widget.Toast;
import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothManager;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Vibrator;
import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.firebase.firestore.DocumentReference;
import com.google.firebase.firestore.FirebaseFirestore;
import com.journeyapps.barcodescanner.ScanContract;
import com.journeyapps.barcodescanner.ScanOptions;
import java.util.Random; // Manifest
import java.util.UUID; import android.Manifest;
import java.util.HashMap;
import java.util.Map;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
BluetoothManager bluetoothManager; FirebaseFirestore db;
BluetoothAdapter bluetoothAdapter;
DocumentReference mDocRef;
private HomeFragment homeFragment = HomeFragment.newInstance("test", "test");;
public static final String TAG = "InspirationQuote";
private final ActivityResultLauncher<ScanOptions> QrLauncher = registerForActivityResult(
new ScanContract(),
result -> {
String contents = result.getContents();
if (contents == null) {
Toast.makeText(this, "QRコードが読み取れませんでした", Toast.LENGTH_LONG).show();
} else {
if (!contents.contains("https://practicefirestore1-8808c.web.app/")) {
Toast.makeText(this, "Child Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
} else {
changeIsInCar();
}
}
}
);
@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);
Log.d(TAG, "onCreate: called");
//Bluetooth接続判定用
SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
SharedPreferences.Editor e = pref.edit();
e.putBoolean("connection_status", false);
//通知のやつ if (!hasPermissions()) {
int importance = NotificationManager.IMPORTANCE_DEFAULT; requestPermissions();
}
NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "サンプルアプリ", importance);
channel.setDescription("説明・説明 ここに通知の説明を書くことができる");
NotificationManager notificationManager = getSystemService(NotificationManager.class);
notificationManager.createNotificationChannel(channel);
//通知のやつ
BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view); BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);
bottomNavigationView.setOnNavigationItemSelectedListener(v -> { this.homeFragment = HomeFragment.newInstance("test", "test");
if(savedInstanceState == null){
getSupportFragmentManager().beginTransaction()
.replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment)
.addToBackStack(null)
.commit();
}
bottomNavigationView.setOnNavigationItemSelectedListener(v ->
{
if (v.getItemId() == findViewById(R.id.navigation_home).getId()) { if (v.getItemId() == findViewById(R.id.navigation_home).getId()) {
Log.d("MainActivity", "navigation_home: called");
findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.VISIBLE);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.replace(findViewById(R.id.fragmentContainerView).getId(), HomeFragment.newInstance("test", "tset")) .replace(findViewById(R.id.fragmentContainerView).getId(), this.homeFragment)
.addToBackStack(null)
.commit(); .commit();
} else if (v.getItemId() == findViewById(R.id.navigation_QR).getId()) { //firebaseLink();
} else if (v.getItemId() == findViewById(R.id.navigation_settings).getId()) {
Log.d("MainActivity", "navigation_settings: called");
findViewById(R.id.fab_scan_qr_code).setVisibility(FrameLayout.GONE);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.replace(findViewById(R.id.fragmentContainerView).getId(), QRFragment.newInstance("test", "tset")) .replace(findViewById(R.id.fragmentContainerView).getId(), SettingFragment.newInstance())
.commit(); .addToBackStack(null)
} else if (v.getItemId() == findViewById(R.id.navigation_notification).getId()) {
getSupportFragmentManager().beginTransaction()
.replace(findViewById(R.id.fragmentContainerView).getId(), NotificationFragment.newInstance("test", "test"))
.commit(); .commit();
} }
firebaseLink();
Bluetooth_status();
return true; return true;
}); });
findViewById(R.id.fab_scan_qr_code).setOnClickListener(v -> {
Log.d("MainActivity/Fab", "onClick: called");
//QRリーダ起動
ScanOptions options = new ScanOptions();
options.setPrompt("QRコードを読み取ってください");
QrLauncher.launch(options);
});
//Bluetooth検知機能
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
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);
//startForegroundService(new Intent(this, SurveillanceService.class));
} }
//通知のやつ
public void notifyTest() {
((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(1000);
NotificationCompat.Builder builder = new NotificationCompat
.Builder(this, "CHANNEL_ID")
.setSmallIcon(android.R.drawable.ic_menu_info_details)
.setContentTitle("タイトル")
.setContentText("メッセージ・メッセージ")
.setPriority(NotificationCompat.PRIORITY_DEFAULT);
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this); @Override
protected void onResume() {
super.onResume();
Log.d("MainActivity onResume", "called");
// Log.d("MainActivity onResume", "mDocRef is null");
firebaseLink();
}
/**
* 乗車状態の変更
*/
public void changeIsInCar() {
//共有プリファレンス全体の準備
SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
//共有プリファレンス 書き込みの準備
SharedPreferences.Editor E = sharedPreferences.edit();
SharedPreferences.Editor E2 = sharedPreferences.edit();
String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
Log.d("MainActivity", "changeIsInCar: ID= " + IdPref);
boolean change = sharedPreferences.getBoolean("change", false);
Log.d("MainActivity", "changeIsInCar: " + change);
db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
DocumentReference isReported = db.collection("status").document(IdPref);//更新するドキュメントとの紐づけ
Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言
if (!change) {
//isInCarをtrueに更新
Log.d("MainActivity", "change:"+change);
E.putBoolean("change", true);
E.apply();
Log.d("MainActivity", "change:"+sharedPreferences.getBoolean("change",false));
} else {
Log.d("MainActivity", "change:"+change);
E.putBoolean("change", false);
E.apply();
Log.d("MainActivity", "change:"+sharedPreferences.getBoolean("change",false));
}
Log.d("MainActivity", "changeIsInCar: "+sharedPreferences.getBoolean("change",false));
isReported.update("isInCar", sharedPreferences.getBoolean("change",false)).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
E2.putBoolean("isInCarPref", sharedPreferences.getBoolean("change",false));
E2.apply();
}
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
// TODO: Consider calling
// ActivityCompat#requestPermissions private boolean hasPermissions() {
// here to request the missing permissions, and then overriding return ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_GRANTED &&
// public void onRequestPermissionsResult(int requestCode, String[] permissions, ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_ADMIN) == PackageManager.PERMISSION_GRANTED &&
// int[] grantResults) ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED &&
// to handle the case where the user grants the permission. See the documentation ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED &&
// for ActivityCompat#requestPermissions for more details. 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;
}
private void requestPermissions() {
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
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (requestCode == 2) {
if (!hasPermissions()) {
Toast.makeText(this, "Permissions not granted.", Toast.LENGTH_SHORT).show();
}
}
}
/**
* FireBaseのIDの取得
*/
public void firebaseLink() {//Firebaseのドキュメントの取得
Log.d("MainActivity", "firebaseLink: called");
//共有プリファレンス全体の準備
SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
if (IdPref == null) {
Log.d("onResume", "ID not initialized.");
} else {
mDocRef = FirebaseFirestore.getInstance().document("status/" + IdPref);//現在の位置を取得
//updateIsInCarPref(mDocRef);//現在の位置を引数に initNotification()を処理
}
}
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() {
@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; return;
} }
notificationManager.notify(R.string.app_name, builder.build()); String deviceHardwareAddress = device.getAddress(); // MAC address
String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");
if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
//Bluetoothデバイスが接続されたときの処理
Log.d("BT", "Device connected");
Log.d("BT_Judge", "Registered: " + registeredId);
if (deviceHardwareAddress.equals(registeredId)) {
//登録済みのデバイスだったときの処理
Log.d("BT_Judge", "登録済み");
changeBluetooth(true);
e.putBoolean("connection_status", true);
if(homeFragment != null && homeFragment.isVisible()){
homeFragment.updateBluetoothSituation(true);
} }
//Bluetooth_setupの戻るボタン } else {
public void setupBackButton(boolean enableBackButton){ //登録していないデバイスだったときの処理
ActionBar actionBar = getSupportActionBar(); Log.d("BT_Judge", "未登録");
actionBar.setDisplayHomeAsUpEnabled(enableBackButton); e.putBoolean("connection_status", false);
}
e.apply();
}else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
//bluetoothデバイスが切断されたときの処理
changeBluetooth(false);
if(homeFragment != null && homeFragment.isVisible()){
homeFragment.updateBluetoothSituation(false);
} }
} }
}
};
/**
* Bluetoothの接続状態を変更するメソッド
*/
public void changeBluetooth(boolean actual) {
getSharedPreferences("Bluetooth_situation", MODE_PRIVATE).edit().putBoolean("status", actual).apply();
}
}

View File

@ -1,64 +0,0 @@
package com.example.childguard;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
/**
* A simple {@link Fragment} subclass.
* Use the {@link NotificationFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class NotificationFragment extends Fragment {
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;
public NotificationFragment() {
// Required empty public constructor
}
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment NotificationFragment.
*/
// TODO: Rename and change types and number of parameters
public static NotificationFragment newInstance(String param1, String param2) {
NotificationFragment fragment = new NotificationFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_notification, container, false);
}
}

View File

@ -0,0 +1,17 @@
package com.example.childguard;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
public class NotificationReceiver extends BroadcastReceiver {//通知をタップしたときにアプリを起動する処理
@Override
public void onReceive(Context context, Intent intent) {
if (intent.getAction() != null && intent.getAction().equals("OPEN_ACTIVITY")) {// 通知がタップされたときの処理
Intent openIntent = new Intent(context, MainActivity.class); // MainActivityを起動
openIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(openIntent);
}
}
}

View File

@ -0,0 +1,6 @@
package com.example.childguard;
public interface OnEventListener {
boolean onEvent(boolean state);
}

View File

@ -1,33 +0,0 @@
package com.example.childguard;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
public class QR extends AppCompatActivity {
String get_on="乗車状態";
String get_off ="降車状態";
TextView tv=findViewById(R.id.situation);
@Override
protected void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_qr);
//多分いらないコード
// findViewById(R.id.camera).setOnClickListener(
// v -> {
// if(get_on.equals(tv.getText().toString())){
// tv.setText(get_off);
// findViewById(R.id.situation_bg).setBackgroundColor(Color.parseColor("#dcdcdc"));
// }
// else {
// tv.setText(get_on);
// findViewById(R.id.situation_bg).setBackgroundColor(Color.parseColor("#ff4500"));
// }
// }
// );
}
}

View File

@ -1,124 +0,0 @@
package com.example.childguard;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.browser.customtabs.CustomTabsIntent;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.Toast;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import com.journeyapps.barcodescanner.ScanContract;
import com.journeyapps.barcodescanner.ScanOptions;
import java.util.Objects;
/**
* A simple {@link Fragment} subclass.
* Use the {@link QRFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class QRFragment extends Fragment {
//QRコードから受け取ったURLの受け渡しの宣言
// OnDataPass dataPass;
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;
public QRFragment() {
// Required empty public constructor
}
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment QRFragment.
*/
// TODO: Rename and change types and number of parameters
public static QRFragment newInstance(String param1, String param2) {
QRFragment fragment = new QRFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
}
private final ActivityResultLauncher<ScanOptions> fragmentLauncher = registerForActivityResult(new ScanContract(),
result -> {
//result.getContents()でURLを入手
//読み取ったQRコードがChiled Guard用サイトのドメインを含むかの判定
if(!((result.getContents()).contains("https://practicefirestore1-8808c.web.app/"))) {
Toast.makeText(getContext(), "Chiled Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
} else {
//URLの表示
Toast.makeText(getContext(), result.getContents(), Toast.LENGTH_SHORT).show();
//ブラウザを起動しURL先のサイトを開く
CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
CustomTabsIntent customTabsIntent = builder.build();
customTabsIntent.launchUrl(requireContext(), Uri.parse(result.getContents()));
}
});
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_qr, container, false);
Log.d("QRFragment", "onClick: called");
//QRリーダ起動
fragmentLauncher.launch(new ScanOptions());
HomeFragment homeFragment=new HomeFragment();
replaceFragment(homeFragment);
return view;
}
//画面遷移メソッド
private void replaceFragment(Fragment fragment) {
// フラグメントマネージャーの取得
FragmentManager manager = getParentFragmentManager(); // アクティビティではgetSupportFragmentManager()?
// フラグメントトランザクションの開始
FragmentTransaction transaction = manager.beginTransaction();
// レイアウトをfragmentに置き換え追加
transaction.replace(R.id.fragmentContainerView, fragment);
// 置き換えのトランザクションをバックスタックに保存する
transaction.addToBackStack(null);
// フラグメントトランザクションをコミット
transaction.commit();
}
}

View File

@ -1,154 +0,0 @@
package com.example.childguard;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.print.PrintHelper;
import android.preference.PreferenceManager;
import android.util.AndroidRuntimeException;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.WriterException;
import com.journeyapps.barcodescanner.BarcodeEncoder;
/**
* A simple {@link Fragment} subclass.
* Use the {@link QrPrintFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class QrPrintFragment extends Fragment {
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;
public QrPrintFragment() {
// Required empty public constructor
}
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment QrPrintFragment.
*/
// TODO: Rename and change types and number of parameters
public static QrPrintFragment newInstance(String param1, String param2) {
QrPrintFragment fragment = new QrPrintFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
}
// @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
//共有プリファレンス 全体の準備
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
//User毎のドメインを保存する
String IdPref=preferences.getString("ID",null);
// Inflate the layout for this fragment
View view=inflater.inflate(R.layout.fragment_qr_print, container, false);;
//固定のドメイン
String KoteiURL = "https://practicefirestore1-8808c.web.app/?id=";
//すべてのドメイン
String AllURL;
//IdPrefにの値が初期値の場合
if(IdPref==null) {
//User毎のドメイン
String userURL = getArguments().getString("STR_KEY");
//キー"ID"の値をuserURLの値にする
SharedPreferences.Editor e = preferences.edit();
e.putString("ID", userURL);
//確定処理
e.apply();
//二つのドメインを合成する
AllURL=KoteiURL+userURL;
}else{
//二つのドメインを合成する
AllURL=KoteiURL+IdPref;
}
int size = 2500;
ImageView imageViewQrCode;
Bitmap QRGazou;
try {
//QRコード生成
BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
Bitmap bitmapqr = barcodeEncoder.encodeBitmap(AllURL, BarcodeFormat.QR_CODE, size, size);
imageViewQrCode = (ImageView) view.findViewById(R.id.qr_view);
imageViewQrCode.setTranslationX(1000);
imageViewQrCode.setTranslationY(1000);
imageViewQrCode.setImageBitmap(bitmapqr);
} catch (WriterException e) {
throw new AndroidRuntimeException("Barcode Error.", e);
}
// 画像合成の準備
// ここのエラーは直すと何故か動かなくなるこのままで動くので放置
Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.a_group_qr_sos);
Bitmap bitmap1 = ((BitmapDrawable) imageViewQrCode.getDrawable()).getBitmap();
int width = bitmap.getWidth(); // 元ファイルの幅取得
int height = bitmap.getHeight(); // 元ファイルの高さ取得
QRGazou = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
//Canvasの準備
Canvas canvas = new Canvas(QRGazou);
//画像のサイズの調整
int disWidth = (width - bitmap1.getWidth()) / 2;
int disHeight = (int) ((height - bitmap1.getHeight()) / 1.3);
canvas.drawBitmap(bitmap, 0, 0, (Paint) null); // image, x座標, y座標, Paintインスタンス
canvas.drawBitmap(bitmap1, disWidth, disHeight, (Paint) null); // 画像合成
//Androidからプリンターへ印刷指示を出すサポートライブラリ
PrintHelper printHelper = new PrintHelper(getActivity());
printHelper.setColorMode(PrintHelper.COLOR_MODE_COLOR);
printHelper.setScaleMode(PrintHelper.SCALE_MODE_FIT);
printHelper.printBitmap("job_name", QRGazou);
HomeFragment homeFragment=new HomeFragment();
replaceFragment(homeFragment);
return view;
}
//画面遷移メソッド
private void replaceFragment(Fragment fragment) {
// フラグメントマネージャーの取得
FragmentManager manager = getParentFragmentManager(); // アクティビティではgetSupportFragmentManager()?
// フラグメントトランザクションの開始
FragmentTransaction transaction = manager.beginTransaction();
// レイアウトをfragmentに置き換え追加
transaction.replace(R.id.fragmentContainerView, fragment);
// 置き換えのトランザクションをバックスタックに保存する
transaction.addToBackStack(null);
// フラグメントトランザクションをコミット
transaction.commit();
}
}

View File

@ -0,0 +1,74 @@
package com.example.childguard;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.util.AndroidRuntimeException;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.WindowManager;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.WriterException;
import com.journeyapps.barcodescanner.BarcodeEncoder;
public class QrUtils {
private Context context;
public QrUtils setContext(Context context) {
this.context = context;
return this;
}
public Bitmap getBitmap(String key) {
Log.d("getBitmap", "getBitmap: " + key);
String fixationURL = "https://practicefirestore1-8808c.web.app/?id=";
//すべてのドメイン
String AllURL;
//IdPrefにの値が初期値の場合
AllURL = fixationURL + key;
int qrCodeSize = calculateQRCodeSize(); // 画面密度に応じてサイズを計算
Bitmap QRImage;
Bitmap bitmapQR;
try {
//QRコード生成
BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
bitmapQR = barcodeEncoder.encodeBitmap(AllURL, BarcodeFormat.QR_CODE, qrCodeSize, qrCodeSize);
} catch (WriterException e) {
throw new AndroidRuntimeException("Barcode Error.", e);
}
// 画像合成の準備
Bitmap bitmap = BitmapFactory.decodeResource(this.context.getResources(), R.drawable.a_group_qr_sos_2);
int width = bitmap.getWidth();
int height = bitmap.getHeight();
QRImage = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
// Canvasの準備
Canvas canvas = new Canvas(QRImage);
// 画像のサイズの調整
int disWidth = (width - bitmapQR.getWidth()) / 2;
int disHeight = (int) ((height - bitmapQR.getHeight()) / 1.5);
canvas.drawBitmap(bitmap, 0, 0, (Paint) null);
canvas.drawBitmap(bitmapQR, disWidth, disHeight, (Paint) null); // 画像合成
//Androidからプリンターへ印刷指示を出すサポートライブラリ
return QRImage;
}
private int calculateQRCodeSize() {
// 画面解像度を取得
DisplayMetrics metrics = new DisplayMetrics();
WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
windowManager.getDefaultDisplay().getMetrics(metrics);
// 画面密度に基づいてQRコードのサイズを計算
float density = context.getResources().getDisplayMetrics().density;
return (int) (700 * density);
}
}

View File

@ -1,5 +1,8 @@
package com.example.childguard; package com.example.childguard;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -8,6 +11,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList; import java.util.ArrayList;
@ -16,11 +20,18 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
ArrayList<String[]> deviceList; ArrayList<String[]> deviceList;
Context applicationContext;
View parentView;
// Constructor // Constructor
public RecyclerAdapter(ArrayList<String[]> deviceList) { public RecyclerAdapter(ArrayList<String[]> deviceList, Context applicationContext, View parentView) {
// Init // Init
Log.d("RecyclerAdapter", "Constructor called"); Log.d("RecyclerAdapter", "Constructor called");
this.deviceList = deviceList; this.deviceList = deviceList;
this.applicationContext = applicationContext;
this.parentView = parentView;
} }
@NonNull @NonNull
@ -35,7 +46,27 @@ public class RecyclerAdapter extends RecyclerView.Adapter<RecyclerAdapter.ItemVi
public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) { public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) {
holder.textView.setText(deviceList.get(position)[0]); holder.textView.setText(deviceList.get(position)[0]);
holder.textView.setOnClickListener(v -> { holder.textView.setOnClickListener(v -> {
Toast.makeText(v.getContext(), deviceList.get(position)[1], Toast.LENGTH_SHORT).show();
// アラートダイアログを表示
new AlertDialog.Builder(v.getContext())
.setTitle("登録")
.setMessage("このデバイスを登録しますか?")
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
// OK button pressed
// Toast.makeText(v.getContext(), "OK button clicked", Toast.LENGTH_SHORT).show();
//共有プリファレンスに保存
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this.applicationContext);
sharedPreferences.edit().putString("bluetooth_device_id", deviceList.get(position)[1]).apply();
sharedPreferences.edit().putString("bluetooth_device_name", deviceList.get(position)[0]).apply();
// Toast.makeText(v.getContext(), PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_id", "none"), Toast.LENGTH_SHORT).show();
TextView textView = this.parentView.findViewById(R.id.registered_device);
textView.setText(PreferenceManager.getDefaultSharedPreferences(this.applicationContext).getString("bluetooth_device_name", "登録されていません"));
})
.setNegativeButton(android.R.string.cancel, null)
.show();
}); });
} }

View File

@ -0,0 +1,86 @@
package com.example.childguard;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
//RecyclerView.Adapterクラスを継承
public class RecyclerAdapter2 extends RecyclerView.Adapter<ItemViewHolder> {
ArrayList<String> arrayList;
//RecyclerAdapterのコンストラクタ
public RecyclerAdapter2(ArrayList<String> arrayList, Context applicationContext) {
this.arrayList = arrayList;
}
//新しいViewHolderを生成すると呼び出される
@NonNull
@Override
public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
//recycler_row.xmlをactivity_main.xmlの部品にする
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.recycler_row, parent, false);
//新しいViewHolderを作成
//ItemViewHolderクラスを呼び出す
ItemViewHolder holder = new ItemViewHolder(view);
//クリックイベントを登録
holder.itemView.setOnClickListener(v -> {
//クリックされた行を取得
int position = holder.getAdapterPosition();
//クリックされた文字をトースト表示
Toast.makeText(v.getContext(), arrayList.get(position), Toast.LENGTH_SHORT).show();
//クリックされた行を削除
arrayList.remove(position);
//行が削除されたことを画面に通知
notifyItemRemoved(position);
});
//生成したViewHolderを戻す
return holder;
}
//1行分のレイアウトの詳細設定
@Override
public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) {
//指定された位置の値を取得
holder.getTextView().setText(arrayList.get(position));
}
//ArrayListのデータ件数を取得
@Override
public int getItemCount() {
return arrayList.size();
}
}
//RecyclerView.ViewHolderクラスを継承
class ItemViewHolder extends RecyclerView.ViewHolder {
private final TextView textView;
//ItemViewHolderのコンストラクタ
public ItemViewHolder(View view) {
super(view);
//ViewHolderのビューにテキストを定義する
textView = view.findViewById(R.id.textView1);
}
//テキストの値を取得
public TextView getTextView() {
return textView;
}
}

View File

@ -0,0 +1,119 @@
package com.example.childguard;
import static android.content.ContentValues.TAG;
import static android.content.Context.MODE_PRIVATE;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import androidx.fragment.app.Fragment;
import com.google.firebase.firestore.FirebaseFirestore;
import java.util.HashMap;
import java.util.Map;
/**
* A simple {@link Fragment} subclass.
* Use the {@link SettingFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class SettingFragment extends Fragment {
FirebaseFirestore db;
public SettingFragment() {
// Required empty public constructor
}
public static SettingFragment newInstance() {
SettingFragment fragment = new SettingFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_setting, container, false);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
view.findViewById(R.id.button_bluetooth_setting).setOnClickListener(v -> {
getParentFragmentManager().beginTransaction().replace(R.id.fragmentContainerView, bluetooth_setupFragment.newInstance("test", "test")).addToBackStack(null).commit();
});
view.findViewById(R.id.button_print_qr).setOnClickListener(v -> {
SharedPreferences sharedPreferences = getActivity().getSharedPreferences("app_situation", MODE_PRIVATE);
boolean alreadySaved = sharedPreferences.getBoolean("alreadySaved", false);
//falseのときにFirebaseへの登録
if (alreadySaved) {
Log.d("HomeFragment", "already printed");
//画面遷移ID受け渡し
Toast.makeText(getActivity(), "再印刷", Toast.LENGTH_SHORT).show();
getParentFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.fragmentContainerView, GenerateQrFragment.newInstance(sharedPreferences.getString("ID", "none"))).commit();
} else {
Map<String, Boolean> DEFAULT_ITEM = new HashMap<>();//mapの宣言
Log.d("HomeFragment", "onClick is called");
//mapに入れる
DEFAULT_ITEM.put("isInCar", false);
DEFAULT_ITEM.put("isReported", false);
//新しいドキュメントにIDを作って追加
db.collection("status")
.add(DEFAULT_ITEM)
.addOnSuccessListener(documentReference -> {
//成功したら
//documentReference.getId()でID取得
Log.d(TAG, "DocumentSnapshot added with ID: " + documentReference.getId());
SharedPreferences.Editor e = sharedPreferences.edit();
// キー"alreadySaved"の値をtrueにする
e.putBoolean("alreadySaved", true);
//確定処理
e.apply();
//画面遷移ID受け渡し
SharedPreferences sharedPreferences1 = getActivity().getSharedPreferences("app_situation", MODE_PRIVATE);
SharedPreferences.Editor editor = sharedPreferences1.edit();
editor.putString("ID", documentReference.getId());
editor.apply();
startTestService();
Toast.makeText(getActivity(), "初回登録", Toast.LENGTH_SHORT).show();
getParentFragmentManager().beginTransaction().addToBackStack(null).replace(R.id.fragmentContainerView, GenerateQrFragment.newInstance(documentReference.getId())).commit();
})
.addOnFailureListener(e -> {
//失敗したら
Log.w(TAG, "Error adding document", e);
});
}
});
}
private void startTestService() {
Context context = getContext();
if (context != null) {
Intent serviceIntent = new Intent(context, SurveillanceService.class);
context.startForegroundService(serviceIntent);
}
}
}

View File

@ -0,0 +1,363 @@
package com.example.childguard;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.Service;
import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Handler;
import android.os.IBinder;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.preference.PreferenceManager;
import android.util.Log;
import androidx.annotation.Nullable;
import androidx.core.app.ActivityCompat;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import com.google.firebase.firestore.DocumentReference;
import com.google.firebase.firestore.FirebaseFirestore;
public class SurveillanceService extends Service {
private final Handler handler = new Handler();
private Runnable notificationRunnable;
public static class NotificationContent {
private final String title;
private final String description;
private final String channelId;
private final int notificationId;
public NotificationContent(String title, String description, String channelId, int notificationId) {
this.title = title;
this.description = description;
this.channelId = channelId;
this.notificationId = notificationId;
}
public String getTitle() {
return title;
}
public String getDescription() {
return description;
}
public String getChannelId() {
return channelId;
}
public int getNotificationId() {
return notificationId;
}
}
public static final String TAG = "InspirationQuote";
private static final String BT_ALERT_CHANNEL_ID = "child_guard_bt_alert";
private static final String REPORTED_CHANNEL_ID = "child_guard_reported";
private static final String BACKGROUND_CHANNEL_ID = "child_guard_background";
private static final int REQUEST_CODE = 100;
private static final int NOTIFICATION_DELAY = 5 * 60 * 1000; // 5 minutes
private static final NotificationContent REPORTED_NOTIFICATION =
new NotificationContent("子供の置き去りをしていませんか?", "第三者からの通報が行われました。", REPORTED_CHANNEL_ID, 2);
private static final NotificationContent BLUETOOTH_NOTIFICATION =
new NotificationContent("子供の置き去りをしていませんか?🐈", "Bluetoothと車の切断から5分が経過しました", BT_ALERT_CHANNEL_ID, 3);
private String userId = null;
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
Log.d(TAG, "onStartCommand: ");
this.userId = getSharedPreferences("app_situation", MODE_PRIVATE).getString("ID", null);
if (this.userId == null) {
Log.d("onResume", "ID not initialized.");
return flags; // IDが初期化されていない場合は何もしない
}
if (isNotificationChannelCreated(BACKGROUND_CHANNEL_ID)) {
createRunningNotificationChannel();
}
Intent notificationIntent = new Intent(this, MainActivity.class);
PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);
Notification notification = new NotificationCompat.Builder(this, BACKGROUND_CHANNEL_ID)
.setContentTitle("ChildGuardバックグラウンドサービス")
.setContentText("接続/通報監視サービスがバックグラウンドで実行されています")
.setSmallIcon(android.R.drawable.ic_menu_info_details)
.setContentIntent(pendingIntent)
.build();
startForeground(1, notification);
setSnapshotListener(FirebaseFirestore.getInstance().document("status/" + this.userId));
if (isNotBluetoothGranted()) return flags;
registerReceiver(receiver);
return START_STICKY;
}
@Override
public void onCreate() {
super.onCreate();
if (isNotificationChannelCreated(BT_ALERT_CHANNEL_ID)) createAlertNotificationChannel(BT_ALERT_CHANNEL_ID);
if (isNotificationChannelCreated(REPORTED_CHANNEL_ID)) createAlertNotificationChannel(REPORTED_CHANNEL_ID);
}
/**
* 通知チャネルが作成されているか確認
* @return 通知チャンネルの有無 true: 作成済み false: 未作成
*/
private boolean isNotificationChannelCreated(String channelId) {
NotificationManager notificationManager = getSystemService(NotificationManager.class);
return notificationManager.getNotificationChannel(channelId) == null;
}
/**
* 通知チャネルの作成
*/
private void createAlertNotificationChannel(String channelId) {
int importance = NotificationManager.IMPORTANCE_DEFAULT;
NotificationChannel channel = new NotificationChannel(channelId, "通知", importance);
channel.setDescription("第三者により置き去りの通報が行われたときに通知します。");
NotificationManager notificationManager = getSystemService(NotificationManager.class);
notificationManager.createNotificationChannel(channel);
}
/**
* バックグラウンドで実行中の通知チャネルを作成
*/
private void createRunningNotificationChannel() {
NotificationChannel serviceChannel = new NotificationChannel(
BACKGROUND_CHANNEL_ID,
"Foreground Service Channel",
NotificationManager.IMPORTANCE_NONE
);
NotificationManager manager = getSystemService(NotificationManager.class);
if (manager != null) {
manager.createNotificationChannel(serviceChannel);
}
}
/**
* 通知が許可がされているかどうかを確認
* @return 通知の許可の有無 true: 許可されていない false: 許可されている
*/
private boolean isNotNotificationEnabled() {
NotificationManagerCompat notificationManagerCompat = NotificationManagerCompat.from(this);
if (!notificationManagerCompat.areNotificationsEnabled()) {
Log.d(TAG, "通知が許可されていません");
return true;
} else {
Log.d(TAG, "通知が許可されています");
return false;
}
}
/**
* Bluetoothの権限が許可されているかどうかを確認
* @return Bluetoothの権限の有無 true: 許可されていない false: 許可されている
*/
private boolean isNotBluetoothGranted() {
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
Log.d(TAG, "Bluetoothの権限が許可されていません");
return true;
} else {
Log.d(TAG, "Bluetoothの権限が許可されています");
return false;
}
}
/**
* ブロードキャストレシーバーを登録
* @param receiver ブロードキャストレシーバー
*/
private void registerReceiver(BroadcastReceiver receiver) {
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
registerReceiver(receiver, intentFilter);
}
/**
* Firestoreのスナップショットリスナーを設定
* @param mDocRef Firestoreのドキュメントリファレンス
*/
private void setSnapshotListener(DocumentReference mDocRef) {
// Initialize the PeriodicTaskManager
// (Assuming it's done elsewhere as it's not shown in the original code)
// Prepare SharedPreferences
SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
// Add a snapshot listener to the document reference
mDocRef.addSnapshotListener((documentSnapshot, e) -> {
if (e != null) {
Log.w("nt", "Listen failed.", e);
return;
}
if (documentSnapshot != null && documentSnapshot.exists()) {
Log.d("nt", "イベント開始");
// Handle document snapshot
SharedPreferences.Editor editor = sharedPreferences.edit();
boolean isInCar = sharedPreferences.getBoolean("isInCarPref", false);
boolean newIsInCarState = Boolean.TRUE.equals(documentSnapshot.getBoolean("isInCar"));
editor.putBoolean("isInCarPref", newIsInCarState);
editor.apply();
Log.d("nt", "レスポンスを検知しました1");
Log.d("SurveillanceService", "Bluetooth: "+sharedPreferences.getBoolean("BluetoothStatusLocal", false));
if (isInCar&&!sharedPreferences.getBoolean("BluetoothStatusLocal", false)) {
if (Boolean.TRUE.equals(documentSnapshot.getBoolean("isReported"))) {
resetReported();
sendNotification(getApplicationContext(), REPORTED_NOTIFICATION);
}
} else {
resetReported();
}
} else {
Log.d("nt", "Current data: null");
}
});
}
/**
* 通報フラグをリセットする
*/
private void resetReported() {
FirebaseFirestore db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
DocumentReference isReported = db.collection("status").document(this.userId);
//isReportedをfalseに更新
isReported.update("isReported", false).addOnSuccessListener(unused ->
Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
}
/**
* 通知をタップしたときにアプリを起動するPendingIntentを取得
*
* @param context コンテキスト
* @return PendingIntent
*/
private PendingIntent getPendingIntent(Context context) {
Intent intent = new Intent(context, MainActivity.class);
intent.setAction("OPEN_ACTIVITY");
return PendingIntent.getActivity(context, SurveillanceService.REQUEST_CODE, intent, PendingIntent.FLAG_IMMUTABLE);
}
/**
* デバイスをバイブレーションさせる
*/
private void vibrateDevice() {
Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
if (vibrator.hasVibrator()) {
vibrator.vibrate(VibrationEffect.createOneShot(2000, VibrationEffect.DEFAULT_AMPLITUDE));
}
}
/**
* 通知を送信する
* @param context コンテキスト
* @param content NotificationContent 通知内容
*/
private void sendNotification(Context context, NotificationContent content) {//通知を行うメソッド
// 権限の保有を確認
if (isNotNotificationEnabled()) return;
vibrateDevice();
NotificationCompat.Builder builder = new NotificationCompat.Builder(context, content.getChannelId())
.setSmallIcon(android.R.drawable.ic_menu_info_details)
.setContentTitle(content.getTitle())//通知のタイトル
.setContentText(content.getDescription())//通知の内容
.setContentIntent(getPendingIntent(context))//通知をタップするとActivityへ移動する
.setAutoCancel(true)//通知をタップすると削除する
.setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
notificationManager.notify(content.getNotificationId(), builder.build());
}
private final BroadcastReceiver receiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
// 処理対象か確認 ----------------------------------------
BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
if (device == null) {
Log.d("BT", "No device found");
return;
}
String deviceHardwareAddress = device.getAddress(); // MAC address
if (deviceHardwareAddress == null) {
Log.d("BT", "No device address found");
return;
}
String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", null);
if (registeredId == null) {
Log.d("BT_Judge", "No registered device");
return;
}
if (!registeredId.equals(deviceHardwareAddress)) {
Log.d("BT_Judge", "Not registered device");
return;
}
boolean isInCar = getSharedPreferences("app_situation", MODE_PRIVATE).getBoolean("change", false);
// if (!isInCar) {
// Log.d("BT_Judge", "Not in car");
// return;
// }
// -----------------------------------------------------
// debug log
Log.d("BT", "Bluetooth device found: " + deviceHardwareAddress);
Log.d("BT", "Registered device: " + registeredId);
Log.d("BT", "Is in car: " + isInCar);
SharedPreferences sharedPreferences = SurveillanceService.this.getSharedPreferences("app_situation", MODE_PRIVATE);
SharedPreferences.Editor E = sharedPreferences.edit();
String action = intent.getAction(); // may need to chain this to a recognizing function
if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
E.putBoolean("BluetoothStatusLocal", false);
// bluetoothが切断されたときに乗車状態のとき
if (isInCar) {
notificationRunnable = () -> {
// 5分経過した時点でも車に乗っていない場合
sendNotification(context, BLUETOOTH_NOTIFICATION);
};
}
handler.postDelayed(notificationRunnable, NOTIFICATION_DELAY);
} else if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
E.putBoolean("BluetoothStatusLocal", true);
// 再接続された場合通知をキャンセルする
if (notificationRunnable != null) {
handler.removeCallbacks(notificationRunnable);
notificationRunnable = null;
Log.d("BT", "Notification canceled due to reconnection");
}
}
E.apply();
Log.d("SurveillanceService:BT", "Bluetooth status: " + sharedPreferences.getBoolean("BluetoothStatusLocal", false));
}
};
@Nullable
@Override
public IBinder onBind(Intent intent) {
return null;
}
}

View File

@ -1,5 +1,6 @@
package com.example.childguard; package com.example.childguard;
import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
@ -15,11 +16,13 @@ import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Objects; import java.util.Objects;
@ -100,9 +103,9 @@ public class bluetooth_setupFragment extends Fragment {
} }
Set<BluetoothDevice> pairedDevices = bluetoothAdapter.getBondedDevices(); Set<BluetoothDevice> pairedDevices = bluetoothAdapter.getBondedDevices();
RecyclerView recyclerView = view.findViewById(R.id.recyclerView1); RecyclerView recyclerView1 = view.findViewById(R.id.recyclerView1);
//RecyclerViewのサイズを固定 //RecyclerViewのサイズを固定
recyclerView.setHasFixedSize(true); recyclerView1.setHasFixedSize(true);
//RecyclerViewに区切り線を入れる //RecyclerViewに区切り線を入れる
// RecyclerView.ItemDecoration itemDecoration = // RecyclerView.ItemDecoration itemDecoration =
@ -111,7 +114,8 @@ public class bluetooth_setupFragment extends Fragment {
//レイアウトマネージャを設 //レイアウトマネージャを設
RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext()); RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext());
recyclerView.setLayoutManager(layoutManager); recyclerView1.setLayoutManager(layoutManager);
//recyclerView2.setLayoutManager(layoutManager);
//リスト構造(String型の可変長の配列)を宣言 //リスト構造(String型の可変長の配列)を宣言
ArrayList<String[]> arrayList = new ArrayList<>(); ArrayList<String[]> arrayList = new ArrayList<>();
@ -122,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
@ -134,14 +137,20 @@ public class bluetooth_setupFragment extends Fragment {
Log.d("b", s[0]); Log.d("b", s[0]);
} }
Log.d(" ", String.valueOf(arrayList.size())); Log.d(" ", String.valueOf(arrayList.size()));
RecyclerAdapter adapter = new RecyclerAdapter(arrayList); RecyclerAdapter adapter = new RecyclerAdapter(arrayList, requireActivity().getApplicationContext(), view);
//RecyclerViewとAdapterの結び付け //RecyclerViewとAdapterの結び付け
recyclerView.setAdapter(adapter); recyclerView1.setAdapter(adapter);
TextView textView = view.findViewById(R.id.registered_device);
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

View File

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M21.81,12.74l-0.82,-0.63v-0.22l0.8,-0.63c0.16,-0.12 0.2,-0.34 0.1,-0.51l-0.85,-1.48c-0.07,-0.13 -0.21,-0.2 -0.35,-0.2 -0.05,0 -0.1,0.01 -0.15,0.03l-0.95,0.38c-0.08,-0.05 -0.11,-0.07 -0.19,-0.11l-0.15,-1.01c-0.03,-0.21 -0.2,-0.36 -0.4,-0.36h-1.71c-0.2,0 -0.37,0.15 -0.4,0.34l-0.14,1.01c-0.03,0.02 -0.07,0.03 -0.1,0.05l-0.09,0.06 -0.95,-0.38c-0.05,-0.02 -0.1,-0.03 -0.15,-0.03 -0.14,0 -0.27,0.07 -0.35,0.2l-0.85,1.48c-0.1,0.17 -0.06,0.39 0.1,0.51l0.8,0.63v0.23l-0.8,0.63c-0.16,0.12 -0.2,0.34 -0.1,0.51l0.85,1.48c0.07,0.13 0.21,0.2 0.35,0.2 0.05,0 0.1,-0.01 0.15,-0.03l0.95,-0.37c0.08,0.05 0.12,0.07 0.2,0.11l0.15,1.01c0.03,0.2 0.2,0.34 0.4,0.34h1.71c0.2,0 0.37,-0.15 0.4,-0.34l0.15,-1.01c0.03,-0.02 0.07,-0.03 0.1,-0.05l0.09,-0.06 0.95,0.38c0.05,0.02 0.1,0.03 0.15,0.03 0.14,0 0.27,-0.07 0.35,-0.2l0.85,-1.48c0.1,-0.17 0.06,-0.39 -0.1,-0.51zM18,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM17,17h2v4c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V3c0,-1.1 0.9,-2 2,-2h10c1.1,0 2,0.9 2,2v4h-2V6H7v12h10v-1z"/>
</vector>

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

View File

@ -8,7 +8,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/white" android:background="@color/white"
tools:context=".MainActivity"> tools:context=".MainActivity"
>
<androidx.fragment.app.FragmentContainerView <androidx.fragment.app.FragmentContainerView
@ -35,5 +36,14 @@
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:menu="@menu/bottom_menu" /> app:menu="@menu/bottom_menu" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_scan_qr_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
app:srcCompat="@drawable/qr_code_scanner_fill0_wght400_grad0_opsz24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/nav_view"
android:layout_margin="32dp" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -6,21 +6,53 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/white"
tools:context=".bluetooth_setupFragment"> tools:context=".bluetooth_setupFragment">
<!-- TODO: Update blank fragment layout --> <!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="デバイス"
android:textSize="35dp"
android:textColor="@color/black"
android:layout_marginTop="20dp"
/>
<View
android:id="@+id/divider1"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/black" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView1" android:id="@+id/recyclerView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical"/> android:scrollbars="vertical"/>
<TextView <TextView
android:id="@+id/click_device"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="登録デバイス"
android:textSize="35dp"
android:textColor="@color/black"
android:layout_marginTop="20dp"
/>
<View
android:id="@+id/divider2"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/black"
/>
<TextView
android:id="@+id/registered_device"
android:layout_width="match_parent"
android:layout_height="60dp"
android:textSize="30sp"
android:textColor="@color/black"
/> />
</LinearLayout> </LinearLayout>

View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<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"
tools:context=".GenerateQrFragment" >
<ImageView
android:id="@+id/result_bitmap_image_view"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/close_fill0_wght400_grad0_opsz24"
app:layout_constraintBottom_toTopOf="@id/qr_code_container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/qr_code_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/result_bitmap_image_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<Button
android:id="@+id/button_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Cancel" />
<Button
android:id="@+id/button_print"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Print" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -6,23 +6,20 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context=".HomeFragment"> tools:context=".HomeFragment"
>
<LinearLayout
<ScrollView android:layout_width="match_parent"
android:layout_width="0dp" android:layout_height="wrap_content"
android:layout_height="0dp" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<FrameLayout <FrameLayout
android:id="@+id/situation_bg" android:id="@+id/car_situation_bg"
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"
@ -40,7 +37,7 @@
android:textSize="25dp" /> android:textSize="25dp" />
<TextView <TextView
android:id="@+id/situation" android:id="@+id/car_situation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" android:layout_height="200dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
@ -52,6 +49,7 @@
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:id="@+id/situation_bg_bluetooth"
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"
@ -60,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"
@ -76,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"
@ -83,52 +83,6 @@
android:textAlignment="center" /> android:textAlignment="center" />
</FrameLayout> </FrameLayout>
<Button
android:id="@+id/QRprinting"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="70dp"
android:backgroundTint="#778899"
android:text="QRコード印刷"
android:textColor="@color/white"
android:textSize="40dp" />
<Button
android:id="@+id/Bluetooth_setup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="#778899"
android:text="Bluetooth設定"
android:textColor="@color/white"
android:textSize="40dp" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/frame_style_button">
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/frame_style_button">
<!--<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ss"/>-->
<!--android:layout_gravity="center"-->
</FrameLayout>
</LinearLayout> </LinearLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".NotificationFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
</FrameLayout>

View File

@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
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">
<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"
/>
<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"
/>
<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"/>
<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>

View File

@ -6,6 +6,7 @@
android:id="@+id/textView1" android:id="@+id/textView1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="30sp"/> android:textSize="30sp"
android:textColor="@color/black"/>
</LinearLayout> </LinearLayout>

View File

@ -3,16 +3,10 @@
<item <item
android:id="@+id/navigation_home" android:id="@+id/navigation_home"
android:icon="@drawable/ic_home_black_24dp" android:icon="@drawable/ic_home_black_24dp"
android:title="home" android:title="home"/>
/>
<item <item
android:id="@+id/navigation_QR" android:id="@+id/navigation_settings"
android:icon="@drawable/qr_code_scanner_fill0_wght400_grad0_opsz24" android:icon="@drawable/baseline_app_settings_alt_24"
android:title="QR" android:title="settings"/>
/>
<item
android:id="@+id/navigation_notification"
android:icon="@drawable/notifications_fill0_wght400_grad0_opsz24"
android:title="notification"/>
</menu> </menu>