Compare commits
No commits in common. "master" and "ms_master_backup_22_06" have entirely different histories.
master
...
ms_master_
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;
|
||||
|
||||
// Countdown parameters
|
||||
private final int COUNTDOWN_TIME = 5000; // milliseconds
|
||||
private final int COUNTDOWN_TIME = 10000; // milliseconds
|
||||
private final int COUNTDOWN_POLLING_TIME = 100; // milliseconds
|
||||
|
||||
/** Constructor - takes context of current activity */
|
||||
|
@ -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 = 2000;
|
||||
private final int startDelay = 20000;
|
||||
private final int threadSleeptime = 10;
|
||||
private int minPufferGroesseInBytes;
|
||||
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 AREA_THRESHOLD = 10f;
|
||||
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);
|
||||
|
||||
|
||||
@ -134,7 +134,7 @@ public class VideoDetector extends Detector {
|
||||
if (isRecording){
|
||||
return;
|
||||
}
|
||||
Toast.makeText(context, "Aufnahme gestartet", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(context, "video recording started", 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, "Aufnahme gespeichert", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(context, "video recording saved", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
@Override
|
||||
public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
|
||||
isRecording = false;
|
||||
Toast.makeText(context, "Aufnahme fehlgeschlagen", Toast.LENGTH_SHORT).show();
|
||||
Toast.makeText(context, "video recording failed", Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
);
|
||||
|
@ -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,17 +1,25 @@
|
||||
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;
|
||||
|
@ -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();
|
||||
}
|
||||
}
|
@ -24,6 +24,7 @@ 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;
|
||||
@ -42,6 +43,7 @@ public class MainActivity extends AppCompatActivity implements Fragment3.OnImage
|
||||
private Fragment fragment3_;
|
||||
|
||||
private Fragment1 fragment1;
|
||||
private Fragment2 fragment2;
|
||||
private Fragment3 fragment3;
|
||||
|
||||
private ImageView fragmentImage;
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
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