権限の要求を追加

changessituationを廃止
2024-01-23 09:42:13 +09:00 · 2024-01-19 20:35:08 +09:00 · 2024-01-19 20:34:55 +09:00
5 changed files with 124 additions and 141 deletions
@@ -14,6 +14,9 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;

+import com.google.firebase.firestore.DocumentReference;
+import com.google.firebase.firestore.FirebaseFirestore;
+
 /**
 * A simple {@link Fragment} subclass.
 * Use the {@link HomeFragment#newInstance} factory method to
@@ -69,20 +72,52 @@ public class HomeFragment extends Fragment implements OnEventListener{
                             Bundle savedInstanceState) {
        View view = inflater.inflate(R.layout.fragment_home, container, false);

+        view.findViewById(R.id.situation_bg).setOnClickListener(v -> {
+            if (updateStateByServer()) {
+                Log.d("HomeFragment", "onCreateView: updateStateByServer() success");
+            } else {
+                Log.d("HomeFragment", "onCreateView: updateStateByServer() failed");
+            }
+        });
+
        return view;
    }

+    // TODO: updateUiState()を切り出す
+    private boolean updateStateByServer() {
+        SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
+        String key = pref.getString("ID", null);
+        DocumentReference documentReference;
+        if (key == null) {
+            Log.d("HomeFragment", "updateStateCache: key is null");
+            return false;
+        } else {
+            Log.d("HomeFragment", "updateStateCache: key is " + key);
+            documentReference = FirebaseFirestore.getInstance().document("status/" + key);
+
+            documentReference.get().addOnCompleteListener(task -> {
+                if (task.isSuccessful()) {
+                    Log.d("HomeFragment", "updateStateCache: get document success");
+                    Log.d("HomeFragment", "updateStateCache: isInCar is " + task.getResult().getBoolean("isInCar"));
+                    if (pref.getBoolean("isInCar", false) != task.getResult().getBoolean("isInCar")) {
+                        SharedPreferences.Editor editor = pref.edit();
+                        editor.putBoolean("isInCar", task.getResult().getBoolean("isInCar"));
+                        editor.apply();
+                    }
+                    updateUiState(pref.getBoolean("isInCar", false)); // UpdateUI
+                } else {
+                    Log.d("HomeFragment", "updateStateCache: get document failed");
+                }
+            });
+        }
+        return true;
+    }
+

    @Override
    public void onResume() {
        super.onResume();
        Log.d("HomeFragment", "onResume: called");
-        this.updateUiState(getIsInCarLocal());
-    }
-
-    private boolean getIsInCarLocal() {
-        SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
-        return pref.getBoolean("isInCar", false);
    }

    //画面遷移メソッド
@@ -118,7 +153,7 @@ public class HomeFragment extends Fragment implements OnEventListener{
        }
        String get_on = "\n乗車状態";
        String get_off = "\n降車状態";
-        if (!isInCar) {
+        if (isInCar) {
            //乗車状態にする
            fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
            tv.setText(get_on);
@@ -20,11 +20,11 @@ import android.os.Bundle;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.util.Log;
-import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.Toast;

 import androidx.activity.result.ActivityResultLauncher;
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.core.app.ActivityCompat;
@@ -37,6 +37,9 @@ import com.google.firebase.firestore.FirebaseFirestore;
 import com.journeyapps.barcodescanner.ScanContract;
 import com.journeyapps.barcodescanner.ScanOptions;

+// Manifest
+import android.Manifest;
+
 import java.util.HashMap;
 import java.util.Map;

@@ -53,7 +56,6 @@ public class MainActivity extends AppCompatActivity {
    public static final String TAG = "InspirationQuote";


-
    private final ActivityResultLauncher<ScanOptions> QrLauncher = registerForActivityResult(
            new ScanContract(),
            result -> {
@@ -62,7 +64,7 @@ public class MainActivity extends AppCompatActivity {
                    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();
+                        Toast.makeText(this, "Chiled Guardに対応するQRコードではありません", Toast.LENGTH_LONG).show();
                    } else {
                        //URLの表示
                        Toast.makeText(this, contents, Toast.LENGTH_SHORT).show();
@@ -75,17 +77,20 @@ public class MainActivity extends AppCompatActivity {
            }
    );

-    @SuppressLint("MissingInflatedId")
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);
-
        db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ

+        if (!hasPermissions()) {
+            requestPermissions();
+        }
+
+
        BottomNavigationView bottomNavigationView = findViewById(R.id.nav_view);

-        this.homeFragment = HomeFragment.newInstance("test", "test");
+        this.homeFragment = HomeFragment.newInstance("test", "tset");

        bottomNavigationView.setOnNavigationItemSelectedListener(v ->

@@ -123,7 +128,6 @@ public class MainActivity extends AppCompatActivity {

        });

-
        //Bluetooth検知機能
        IntentFilter intentFilter = new IntentFilter();
        intentFilter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
@@ -136,18 +140,56 @@ public class MainActivity extends AppCompatActivity {
            Log.d("BT", "Permission to connect bluetooth devices granted");
        }
        registerReceiver(receiver, intentFilter);
-
    }

-
    @Override
    protected void onResume() {
        super.onResume();
        Log.d("onResume", "called");
-        Log.d("onResume", "mDocRef is null");
        firebaselink();
    }

+    private boolean hasPermissions() {
+        return ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_ADMIN) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.VIBRATE) == PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.FOREGROUND_SERVICE) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    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();
+            }
+            else {
+                Toast.makeText(this, "Permissions granted.", Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
    private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
        // 共有プリファレンス全体の準備
        SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
@@ -166,10 +208,9 @@ public class MainActivity extends AppCompatActivity {
                Log.d("nt", "レスポンスを検知しました1");
                //FireBaseで更新された情報の判定
                if (documentSnapshot.getBoolean("isReported") == false) {//isReportedがfalseのとき=サイト上で保護者ボタンが押されたとき
-                    if (fragment instanceof HomeFragment) {//fragmentがHomeFragmentのインスタンスかの判定
-//                        changessituation();//  changessituation()メソッドを処理→アプリ側の乗降状態を変化
-                        ((HomeFragment) fragment).onEvent(!isInCar);
-                    }
+//                    if (fragment instanceof HomeFragment) {//fragementがHomeFragmentのインスタンスかの判定
+//                        ((HomeFragment) fragment).onEvent(!isInCar);//onEvent()メソッドを処理→HomeFragmentのonEvent()メソッドを処理
+//                    }
                } else if (isInCar) {//第三者ボタンが押されたときにisInCarがtrueのとき＝乗車状態のとき→いたずら防止
                    int importance = NotificationManager.IMPORTANCE_DEFAULT;
                    NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通報通知", importance);
@@ -308,12 +349,13 @@ public class MainActivity extends AppCompatActivity {
        notificationManager.notify(R.string.app_name, builder.build());//通知の表示
    }

-    @Override
-    public void onStop() {//アプリをバックグラウンドにした時のメソッド
-        super.onStop();
-        Intent intent = new Intent(getApplication(), TestService.class);
-        startService(intent);//TestServiceを起動
-    }
+
+//    @Override
+//    public void onStop() {//アプリをバックグラウンドにした時のメソッド
+//        super.onStop();
+//        Intent intent = new Intent(getApplication(), TestService.class);
+//        startService(intent);//TestServiceを起動
+//    }

 }

@@ -36,14 +36,14 @@ public class QrUtils {
        //IdPrefにの値が初期値の場合
        AllURL=KoteiURL+key;

-
+        int size = 1500;
        int qrCodeSize = calculateQRCodeSize(); // 画面密度に応じてサイズを計算
        Bitmap QRGazou;
        Bitmap bitmapqr;
        try {
            //QRコード生成
            BarcodeEncoder barcodeEncoder = new BarcodeEncoder();
-            bitmapqr = barcodeEncoder.encodeBitmap(AllURL, BarcodeFormat.QR_CODE, qrCodeSize, qrCodeSize);
+            bitmapqr = barcodeEncoder.encodeBitmap(AllURL, BarcodeFormat.QR_CODE, size, size);
        } catch (WriterException e) {
            throw new AndroidRuntimeException("Barcode Error.", e);
        }
@@ -58,7 +58,7 @@ public class QrUtils {

        // 画像のサイズの調整
        int disWidth = (width - bitmapqr.getWidth()) / 2;
-        int disHeight = (int) ((height - bitmapqr.getHeight()) / 1.5);
+        int disHeight = (int) ((height - bitmapqr.getHeight()) / 1.4);
        canvas.drawBitmap(bitmap, 0, 0, (Paint) null);
        canvas.drawBitmap(bitmapqr, disWidth, disHeight, (Paint) null); // 画像合成
        //Androidからプリンターへ印刷指示を出すサポートライブラリ
@@ -72,7 +72,7 @@ public class QrUtils {

        // 画面密度に基づいてQRコードのサイズを計算
        float density = context.getResources().getDisplayMetrics().density;
-        return (int) (800 * density);
+        return (int) (1500 * density);
    }

 }
@@ -1,7 +1,6 @@
 package com.example.childguard;

 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -15,30 +14,20 @@ import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.util.Log;
-import android.widget.Toast;

 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.NotificationCompat;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;

 import com.google.firebase.firestore.DocumentReference;
 import com.google.firebase.firestore.FirebaseFirestore;

-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;

@@ -50,76 +39,9 @@ public class TestService extends Service {

    public PeriodicTaskManager periodicTaskManager;

-    //時間を取得するやつ↓
-    public static String getNowDate() {
-        @SuppressLint("SimpleDateFormat") final DateFormat df = new SimpleDateFormat("yyy/MM/dd HH:mm:ss");
-        final Date date = new Date(System.currentTimeMillis());
-        return df.format(date);
-    }
-
-   @SuppressLint("NotifyDataSetChanged")
-   public void NotifityRecycle(){
-
-       RecyclerView recyclerView = recyclerView().findViewById(R.id.recyclerView1);
-
-        //RecyclerViewのサイズを固定
-        recyclerView.setHasFixedSize(true);
-
-        //RecyclerViewに区切り線を入れる
-        RecyclerView.ItemDecoration itemDecoration =
-                new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
-        recyclerView.addItemDecoration(itemDecoration);
-
-        //レイアウトマネージャを設定
-        RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(this);
-        recyclerView.setLayoutManager(layoutManager);
-
-        //①リスト構造(String型の可変長の配列)を宣言
-        ArrayList<String> arrayList = new ArrayList<>();
-
-        //③Adapterとリスト構造を結び付け
-        //RecyclerAdapterクラスを呼び出す
-        RecyclerAdapter2 adapter = new RecyclerAdapter2(arrayList, null);
-
-        //④RecyclerViewとAdapterの結び付け
-        recyclerView.setAdapter(adapter);
-
-        SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
-
-       arrayList.add(0,"通知を検知しました: " + getNowDate());
-
-       //一番下に値が追加されたことをAdapterが画面に通知
-       adapter.notifyItemInserted(arrayList.size());
-
-       //共有プリファレンス　書き込みの準備
-       SharedPreferences.Editor e = pref.edit();
-
-       //リストを,区切りで結合する
-       String str = String.join(",", arrayList);
-
-       //変数名currentに、値の代入
-       e.putString("current", str.toString());
-
-       //確定処理
-       e.apply();
-
-       String strTo = pref.getString("current", null);
-       if (strTo == null) return;
-
-       String[] list = strTo.split(",");
-       arrayList.clear();
-       arrayList.addAll(Arrays.asList(list));
-       adapter.notifyDataSetChanged();
-    }
-
-    private Activity recyclerView() {
-        return null;
-    }

    @Override
    public int onStartCommand(Intent intent, int flags, int startId) {
-
-       NotifityRecycle();
        //共有プリファレンス全体の準備
        SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
        String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
@@ -130,8 +52,6 @@ public class TestService extends Service {
            initNotification(mDocRef);//現在の位置を引数に initNotification()を処理
        }
        return flags;
-
-
    }

    private void initNotification(DocumentReference mDocRef) {//サイト上で押されたボタンの管理
@@ -152,16 +72,22 @@ public class TestService extends Service {
                E.putBoolean("isInCarPref", documentSnapshot.getBoolean("isInCar"));//乗降状態の判定
                E.apply();//確定処理
                Log.d("nt", "レスポンスを検知しました1");
-                if (isInCar) {//isReportedがtrue=サイト上で乗車状態のとき
-                    if (documentSnapshot.getBoolean("isReported")) {
+                if (documentSnapshot.getBoolean("isReported") == true && isInCar) {//isReportedがtrueかつisInCarがtrueのとき=サイト上で第三者ボタンが押されたときに乗車状態のとき
                    ResetReported();// ResetReported();を処理→FireBaseのisReportedをfalseにする
+                    int importance = NotificationManager.IMPORTANCE_DEFAULT;
+                    NotificationChannel channel = new NotificationChannel("CHANNEL_ID", "通報通知", importance);
+                    channel.setDescription("第3者からの通報を検知しました");
+                    NotificationManager notificationManager = getSystemService(NotificationManager.class);
+                    notificationManager.createNotificationChannel(channel);
+                    Log.d("nt", "レスポンスを検知しました2");
                    NotificationSetting();//通知に関する設定のメソッド
                    Notification(getApplicationContext());//通知を行うメソッド
-                    }
-                } else if(!isInCar){//isReportedがfalse=サイト上で降車状態のとき
+                } else if(isInCar){//Bluetoothの切断後5分以上乗車状態のままのとき→QRコード読み取りを忘れているとき→置き去り発生
                    ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする
+                    periodicTaskManager.startPeriodicTask();//通知のループをストップする
                }else {
                    ResetReported();//ResetReported();を処理→FireBaseのisReportedをfalseにする
+                    periodicTaskManager.stopPeriodicTask();//5分毎に通知を行う
                }
            }

@@ -252,7 +178,7 @@ public class TestService extends Service {
        @SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
                .setSmallIcon(android.R.drawable.ic_menu_info_details)
                .setContentTitle("子供の置き去りをしていませんか？")//通知のタイトル
-                .setContentText("Bluetoothと車の切断から"+time+"分が経過しました")//通知の本文
+                .setContentText("Bluetootと車の切断から"+time+"分が経過しました")//通知の本文
                .setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
                .setAutoCancel(true)//通知をタップすると削除する
                .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
@@ -285,7 +211,7 @@ public class TestService extends Service {
    }
    public class PeriodicTaskManager {//Bluetoothの切断後に乗車状態にならなかった場合に５分毎に通知を送るメソッド

-        private static final long INTERVAL = 5 * 1000; //300秒
+        private static final long INTERVAL = 5 *60* 1000; //300秒
        private final Handler handler;
        private final Runnable periodicTask;

@@ -302,11 +228,11 @@ public class TestService extends Service {
                    int time=sharedPreferences.getInt("time",0);
                    //共有プリファレンス 書き込みの準備
                    SharedPreferences.Editor E = sharedPreferences.edit();
-                    if(time==0) {//Bluetooth切断からの時間経過(5分刻み)
+                    if(time==0) {//Bluetoot切断からの時間経過(5分刻み)
                        E.putInt("time",5);
                        E.apply();;
                    }else {
-                        E.putInt("time",time+5);
+                        E.putInt("time",time*2);
                        E.apply();
                    }

@@ -325,14 +251,6 @@ public class TestService extends Service {
        }

        public void stopPeriodicTask() {
-            //共有プリファレンス全体の準備
-            SharedPreferences sharedPreferences = getSharedPreferences("app_situation", MODE_PRIVATE);
-
-            int time=sharedPreferences.getInt("time",0);
-            //共有プリファレンス 書き込みの準備
-            SharedPreferences.Editor E = sharedPreferences.edit();
-            E.putInt("time",0);
-            E.apply();
            // 定期的な処理の停止
            handler.removeCallbacks(periodicTask);
        }
@@ -6,19 +6,11 @@
    tools:context=".NotificationFragment">

    <!-- TODO: Update blank fragment layout -->
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:weightSum="10"
-        android:orientation="vertical"
-        tools:context=".MainActivity">
-
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-            android:layout_weight="9">
+        android:layout_weight="9"
+        >

        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerView1"
@@ -28,8 +20,4 @@

    </LinearLayout>

-
-    </LinearLayout>
-
-
 </FrameLayout>
Author	SHA1	Message	Date
r-ca	dc1ae55a9e	権限の要求を追加	2024-01-23 09:42:13 +09:00
r-ca	36e558a88b	changessituationを廃止	2024-01-19 20:35:08 +09:00
r-ca	3b73621fb9	changessituationを廃止	2024-01-19 20:34:55 +09:00