Compare commits
No commits in common. "master" and "prepareMaster" have entirely different histories.
master
...
prepareMas
3
Notiz.txt
Normal file
3
Notiz.txt
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Sensor als Service einrichten, der aus Activity heraus gestartet werden kann.
|
||||||
|
Stichwort: Intent
|
||||||
|
Siehe Skript Teil 1
|
BIN
Projekt_Ueberwachungssystem.pdf
Normal file
BIN
Projekt_Ueberwachungssystem.pdf
Normal file
Binary file not shown.
@ -12,7 +12,7 @@ abstract public class Detector {
|
|||||||
private boolean extendViolation = false;
|
private boolean extendViolation = false;
|
||||||
|
|
||||||
// Countdown parameters
|
// Countdown parameters
|
||||||
private final int COUNTDOWN_TIME = 5000; // milliseconds
|
private final int COUNTDOWN_TIME = 10000; // milliseconds
|
||||||
private final int COUNTDOWN_POLLING_TIME = 100; // milliseconds
|
private final int COUNTDOWN_POLLING_TIME = 100; // milliseconds
|
||||||
|
|
||||||
/** Constructor - takes context of current activity */
|
/** Constructor - takes context of current activity */
|
||||||
|
@ -29,7 +29,6 @@ public class DetectorService extends LifecycleService {
|
|||||||
|
|
||||||
public WifiCommunication wifiCommunication;
|
public WifiCommunication wifiCommunication;
|
||||||
|
|
||||||
|
|
||||||
String wifiData;
|
String wifiData;
|
||||||
StringBuffer stringBufferWifi = new StringBuffer();
|
StringBuffer stringBufferWifi = new StringBuffer();
|
||||||
|
|
||||||
@ -55,6 +54,7 @@ public class DetectorService extends LifecycleService {
|
|||||||
passToServiceListener(stringBufferWifi);
|
passToServiceListener(stringBufferWifi);
|
||||||
checkState(data);
|
checkState(data);
|
||||||
checkTyp(data);
|
checkTyp(data);
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -68,16 +68,7 @@ public class DetectorService extends LifecycleService {
|
|||||||
@Override
|
@Override
|
||||||
public void onDetection(@NonNull DetectionReport detectionReport) {
|
public void onDetection(@NonNull DetectionReport detectionReport) {
|
||||||
//passToServiceListener(detectionReport);
|
//passToServiceListener(detectionReport);
|
||||||
|
|
||||||
if(detectionReport.detectionState){
|
|
||||||
videoDetector.startRecording();
|
|
||||||
} else {
|
|
||||||
videoDetector.stopRecording();
|
|
||||||
}
|
|
||||||
|
|
||||||
wifiCommunication.sendTrue(detectionReport.toMessage());
|
wifiCommunication.sendTrue(detectionReport.toMessage());
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
/** Motion Detection**/
|
/** Motion Detection**/
|
||||||
|
@ -49,7 +49,7 @@ public class MicrophoneDetector extends Detector {
|
|||||||
private final int channelConfig = AudioFormat.CHANNEL_IN_MONO;
|
private final int channelConfig = AudioFormat.CHANNEL_IN_MONO;
|
||||||
private final int audioFormat = AudioFormat.ENCODING_PCM_16BIT;
|
private final int audioFormat = AudioFormat.ENCODING_PCM_16BIT;
|
||||||
|
|
||||||
private final int startDelay = 2000;
|
private final int startDelay = 20000;
|
||||||
private final int threadSleeptime = 10;
|
private final int threadSleeptime = 10;
|
||||||
private int minPufferGroesseInBytes;
|
private int minPufferGroesseInBytes;
|
||||||
private int pufferGroesseInBytes;
|
private int pufferGroesseInBytes;
|
||||||
|
@ -76,7 +76,7 @@ public class VideoDetector extends Detector {
|
|||||||
private static final float ALARM_THRESHOLD = 0f; // Percent of pixels changed
|
private static final float ALARM_THRESHOLD = 0f; // Percent of pixels changed
|
||||||
private static final float AREA_THRESHOLD = 10f;
|
private static final float AREA_THRESHOLD = 10f;
|
||||||
private static final int DILATE_ITERATIONS = 2;
|
private static final int DILATE_ITERATIONS = 2;
|
||||||
private static final float START_DELAY = 2000; // milliseconds
|
private static final float START_DELAY = 20000; // milliseconds
|
||||||
private static final android.util.Size IMAGE_RES = new android.util.Size(640, 480);
|
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){
|
if (isRecording){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Toast.makeText(context, "Aufnahme gestartet", Toast.LENGTH_SHORT).show();
|
|
||||||
videoCapture = setupVideoCapture();
|
videoCapture = setupVideoCapture();
|
||||||
|
|
||||||
final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
|
final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
|
||||||
@ -155,12 +155,12 @@ public class VideoDetector extends Detector {
|
|||||||
@Override
|
@Override
|
||||||
public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
|
public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
|
||||||
isRecording = false;
|
isRecording = false;
|
||||||
Toast.makeText(context, "Aufnahme gespeichert", Toast.LENGTH_SHORT).show();
|
Toast.makeText(context, "video recording saved", Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
|
public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
|
||||||
isRecording = false;
|
isRecording = false;
|
||||||
Toast.makeText(context, "Aufnahme fehlgeschlagen", Toast.LENGTH_SHORT).show();
|
Toast.makeText(context, "video recording failed", Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@ -19,7 +19,6 @@ import java.io.File;
|
|||||||
|
|
||||||
public class Fragment1 extends Fragment {
|
public class Fragment1 extends Fragment {
|
||||||
private String text;
|
private String text;
|
||||||
|
|
||||||
private final static String KEY_TEXT = "KEY_TEXT";
|
private final static String KEY_TEXT = "KEY_TEXT";
|
||||||
private void log(String nachricht) {
|
private void log(String nachricht) {
|
||||||
Log.d(this.getClass().getSimpleName(), nachricht);
|
Log.d(this.getClass().getSimpleName(), nachricht);
|
||||||
@ -40,13 +39,6 @@ public class Fragment1 extends Fragment {
|
|||||||
fragment.setArguments(b);
|
fragment.setArguments(b);
|
||||||
return fragment;
|
return fragment;
|
||||||
}
|
}
|
||||||
public static Fragment1 aktualisieren(String text){
|
|
||||||
Fragment1 fragment = new Fragment1();
|
|
||||||
Bundle b = new Bundle();
|
|
||||||
b.putString(KEY_TEXT, text);
|
|
||||||
fragment.setArguments(b);
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle bundle) {
|
public void onCreate(Bundle bundle) {
|
||||||
super.onCreate(bundle);
|
super.onCreate(bundle);
|
||||||
|
@ -0,0 +1,65 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
@ -1,62 +0,0 @@
|
|||||||
package com.example.ueberwachungssystem.Fragments;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
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 androidx.fragment.app.Fragment;
|
|
||||||
|
|
||||||
import com.example.ueberwachungssystem.R;
|
|
||||||
|
|
||||||
public class Fragment3 extends Fragment {
|
|
||||||
|
|
||||||
private OnImageViewReadyListener onImageViewReadyListener;
|
|
||||||
private String text;
|
|
||||||
public static ImageView ivp;
|
|
||||||
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.fragment3, container, false);
|
|
||||||
if (onImageViewReadyListener != null) {
|
|
||||||
ImageView ivp = (ImageView) view.findViewById(R.id.Video);
|
|
||||||
ImageView ivp2 = (ImageView) view.findViewById(R.id.Video2);
|
|
||||||
onImageViewReadyListener.onImageViewReady(ivp, ivp2);
|
|
||||||
}
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
public static Fragment3 erstellen(View view) {
|
|
||||||
Fragment3 fragment = new Fragment3();
|
|
||||||
return fragment;
|
|
||||||
}
|
|
||||||
public interface OnImageViewReadyListener {
|
|
||||||
void onImageViewReady(ImageView imageView, ImageView imageView2);
|
|
||||||
}
|
|
||||||
public void onAttach(Context context) {
|
|
||||||
super.onAttach(context);
|
|
||||||
try {
|
|
||||||
onImageViewReadyListener = (OnImageViewReadyListener) context;
|
|
||||||
} catch (ClassCastException e) {
|
|
||||||
throw new ClassCastException(context.toString() + " must implement OnImageViewReadyListener");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle bundle) {
|
|
||||||
super.onCreate(bundle);
|
|
||||||
Bundle args = getArguments();
|
|
||||||
if (args != null ) {
|
|
||||||
text = args.getString(KEY_TEXT);
|
|
||||||
log("onCreate: text=" + text);
|
|
||||||
} else {
|
|
||||||
log("onCreate");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,104 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
@ -0,0 +1,44 @@
|
|||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
@ -6,7 +6,6 @@ import androidx.fragment.app.FragmentTransaction;
|
|||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.content.ComponentName;
|
import android.content.ComponentName;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
@ -18,35 +17,21 @@ import android.view.Menu;
|
|||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.ImageView;
|
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
import android.widget.ToggleButton;
|
import android.widget.ToggleButton;
|
||||||
|
|
||||||
import com.example.ueberwachungssystem.Fragments.Fragment1;
|
import com.example.ueberwachungssystem.Fragments.Fragment1;
|
||||||
|
import com.example.ueberwachungssystem.Fragments.Fragment2;
|
||||||
import com.example.ueberwachungssystem.Detection.DetectorService;
|
import com.example.ueberwachungssystem.Detection.DetectorService;
|
||||||
import com.example.ueberwachungssystem.Fragments.Fragment3;
|
|
||||||
import com.example.ueberwachungssystem.Fragments.VideoListFragment;
|
|
||||||
|
|
||||||
import java.util.OptionalInt;
|
|
||||||
|
|
||||||
@ExperimentalGetImage
|
@ExperimentalGetImage
|
||||||
public class MainActivity extends AppCompatActivity implements Fragment3.OnImageViewReadyListener{
|
public class MainActivity extends AppCompatActivity {
|
||||||
//StringBuffer
|
|
||||||
private StringBuffer messageBuffer = new StringBuffer();
|
|
||||||
|
|
||||||
//Fragmente
|
//Fragmente
|
||||||
private Fragment aktuellesFragment;
|
private Fragment aktuellesFragment;
|
||||||
private Fragment fragment1_;
|
|
||||||
private Fragment fragment2_;
|
|
||||||
private Fragment fragment3_;
|
|
||||||
|
|
||||||
private Fragment1 fragment1;
|
private Fragment1 fragment1;
|
||||||
private Fragment3 fragment3;
|
private Fragment2 fragment2;
|
||||||
|
|
||||||
private ImageView fragmentImage;
|
|
||||||
private ImageView fragmentImage2;
|
|
||||||
private VideoListFragment videoListFragment = new VideoListFragment();
|
|
||||||
private DetectorService detectorService = new DetectorService();
|
private DetectorService detectorService = new DetectorService();
|
||||||
int num=0;
|
int num=0;
|
||||||
//Textviews
|
//Textviews
|
||||||
@ -62,7 +47,7 @@ public class MainActivity extends AppCompatActivity implements Fragment3.OnImage
|
|||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setTitle("Supervision");
|
setTitle(this.getClass().getSimpleName());
|
||||||
setContentView(R.layout.activity_main);
|
setContentView(R.layout.activity_main);
|
||||||
Auswahl = findViewById(R.id.textAuswahl);
|
Auswahl = findViewById(R.id.textAuswahl);
|
||||||
Auswahl.setText(auswahltext);
|
Auswahl.setText(auswahltext);
|
||||||
@ -89,13 +74,9 @@ public class MainActivity extends AppCompatActivity implements Fragment3.OnImage
|
|||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
if (toggleKamera.isChecked()) {
|
if (toggleKamera.isChecked()) {
|
||||||
if(detectorService != null) {
|
|
||||||
detectorService.videoDetector.startDetection();
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if(detectorService != null) {
|
|
||||||
detectorService.videoDetector.stopDetection();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -103,13 +84,9 @@ public class MainActivity extends AppCompatActivity implements Fragment3.OnImage
|
|||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
if (toggleAudio.isChecked()) {
|
if (toggleAudio.isChecked()) {
|
||||||
if(detectorService != null) {
|
|
||||||
detectorService.audioDetector.startDetection();
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if(detectorService != null) {
|
|
||||||
detectorService.audioDetector.stopDetection();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -117,13 +94,9 @@ public class MainActivity extends AppCompatActivity implements Fragment3.OnImage
|
|||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
if (toggleBewegung.isChecked()) {
|
if (toggleBewegung.isChecked()) {
|
||||||
if(detectorService != null) {
|
|
||||||
detectorService.motionDetector.startDetection();
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if(detectorService != null) {
|
|
||||||
detectorService.motionDetector.stopDetection();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -172,17 +145,13 @@ public class MainActivity extends AppCompatActivity implements Fragment3.OnImage
|
|||||||
public void onServiceConnected(ComponentName name, IBinder service) {
|
public void onServiceConnected(ComponentName name, IBinder service) {
|
||||||
DetectorService.ServiceBinder binder = (DetectorService.ServiceBinder) service;
|
DetectorService.ServiceBinder binder = (DetectorService.ServiceBinder) service;
|
||||||
detectorService = binder.getBoundService();
|
detectorService = binder.getBoundService();
|
||||||
|
// detectorService.videoDetector.debugProcessing(null, outputImageView); //inputImageView
|
||||||
|
|
||||||
detectorService.setOnDetectionListener(new DetectorService.OnDetectionListener() {
|
detectorService.setOnDetectionListener(new DetectorService.OnDetectionListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onDetection(@NonNull StringBuffer stringBuffer) {
|
public void onDetection(@NonNull StringBuffer stringBuffer) {
|
||||||
Log.d("onDetection", stringBuffer.toString()); //Für oli hier Textview einbauen
|
Log.d("onDetection", stringBuffer.toString()); //Für oli hier Textview einbauen
|
||||||
num = stringBuffer.toString().split("\n").length;
|
num++;
|
||||||
messageBuffer = stringBuffer;
|
|
||||||
if ((aktuellesFragment == fragment1_) && (aktuellesFragment != null)) {
|
|
||||||
Log.d("Fragment", aktuellesFragment.toString() + " " + fragment1_.toString());
|
|
||||||
fragment1_ = zeigeFragment(fragment1.erstellen(messageBuffer.toString()));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -193,34 +162,23 @@ public class MainActivity extends AppCompatActivity implements Fragment3.OnImage
|
|||||||
|
|
||||||
public void onClickZeigeFragment1(View view) {
|
public void onClickZeigeFragment1(View view) {
|
||||||
Button button = (Button) view;
|
Button button = (Button) view;
|
||||||
fragment1_ = zeigeFragment(fragment1.erstellen(messageBuffer.toString()));
|
zeigeFragment(fragment1.erstellen("Hier stehen dann die Alarme"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onClickZeigeFragment2(View view) {
|
public void onClickZeigeFragment2(View view) {
|
||||||
Button button = (Button) view;
|
Button button = (Button) view;
|
||||||
//zeigeFragment(fragment2.erstellen("Hier stehen dann die Videos"));
|
zeigeFragment(fragment2.erstellen("Hier stehen dann die Videos"));
|
||||||
fragment2_ = zeigeFragment(videoListFragment);
|
|
||||||
}
|
|
||||||
public void onClickZeigeFragment3(View view) {
|
|
||||||
Button button = (Button) view;
|
|
||||||
fragment3_ = zeigeFragment(fragment3.erstellen(view));
|
|
||||||
}
|
|
||||||
public void onImageViewReady(ImageView imageView, ImageView imageView2) {
|
|
||||||
fragmentImage = imageView;
|
|
||||||
fragmentImage2 = imageView2;
|
|
||||||
detectorService.videoDetector.debugProcessing(fragmentImage, fragmentImage2); //inputImageView
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onClickEntferneFragment(View view) {
|
public void onClickEntferneFragment(View view) {
|
||||||
entferneFragment();
|
entferneFragment();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Fragment zeigeFragment(Fragment fragment) {
|
private void zeigeFragment(Fragment fragment) {
|
||||||
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
|
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
|
||||||
ft.replace(R.id.frame, fragment);
|
ft.replace(R.id.frame, fragment);
|
||||||
ft.commit();
|
ft.commit();
|
||||||
aktuellesFragment = fragment;
|
aktuellesFragment = fragment;
|
||||||
return aktuellesFragment;
|
|
||||||
}
|
}
|
||||||
private void entferneFragment() {
|
private void entferneFragment() {
|
||||||
if (aktuellesFragment != null) {
|
if (aktuellesFragment != null) {
|
||||||
|
@ -0,0 +1,31 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
@ -82,11 +82,11 @@ public class PopUpClass {
|
|||||||
|
|
||||||
}
|
}
|
||||||
public void Sensoren(){
|
public void Sensoren(){
|
||||||
PopUpText.setText("Es können 3 verschiedene Sensoren verwendet werden \n -1. Beschleunigungssensor\n -2. Mikrofon\n -3. Kamera\n Diese können sowohl einzeln als auch alle zusammen verwendet werden");
|
PopUpText.setText("Es können 3 verschiedene Sensoren verwendet werden \n -1. Beschleunigungssensor\n -2. Mikrofon\n -3. Kamera");
|
||||||
buttonEdit.setVisibility(View.GONE);
|
buttonEdit.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
public void Impressum(){
|
public void Impressum(){
|
||||||
PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert \n Von: \n -Kohler Bastian\n -Kleinecke Oliver\n -Market Leon\n -Siebenhaar Miguel\n -Wolz Tobias ");
|
PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert");
|
||||||
buttonEdit.setVisibility(View.GONE);
|
buttonEdit.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
public void DetectionTotal(int num) {
|
public void DetectionTotal(int num) {
|
||||||
|
@ -93,8 +93,8 @@
|
|||||||
android:layout_alignBottom="@+id/btnAufnahmen"
|
android:layout_alignBottom="@+id/btnAufnahmen"
|
||||||
android:layout_toRightOf="@id/btnAufnahmen"
|
android:layout_toRightOf="@id/btnAufnahmen"
|
||||||
android:layout_marginLeft="15dp"
|
android:layout_marginLeft="15dp"
|
||||||
android:text="Live Video"
|
android:text="Anzeige verbergen"
|
||||||
android:onClick="onClickZeigeFragment3"/>
|
android:onClick="onClickEntferneFragment"/>
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:id="@+id/frame"
|
android:id="@+id/frame"
|
||||||
@ -125,9 +125,5 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
-->
|
-->
|
||||||
<ListView
|
|
||||||
android:id = "@+id/listView"
|
|
||||||
android:layout_width = "wrap_content"
|
|
||||||
android:layout_height = "wrap_content"/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
@ -1,24 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:gravity="center_horizontal"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:background="@color/bluedark">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/Video"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:rotation="90">
|
|
||||||
</ImageView>
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/Video2"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:rotation="90">
|
|
||||||
</ImageView>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
@ -6,7 +6,7 @@
|
|||||||
android:paddingLeft="10dp"
|
android:paddingLeft="10dp"
|
||||||
android:paddingRight="10dp"
|
android:paddingRight="10dp"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:background="#010C49">
|
android:background="#A5ACB2">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/titleText"
|
android:id="@+id/titleText"
|
||||||
@ -15,7 +15,6 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="20sp"
|
android:textSize="20sp"
|
||||||
android:textStyle="italic"
|
android:textStyle="italic"
|
||||||
android:textColor="@color/white"
|
|
||||||
android:padding="10dp"/>
|
android:padding="10dp"/>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
@ -23,7 +22,6 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:backgroundTint="@color/purple_500"
|
|
||||||
android:text="Rechte Anfordern" />
|
android:text="Rechte Anfordern" />
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,28 +0,0 @@
|
|||||||
<?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>
|
|
@ -1,12 +0,0 @@
|
|||||||
<?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>
|
|
BIN
git-cheat-sheet-education.pdf
Normal file
BIN
git-cheat-sheet-education.pdf
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user