Removed Logger and Fragment2.java

# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java

Notiz.txt

@@ -1,3 +0,0 @@
-Sensor als Service einrichten, der aus Activity heraus gestartet werden kann.
-Stichwort: Intent
-Siehe Skript Teil 1

app/src/main/java/com/example/ueberwachungssystem/Detection/Detector.java

@@ -12,7 +12,7 @@ abstract public class Detector {
     private boolean extendViolation = false;
 
     // Countdown parameters
-    private final int COUNTDOWN_TIME = 10000;          // milliseconds
+    private final int COUNTDOWN_TIME = 5000;          // milliseconds
     private final int COUNTDOWN_POLLING_TIME = 100;   // milliseconds
 
     /** Constructor - takes context of current activity */

app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java

@@ -29,6 +29,7 @@ public class DetectorService extends LifecycleService {
 
     public WifiCommunication wifiCommunication;
 
+
     String wifiData;
     StringBuffer stringBufferWifi = new StringBuffer();
 
@@ -54,7 +55,6 @@ public class DetectorService extends LifecycleService {
                 passToServiceListener(stringBufferWifi);
                 checkState(data);
                 checkTyp(data);
-
             }
         });
 
@@ -68,7 +68,16 @@ public class DetectorService extends LifecycleService {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
                 //passToServiceListener(detectionReport);
+
+                if(detectionReport.detectionState){
+                    videoDetector.startRecording();
+                } else {
+                    videoDetector.stopRecording();
+                }
+
                 wifiCommunication.sendTrue(detectionReport.toMessage());
+
+
             }
         });
         /** Motion Detection**/

app/src/main/java/com/example/ueberwachungssystem/Detection/MicrophoneDetector.java

@@ -49,7 +49,7 @@ public class MicrophoneDetector extends Detector {
         private final int channelConfig = AudioFormat.CHANNEL_IN_MONO;
         private final int audioFormat = AudioFormat.ENCODING_PCM_16BIT;
 
-        private final int startDelay = 20000;
+        private final int startDelay = 2000;
         private final int threadSleeptime = 10;
         private int minPufferGroesseInBytes;
         private int pufferGroesseInBytes;

app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java

@@ -76,7 +76,7 @@ public class VideoDetector extends Detector {
     private static final float ALARM_THRESHOLD = 0f;   // Percent of pixels changed
     private static final float AREA_THRESHOLD = 10f;
     private static final int DILATE_ITERATIONS = 2;
-    private static final float START_DELAY = 20000;   // milliseconds
+    private static final float START_DELAY = 2000;   // milliseconds
     private static final android.util.Size IMAGE_RES = new android.util.Size(640, 480);
 
 
@@ -134,7 +134,7 @@ public class VideoDetector extends Detector {
         if (isRecording){
             return;
         }
-
+        Toast.makeText(context, "Aufnahme gestartet", Toast.LENGTH_SHORT).show();
         videoCapture = setupVideoCapture();
 
         final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
@@ -155,12 +155,12 @@ public class VideoDetector extends Detector {
                             @Override
                             public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
                                 isRecording = false;
-                                Toast.makeText(context, "video recording saved", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(context, "Aufnahme gespeichert", Toast.LENGTH_SHORT).show();
                             }
                             @Override
                             public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
                                 isRecording = false;
-                                Toast.makeText(context, "video recording failed", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(context, "Aufnahme fehlgeschlagen", Toast.LENGTH_SHORT).show();
                             }
                         }
                 );

app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment2.java

@@ -1,65 +0,0 @@
-package com.example.ueberwachungssystem.Fragments;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import androidx.fragment.app.Fragment;
-
-import com.example.ueberwachungssystem.MeinAdapter;
-import com.example.ueberwachungssystem.R;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
-public class Fragment2 extends Fragment {
-    private String text;
-    private Context c;
-    private final static String KEY_TEXT = "KEY_TEXT" ;
-    private void log(String nachricht) {
-        Log.d(this.getClass().getSimpleName(), nachricht);
-    }
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-        log( "onCreateView" );
-        View view = inflater.inflate(R.layout.fragment2, container, false );
-//        TextView Sensor = (TextView) view.findViewById(R.id.Aufzeichnungen);
-//        Sensor.setText(text);
-        return view;
-    }
-    public static Fragment2 erstellen(String text) {
-        Fragment2 fragment = new Fragment2();
-        Bundle b = new Bundle();
-        b.putString(KEY_TEXT, text);
-        fragment.setArguments(b);
-        return fragment;
-    }
-    @Override
-    public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        Bundle args = getArguments();
-        c = getContext();
-        ListView listView = new ListView(c);
-        listView.setAdapter(new MeinAdapter(c, getVideoFiles()));
-        if (args != null) {
-            text = args.getString(KEY_TEXT);
-            log("onCreate: text=" + text);
-        } else {
-            log("onCreate");
-        }
-    }
-    public List<File> getVideoFiles(){
-        File directory = c.getFilesDir();
-        File[] files = directory.listFiles();
-        assert files != null;
-        return Arrays.asList(files);
-    }
-}

app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment3.java

@@ -1,25 +1,17 @@
 package com.example.ueberwachungssystem.Fragments;
 
 import android.content.Context;
-import android.media.Image;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
 
 import androidx.fragment.app.Fragment;
 
-import com.example.ueberwachungssystem.MeinAdapter;
 import com.example.ueberwachungssystem.R;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-
 public class Fragment3 extends Fragment {
 
     private OnImageViewReadyListener onImageViewReadyListener;

app/src/main/java/com/example/ueberwachungssystem/Fragments/VideoListFragment.java

@@ -0,0 +1,104 @@
+package com.example.ueberwachungssystem.Fragments;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+import android.widget.Toast;
+import android.widget.VideoView;
+
+import androidx.fragment.app.Fragment;
+
+import com.example.ueberwachungssystem.R;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VideoListFragment extends Fragment {
+
+    private ListView listView;
+    private Button button;
+    private ArrayAdapter<String> adapter;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.videolist_fragment, container, false);
+
+
+        button = rootView.findViewById(R.id.button);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                File dir = getContext().getFilesDir();
+                File[] files = dir.listFiles();
+                for (File file: files) {
+                    file.delete();
+                }
+            }
+        });
+
+
+
+        listView = rootView.findViewById(R.id.listView);
+        adapter = new ArrayAdapter<>(requireContext(), android.R.layout.simple_list_item_1, getFileNames());
+        listView.setAdapter(adapter);
+
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                // Handle item click event here
+                String selectedItem = getContext().getFilesDir().toString() + "/" + adapter.getItem(position);
+                //Toast.makeText(requireContext(), selectedItem, Toast.LENGTH_SHORT).show();
+
+                openVideoPopup(selectedItem);
+            }
+        });
+        return rootView;
+    }
+
+    private List<String> getFileNames() {
+        // Add your data source here, e.g., an array or a list
+        File dir = getContext().getFilesDir();
+        File[] files = dir.listFiles();
+        Log.d("files", getContext().getFilesDir().toString());
+
+
+        List<String> fileNamesList = new ArrayList<>();
+        assert files != null;
+        for (File file : files) {
+            fileNamesList.add(file.getName());
+        }
+        return fileNamesList;
+    }
+
+
+    private void openVideoPopup(String videoPath) {
+        LayoutInflater inflater = LayoutInflater.from(requireContext());
+        View popupView = inflater.inflate(R.layout.videolist_popup, null);
+
+        VideoView videoView = popupView.findViewById(R.id.videoView);
+        videoView.setVideoPath(videoPath);
+        videoView.start();
+
+        PopupWindow popupWindow = new PopupWindow(popupView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, true);
+
+        popupView.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                //Close the window when clicked
+                popupWindow.dismiss();
+                return true;
+            }
+        });
+        popupWindow.showAtLocation(listView, Gravity.CENTER, 0, 0);
+    }
+}

app/src/main/java/com/example/ueberwachungssystem/Logger/Logger.java

@@ -1,44 +0,0 @@
-package com.example.ueberwachungssystem.Logger;
-
-import android.util.Log;
-import android.widget.TextView;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-public class Logger {
-    private TextView textView;
-    private StringBuffer sb = new StringBuffer();
-    private String tag;
-
-    public Logger(String tag, TextView textView, String logInitText)  {
-        this.tag = tag;
-        this.textView = textView;
-        sb.append(logInitText);
-    }
-
-    public void log(String s)  {
-        Log.d(tag, s);
-        sb.append(s).append("\n");
-        if (textView != null) {
-            textView.setText(sb.toString());
-        }
-    }
-
-    public void log(Exception e)  {
-        StringWriter sw = new StringWriter();
-        e.printStackTrace(new PrintWriter(sw));
-        log(sw.toString());
-    }
-
-    public void clearLog()  {
-        sb.setLength(0);
-        if (textView != null) {
-            textView.setText("");
-        }
-    }
-
-    public String getLoggedText()  {
-        return sb.toString();
-    }
-}

app/src/main/java/com/example/ueberwachungssystem/MainActivity.java

@@ -24,9 +24,9 @@ import android.widget.Toast;
 import android.widget.ToggleButton;
 
 import com.example.ueberwachungssystem.Fragments.Fragment1;
-import com.example.ueberwachungssystem.Fragments.Fragment2;
 import com.example.ueberwachungssystem.Detection.DetectorService;
 import com.example.ueberwachungssystem.Fragments.Fragment3;
+import com.example.ueberwachungssystem.Fragments.VideoListFragment;
 
 import java.util.OptionalInt;
 
@@ -42,13 +42,13 @@ public class MainActivity extends AppCompatActivity implements Fragment3.OnImage
     private Fragment fragment3_;
 
     private Fragment1 fragment1;
-    private Fragment2 fragment2;
     private Fragment3 fragment3;
 
     private ImageView fragmentImage;
     private ImageView fragmentImage2;
+    private VideoListFragment videoListFragment = new VideoListFragment();
     private DetectorService detectorService = new DetectorService();
-    int num=0;
+    int num = 0;
     //Textviews
     private TextView Auswahl;
     private TextView AoderA;
@@ -198,9 +198,9 @@ public class MainActivity extends AppCompatActivity implements Fragment3.OnImage
 
     public void onClickZeigeFragment2(View view) {
         Button button = (Button) view;
-        fragment2_ = zeigeFragment(fragment2.erstellen("Hier stehen dann die Videos"));
+        //zeigeFragment(fragment2.erstellen("Hier stehen dann die Videos"));
+        fragment2_ = zeigeFragment(videoListFragment);
     }
-    @SuppressLint("WrongViewCast")
     public void onClickZeigeFragment3(View view) {
         Button button = (Button) view;
         fragment3_ = zeigeFragment(fragment3.erstellen(view));

app/src/main/java/com/example/ueberwachungssystem/MeinAdapter.java

@@ -1,31 +0,0 @@
-package com.example.ueberwachungssystem;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-
-import java.io.File;
-import java.util.List;
-
-public class MeinAdapter extends ArrayAdapter<File> {
-    private Context context;
-    private File[] files;
-    public MeinAdapter(Context context, List<File> listf) {
-        super(context, android.R.layout.simple_list_item_1, listf);
-        this.context = context;
-    }
-
-    @Override
-    public View getView(final int pos, View cv, ViewGroup vg) {
-        View v = super.getView(pos, cv, vg);
-        v.setOnClickListener( new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                    Log.d("DerLog","nicht null");
-            }
-        });
-        return v;
-    }
-}

app/src/main/res/layout/activity_main.xml

@@ -125,5 +125,9 @@
         </LinearLayout>
     </ScrollView>
     -->
+    <ListView
+        android:id = "@+id/listView"
+        android:layout_width = "wrap_content"
+        android:layout_height = "wrap_content"/>
 
 </RelativeLayout>

app/src/main/res/layout/fragment3.xml

@@ -18,7 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:rotation="-90">
+        android:rotation="90">
     </ImageView>
 
 </LinearLayout>

app/src/main/res/layout/videolist_fragment.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat 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:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:background="@android:color/holo_blue_light">
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Aufnahmen Löschen"
+        android:backgroundTint="#010C49"
+        tools:ignore="MissingConstraints" />
+
+    <ListView
+        android:id="@+id/listView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="0dp"
+        tools:layout_editor_absoluteY="0dp" />
+
+
+</androidx.appcompat.widget.LinearLayoutCompat>

app/src/main/res/layout/videolist_popup.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <VideoView
+        android:id="@+id/videoView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"/>
+
+</FrameLayout>