diff --git a/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java b/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java index 175df5c..e9f081d 100644 --- a/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java +++ b/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java @@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import android.hardware.SensorEvent; import android.hardware.SensorManager; import android.os.Bundle; import android.view.View; @@ -88,15 +89,22 @@ public class AudiodetectionActivity extends AppCompatActivity { public void onChanged(Boolean aBoolean) { if (aBoolean) { mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), true, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB()); + microfonStatusMessage.setText("dB value - detected = " + (int) mMicrofonViewModel.getAmplitudeInDB() + " dB"); } else { mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB()); + if((int) mMicrofonViewModel.getAmplitudeInDB() > 0){ + microfonStatusMessage.setText("dB value - no longer detected = " + (int) mMicrofonViewModel.getAmplitudeInDB()+ " dB"); + } } } }); + + } + @Override protected void onResume() { super.onResume(); diff --git a/app/src/main/java/com/example/greenwatch/sensors/MicrofonSensor.java b/app/src/main/java/com/example/greenwatch/sensors/MicrofonSensor.java index 40b78c9..97d6380 100644 --- a/app/src/main/java/com/example/greenwatch/sensors/MicrofonSensor.java +++ b/app/src/main/java/com/example/greenwatch/sensors/MicrofonSensor.java @@ -97,6 +97,7 @@ import com.example.greenwatch.sensors.MicrofonHelperClasses.Verarbeitungsergebni for(int i = 0; i < anzahlIterationen; i++){ int z = recorder.read(puffer, 0, puffer.length); Verarbeitungsergebnis kalibrierung = verarbeiten(puffer, z); + System.out.println("Kalibrierung" + kalibrierung.getDB()); sum += kalibrierung.getDB(); } return sum/anzahlIterationen;