siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/ms_master_copie'

Browse Source 
# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
This commit is contained in:
Miguel Siebenhaar 2023-06-22 12:11:02 +02:00
commit 02cbb14f3c
7 changed files with 76 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment1.java
View File

@ -19,6 +19,7 @@ import java.io.File;
public class Fragment1 extends Fragment {
private String text;
private final static String KEY_TEXT = "KEY_TEXT";
private void log(String nachricht) {
Log.d(this.getClass().getSimpleName(), nachricht);
@ -39,6 +40,13 @@ public class Fragment1 extends Fragment {
fragment.setArguments(b);
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
public void onCreate(Bundle bundle) {
super.onCreate(bundle);

26
app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment3.java
View File

@ -21,8 +21,10 @@ import java.util.Arrays;
import java.util.List;
public class Fragment3 extends Fragment {
private OnImageViewReadyListener onImageViewReadyListener;
private String text;
public ImageView ivp;
public static ImageView ivp;
private final static String KEY_TEXT = "KEY_TEXT";
private void log(String nachricht) {
Log.d(this.getClass().getSimpleName(), nachricht);
@ -32,16 +34,28 @@ public class Fragment3 extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
log("onCreateView");
View view = inflater.inflate(R.layout.fragment3, container, false);
ivp = (ImageView) view.findViewById(R.id.Video);
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(String text) {
public static Fragment3 erstellen(View view) {
Fragment3 fragment = new Fragment3();
Bundle b = new Bundle();
b.putString(KEY_TEXT, text);
fragment.setArguments(b);
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);

36
app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
View File

@ -6,6 +6,7 @@ import androidx.fragment.app.FragmentTransaction;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import android.annotation.SuppressLint;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@ -17,6 +18,7 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
@ -27,16 +29,25 @@ import com.example.ueberwachungssystem.Detection.DetectorService;
import com.example.ueberwachungssystem.Fragments.Fragment3;
import com.example.ueberwachungssystem.Fragments.VideoListFragment;
import java.util.OptionalInt;
@ExperimentalGetImage
public class MainActivity extends AppCompatActivity {
public class MainActivity extends AppCompatActivity implements Fragment3.OnImageViewReadyListener{
//StringBuffer
private StringBuffer messageBuffer = new StringBuffer();
//Fragmente
private Fragment aktuellesFragment;
private Fragment fragment1_;
private Fragment fragment2_;
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;
@ -53,7 +64,7 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setTitle(this.getClass().getSimpleName());
setTitle("Supervision");
setContentView(R.layout.activity_main);
Auswahl = findViewById(R.id.textAuswahl);
Auswahl.setText(auswahltext);
@ -163,15 +174,17 @@ public class MainActivity extends AppCompatActivity {
public void onServiceConnected(ComponentName name, IBinder service) {
DetectorService.ServiceBinder binder = (DetectorService.ServiceBinder) service;
detectorService = binder.getBoundService();
// detectorService.videoDetector.debugProcessing(null, outputImageView); //inputImageView
detectorService.setOnDetectionListener(new DetectorService.OnDetectionListener() {
@Override
public void onDetection(@NonNull StringBuffer stringBuffer) {
Log.d("onDetection", stringBuffer.toString()); //Für oli hier Textview einbauen
num++;
num = stringBuffer.toString().split("\n").length;
messageBuffer = stringBuffer;
zeigeFragment(fragment1.erstellen(messageBuffer.toString()));
if ((aktuellesFragment == fragment1_) && (aktuellesFragment != null)) {
Log.d("Fragment", aktuellesFragment.toString() + " " + fragment1_.toString());
fragment1_ = zeigeFragment(fragment1.erstellen(messageBuffer.toString()));
}
}
});
}
@ -182,27 +195,34 @@ public class MainActivity extends AppCompatActivity {
public void onClickZeigeFragment1(View view) {
Button button = (Button) view;
zeigeFragment(fragment1.erstellen(messageBuffer.toString()));
fragment1_ = zeigeFragment(fragment1.erstellen(messageBuffer.toString()));
}
public void onClickZeigeFragment2(View view) {
Button button = (Button) view;
//zeigeFragment(fragment2.erstellen("Hier stehen dann die Videos"));
zeigeFragment(videoListFragment);
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) {
entferneFragment();
}
private void zeigeFragment(Fragment fragment) {
private Fragment zeigeFragment(Fragment fragment) {
FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
ft.replace(R.id.frame, fragment);
ft.commit();
aktuellesFragment = fragment;
return aktuellesFragment;
}
private void entferneFragment() {
if (aktuellesFragment != null) {

4
app/src/main/java/com/example/ueberwachungssystem/PopUpClass.java
View File

@ -82,11 +82,11 @@ public class PopUpClass {
}
public void Sensoren(){
PopUpText.setText("Es können 3 verschiedene Sensoren verwendet werden \n -1. Beschleunigungssensor\n -2. Mikrofon\n -3. Kamera");
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");
buttonEdit.setVisibility(View.GONE);
}
public void Impressum(){
PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert");
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 ");
buttonEdit.setVisibility(View.GONE);
}
public void DetectionTotal(int num) {

4
app/src/main/res/layout/activity_main.xml
View File

@ -93,8 +93,8 @@
android:layout_alignBottom="@+id/btnAufnahmen"
android:layout_toRightOf="@id/btnAufnahmen"
android:layout_marginLeft="15dp"
android:text="Anzeige verbergen"
android:onClick="onClickEntferneFragment"/>
android:text="Live Video"
android:onClick="onClickZeigeFragment3"/>
<FrameLayout
android:id="@+id/frame"

17
app/src/main/res/layout/fragment3.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
@ -8,8 +8,17 @@
<ImageView
android:id="@+id/Video"
android:layout_width="match_parent"
android:layout_height="match_parent">
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>
</RelativeLayout>
</LinearLayout>

4
app/src/main/res/layout/popup_window.xml
View File

@ -6,7 +6,7 @@
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:gravity="center"
android:background="#A5ACB2">
android:background="#010C49">
<TextView
android:id="@+id/titleText"
@ -15,6 +15,7 @@
android:layout_height="wrap_content"
android:textSize="20sp"
android:textStyle="italic"
android:textColor="@color/white"
android:padding="10dp"/>
<Button
@ -22,6 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:backgroundTint="@color/purple_500"
android:text="Rechte Anfordern" />