Merge pull request '修正中、バグあり' (#34 ) from hotfix-isInCar into main

Reviewed-on: #34
修正中、バグあり
2024-08-10 14:04:38 +00:00 · 2024-08-10 22:55:17 +09:00 · 2024-08-04 17:34:16 +00:00 · 2024-08-05 02:33:27 +09:00 · 2024-08-04 16:13:04 +00:00 · 2024-08-05 01:11:34 +09:00
6 changed files with 98 additions and 95 deletions
@@ -35,7 +35,7 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
-        <service android:name=".TestService" />
+        <service android:name=".SurveillanceService" />
    </application>

 </manifest>
@@ -31,6 +31,9 @@ public class HomeFragment extends Fragment implements OnEventListener {
    private String str_key;
    private String mParam2;

+    final String GET_ON = "\n乗車状態";
+    final String GET_OFF = "\n降車状態";
+

    public HomeFragment() {
        // Required empty public constructor
@@ -80,6 +83,7 @@ public class HomeFragment extends Fragment implements OnEventListener {
        super.onResume();
        Log.d("HomeFragment", "onResume: called");
        this.updateUiState(getIsInCarLocal());
+        Log.d("isIncar", "onResume: " + getIsInCarLocal());
        this.updateBluetoothSituation(isBluetoothConnected());
    }

@@ -90,7 +94,9 @@ public class HomeFragment extends Fragment implements OnEventListener {

    private boolean getIsInCarLocal() {
        SharedPreferences pref = requireActivity().getSharedPreferences("app_situation", requireActivity().MODE_PRIVATE);
-        return pref.getBoolean("isInCar", false);
+        Boolean isInCar = pref.getBoolean("isInCarPref", false);
+        Log.d("isInCarPref","isInCar"+ isInCar);
+        return pref.getBoolean("isInCarPref", false);
    }

    //画面遷移メソッド
@@ -107,14 +113,17 @@ public class HomeFragment extends Fragment implements OnEventListener {
        transaction.commit();
    }

+    /**
+     * 乗車状態の画面を切り替える
+     */
    private boolean updateUiState(boolean isInCar) {
        Log.d("HomeFragment", "updateUiState: called");
        // Init
        TextView tv;
        FrameLayout fl;
        try {
-            tv = requireView().findViewById(R.id.situation);
-            fl = requireView().findViewById(R.id.situation_bg);
+            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;
@@ -124,16 +133,15 @@ public class HomeFragment extends Fragment implements OnEventListener {
            updateUiState(isInCar);
            return false;
        }
-        String get_on = "\n乗車状態";
-        String get_off = "\n降車状態";
+
        if (!isInCar) {
            //乗車状態にする
            fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style_orange, null));
-            tv.setText(get_on);
+            tv.setText(GET_ON);
        } else {
            //降車状態にする
            fl.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.frame_style, null));
-            tv.setText(get_off);
+            tv.setText(GET_OFF);
        }

        return true;
@@ -167,7 +175,7 @@ public class HomeFragment extends Fragment implements OnEventListener {
            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);
@@ -14,7 +14,6 @@ import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -134,7 +133,7 @@ public class MainActivity extends AppCompatActivity {
        }
        registerReceiver(receiver, intentFilter);

-        startForegroundService(new Intent(this, TestService.class));
+        startForegroundService(new Intent(this, SurveillanceService.class));

    }

@@ -240,8 +239,10 @@ public class MainActivity extends AppCompatActivity {
            initNotification(mDocRef);//現在の位置を引数に initNotification()を処理
        }
    }
-
-    public void ResetReported() {//FireBaseのisReportedをfalseに初期化するメソッド
+    /**
+     * FireBaseのisReportedをfalseに初期化するメソッド
+     */
+    public void ResetReported() {
        //共有プリファレンス全体の準備
        SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
        String IdPref = sharedPreferences.getString("ID", null);//アプリに記録されているIDの取得
@@ -252,6 +253,9 @@ public class MainActivity extends AppCompatActivity {
        isReported.update("isReported", false).addOnSuccessListener(unused -> Log.d(TAG, "DocumentSnapshot successfully updated!")).addOnFailureListener(e -> Log.w(TAG, "Error updating document", e));
    }

+    /**
+     * 乗車状態の変更
+     */
    public void changeIsInCar() {
        //共有プリファレンス全体の準備
        SharedPreferences sharedPreferences = MainActivity.this.getSharedPreferences("app_situation", MODE_PRIVATE);
@@ -272,6 +276,9 @@ public class MainActivity extends AppCompatActivity {
        E.apply();
    }

+    /**
+     * 第三者通知に関する設定のメソッド
+     */
    public void NotificationSetting() {//通知に関する設定の処理を行うメソッド
        int importance = NotificationManager.IMPORTANCE_DEFAULT;
        //通知チャネルの実装
@@ -280,9 +287,11 @@ public class MainActivity extends AppCompatActivity {

        NotificationManager notificationManager = getSystemService(NotificationManager.class);
        notificationManager.createNotificationChannel(channel);
-
    }

+    /**
+     * 第三者通知を行うメソッド
+     */
    public void Notification(Context context) {//実際に通知を行うメソッド
        final String CHANNEL_ID = "my_channel_id";
        // 通知がクリックされたときに送信されるIntent
@@ -330,60 +339,52 @@ 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を起動
-    }
-
-    public void NotificationBluetooth(Context context) {//実際に通知を行うメソッド
-        final String CHANNEL_ID = "my_channel_id";
-        // 通知がクリックされたときに送信されるIntent
-        Intent intent = new Intent(context, MainActivity.class);
-        intent.setAction("OPEN_ACTIVITY");
-        // PendingIntentの作成
-        int requestCode = 100;
-        int flags = 0;
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent, flags | PendingIntent.FLAG_IMMUTABLE);
-
-        ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(2000);//バイブレーション
-
-        @SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
-                .setSmallIcon(android.R.drawable.ic_menu_info_details)
-                .setContentTitle("子供の置き去りをしていませんか？")//通知のタイトル
-                .setContentText("Bluetoothと車の切断から5分が経過しました")//通知の本文
-                .setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
-                .setAutoCancel(true)//通知をタップすると削除する
-                .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
-
-        // NotificationChannelの作成（Android 8.0以降）
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
-            if (notificationManager != null) {
-                NotificationChannel channel = new NotificationChannel(
-                        CHANNEL_ID,
-                        "Channel Name",
-                        NotificationManager.IMPORTANCE_HIGH
-                );
-
-                channel.setDescription("Channel Description");
-                channel.enableLights(true);
-                channel.setLightColor(Color.RED);
-                channel.enableVibration(true);
-                notificationManager.createNotificationChannel(channel);
-            }
-        }
-
-
-        NotificationManager notificationManager = (NotificationManager) context.getSystemService(context.NOTIFICATION_SERVICE);
-        if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-            return;
-        }
-        notificationManager.notify(R.string.app_name, builder.build());//通知の表示
-    }
+//    public void NotificationBluetooth(Context context) {//実際に通知を行うメソッド
+//        final String CHANNEL_ID = "my_channel_id";
+//        // 通知がクリックされたときに送信されるIntent
+//        Intent intent = new Intent(context, MainActivity.class);
+//        intent.setAction("OPEN_ACTIVITY");
+//        // PendingIntentの作成
+//        int requestCode = 100;
+//        int flags = 0;
+//        PendingIntent pendingIntent = PendingIntent.getActivity(context, requestCode, intent, flags | PendingIntent.FLAG_IMMUTABLE);
+//
+//        ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(2000);//バイブレーション
+//
+//        @SuppressLint("NotificationTrampoline") NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "CHANNEL_ID")
+//                .setSmallIcon(android.R.drawable.ic_menu_info_details)
+//                .setContentTitle("子供の置き去りをしていませんか？")//通知のタイトル
+//                .setContentText("Bluetoothと車の切断から5分が経過しました")//通知の本文
+//                .setContentIntent(pendingIntent)//通知をタップするとActivityへ移動する
+//                .setAutoCancel(true)//通知をタップすると削除する
+//                .setPriority(NotificationCompat.PRIORITY_HIGH) // プライオリティを高く設定
+//                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC); // ロック画面に表示する
+//
+//        // NotificationChannelの作成（Android 8.0以降）
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+//            if (notificationManager != null) {
+//                NotificationChannel channel = new NotificationChannel(
+//                        CHANNEL_ID,
+//                        "Channel Name",
+//                        NotificationManager.IMPORTANCE_HIGH
+//                );
+//
+//                channel.setDescription("Channel Description");
+//                channel.enableLights(true);
+//                channel.setLightColor(Color.RED);
+//                channel.enableVibration(true);
+//                notificationManager.createNotificationChannel(channel);
+//            }
+//        }
+//
+//
+//        NotificationManager notificationManager = (NotificationManager) context.getSystemService(context.NOTIFICATION_SERVICE);
+//        if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
+//            return;
+//        }
+//        notificationManager.notify(R.string.app_name, builder.build());//通知の表示
+//    }


    public void Bluetooth_status() {
@@ -422,9 +423,7 @@ public class MainActivity extends AppCompatActivity {
            String registeredId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("bluetooth_device_id", "none");

            if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) {
-                //Do something if connected
                //Bluetoothデバイスが接続されたときの処理
-                changeBluetooth(true);
                Log.d("BT", "Device connected");

                Log.d("BT_Judge", "Registered: " + registeredId);
@@ -432,6 +431,7 @@ public class MainActivity extends AppCompatActivity {
                if (deviceHardwareAddress.equals(registeredId)) {
                    //登録済みのデバイスだったときの処理
                    Log.d("BT_Judge", "登録済み");
+                    changeBluetooth(true);
                    e.putBoolean("connection_status", true);

                } else {
@@ -441,30 +441,16 @@ public class MainActivity extends AppCompatActivity {
                }
                e.apply();

-            } else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action) && !isInCar) {//bluetoothが切断されたときに乗車状態のとき
-
-                //Do something if disconnected
-                //デバイスが切断されたときの処理
+            }else if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
+                //bluetoothデバイスが切断されたときの処理
                changeBluetooth(false);
-                if (deviceHardwareAddress.equals(registeredId)) {
-                    // 5分待機する
-                    Handler handler = new Handler();
-                    handler.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action) && !isInCar) {//その後bluetoothを再接続したり降車状態になったりしていない＝置き去りが発生した可能性大
-                                NotificationBluetooth(getApplicationContext());//通知を行うメソッド
-                            }
-                        }
-
-                    }, 5 * 1000); // 5分をミリ秒に変換
-                }
-            } else {
-                Log.d("BT", " Device disconnected");
            }
        }
    };

+    /**
+     * Bluetoothの接続状態を変更するメソッド
+     */
    public void changeBluetooth(boolean actual) {
        getSharedPreferences("Bluetooth_situation", MODE_PRIVATE).edit().putBoolean("status", actual).apply();
    }
@@ -3,6 +3,8 @@ 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;
@@ -95,6 +97,7 @@ public class SettingFragment extends Fragment {
                            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();
@@ -106,4 +109,11 @@ public class SettingFragment extends Fragment {
            }
        });
    }
+    private void startTestService() {
+        Context context = getContext();
+        if (context != null) {
+            Intent serviceIntent = new Intent(context, SurveillanceService.class);
+            context.startForegroundService(serviceIntent);
+        }
+    }
 }
@@ -27,9 +27,7 @@ import androidx.core.app.NotificationManagerCompat;
 import com.google.firebase.firestore.DocumentReference;
 import com.google.firebase.firestore.FirebaseFirestore;

-import org.checkerframework.checker.index.qual.LengthOf;
-
-public class TestService extends Service {
+public class SurveillanceService extends Service {

    private final Handler handler = new Handler();
    private Runnable notificationRunnable;
@@ -81,6 +79,7 @@ public class TestService extends Service {

    @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.");
@@ -256,7 +255,7 @@ public class TestService extends Service {
    private PendingIntent getPendingIntent(Context context) {
        Intent intent = new Intent(context, MainActivity.class);
        intent.setAction("OPEN_ACTIVITY");
-        return PendingIntent.getActivity(context, TestService.REQUEST_CODE, intent, PendingIntent.FLAG_IMMUTABLE);
+        return PendingIntent.getActivity(context, SurveillanceService.REQUEST_CODE, intent, PendingIntent.FLAG_IMMUTABLE);
    }

    /**
@@ -19,7 +19,7 @@
        app:layout_constraintTop_toTopOf="parent">

        <FrameLayout
-            android:id="@+id/situation_bg"
+            android:id="@+id/car_situation_bg"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginLeft="20dp"
@@ -37,7 +37,7 @@
                android:textSize="25dp" />

            <TextView
-                android:id="@+id/situation"
+                android:id="@+id/car_situation"
                android:layout_width="match_parent"
                android:layout_height="200dp"
                android:layout_marginTop="10dp"
Author	SHA1	Message	Date
asura146	266d228fc6	Merge pull request '修正中、バグあり' (#34 ) from hotfix-isInCar into main Reviewed-on: #34	2024-08-10 14:04:38 +00:00
asura146	15c63f508a	修正中、バグあり	2024-08-10 22:55:17 +09:00
asura146	7fac075a8b	Merge pull request 'Bluetoothの判定処理が正しく行われていないバグを修正' (#33 ) from hotfix-Bluetooth into main Reviewed-on: #33	2024-08-04 17:34:16 +00:00
asura146	4f01f96bbc	Bluetoothの判定処理が正しく行われていないバグを修正ついでに、MainActivityの掃除もした	2024-08-05 02:33:27 +09:00
asura146	49aa1ac8a7	Merge pull request 'IDが生成されたときに、サービスの起動を行うようにした' (#32 ) from hotfix-notification into main Reviewed-on: #32	2024-08-04 16:13:04 +00:00
asura146	16265d5d31	IDが生成されたときに、サービスの起動を行うようにしたついでに、サービスの名前も変えた	2024-08-05 01:11:34 +09:00
asura146	4c4930ce65	Merge pull request 'hotfix-notifivation' (#31 ) from hotfix-notifivation into main Reviewed-on: #31	2024-08-03 15:20:20 +00:00
asura146	9d92652385	コメントアウトとかいろいろ細かい修正を加えた	2024-08-04 00:18:43 +09:00
asura146	1cf5a920b8	Bluetoothの判定処理から通知機能を消し飛ばした	2024-08-01 10:20:24 +09:00
asura146	e4431e1218	Merge pull request 'キー修正, 否定追加, ログ追加' (#30 ) from fix/fix_service into main Reviewed-on: #30	2024-07-30 06:09:24 +00:00