fklebl/Haussteuerung-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Bugfix for Camera photo not being displayed in the app.

Browse Source
This commit is contained in:
Florian Klebl
2025-10-06 20:42:34 +02:00
parent 7fa666bcd4
commit 567b279030
32 changed files with 741 additions and 1976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
app/src/main/java/com/haussteuerung/activityDoris.java
View File

@@ -3,22 +3,18 @@ package com.haussteuerung;
import android.app.TimePickerDialog;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.TextView;
import android.widget.TimePicker;
import android.widget.Toast;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.lifecycle.ProcessLifecycleOwner;
import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName;
import com.haussteuerung.helper.Blutdruck;
import com.haussteuerung.helper.Temperatur;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -29,25 +25,22 @@ public class activityDoris extends AppCompatActivity {
Button buttonSend, zeitBlutdruck, zeitFiebertemp;
int hourBlutdruck = 0, minuteBlutdruck = 0, hourFiebertemp = 0, minuteFiebertemp = 0;
static String werteBlutdruck = "";
static String wertFiebertemp = "";
TextView textSYS, textDIA, textFiebertemp;
LocalDateTime datetime = LocalDateTime.now();
DateTimeFormatter dateTimeFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String formattedDate = datetime.format(dateTimeFormat);
public static boolean pausedDoris = true;
Gson gson = new Gson();
String msg;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ProcessLifecycleOwner.get().getLifecycle().addObserver(new AppLifecycleTracker());
androidx.appcompat.app.ActionBar actionBar = getSupportActionBar();
assert actionBar != null;
actionBar.setBackgroundDrawable(AppCompatResources.getDrawable(getApplicationContext(), R.color.black));
pausedDoris = false;
setContentView(R.layout.activity_doris);
setTitle("Haussteuerung - Doris");
@@ -63,13 +56,7 @@ public class activityDoris extends AppCompatActivity {
hourBlutdruck = datetime.getHour();
minuteBlutdruck = datetime.getMinute();
zeitBlutdruck.setText(String.format(Locale.getDefault(), "%02d:%02d", datetime.getHour(), datetime.getMinute()));
zeitBlutdruck.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
timePickerDialog(zeitBlutdruck);
}
});
zeitBlutdruck.setOnClickListener(v -> timePickerDialog(zeitBlutdruck));
checkBlutdruck.setOnClickListener(view -> {
if (checkBlutdruck.isChecked()) {
@@ -96,13 +83,7 @@ public class activityDoris extends AppCompatActivity {
hourFiebertemp = datetime.getHour();
minuteFiebertemp = datetime.getMinute();
zeitFiebertemp.setText(String.format(Locale.getDefault(), "%02d:%02d", datetime.getHour(), datetime.getMinute()));
zeitFiebertemp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
timePickerDialog(zeitFiebertemp);
}
});
zeitFiebertemp.setOnClickListener(v -> timePickerDialog(zeitFiebertemp));
checkFiebertemp.setOnClickListener(view -> {
if (checkFiebertemp.isChecked()) {
@@ -127,9 +108,8 @@ public class activityDoris extends AppCompatActivity {
String minute = Integer.toString(minuteBlutdruck);
String sys = textSYS.getText().toString();
String dia = textDIA.getText().toString();
werteBlutdruck = "{\"DeviceID\":\"" + MainActivity.ID + "\", \"Datum\":" + "\"" + formattedDate + " " + hour + ":" + minute + ":00" + "\"," + "\"SYS\":" + "\"" + sys + "\"," + "\"DIA\":" + "\"" + dia + "\"}";
Log.d("Doris", werteBlutdruck);
MqttClient.publish("cmnd/Haussteuerung/Doris/Blutdruck", werteBlutdruck);
msg = gson.toJson(new Blutdruck(MainActivity.ID, formattedDate + " " + hour + ":" + minute + ":00", sys, dia));
MqttClient.publish("cmnd/Haussteuerung/Doris/Blutdruck", msg);
setBlutdruck = true;
}
@@ -143,9 +123,7 @@ public class activityDoris extends AppCompatActivity {
String fiebertemp = textFiebertemp.getText().toString();
msg = gson.toJson(new Temperatur(MainActivity.ID, formattedDate + " " + hour + ":" + minute + ":00", fiebertemp));
MqttClient.publish("cmnd/Haussteuerung/Doris/Temperatur", msg);
// wertFiebertemp = "{\"DeviceID\":\"" + MainActivity.ID + "\", \"Datum\":" + "\"" + formattedDate + " " + hour + ":" + minute + ":00" + "\"," + "\"Temperatur\": " + "\"" + fiebertemp + "\"}";
Log.d("Doris", msg);
// MqttClient.publish("cmnd/Haussteuerung/Doris/Temperatur", wertFiebertemp);
setFiebertemp = true;
}
if (setBlutdruck || setFiebertemp) {
@@ -158,12 +136,7 @@ public class activityDoris extends AppCompatActivity {
LocalTime localTime = LocalTime.parse(button.getText());
int hour = localTime.getHour();
int minute = localTime.getMinute();
TimePickerDialog.OnTimeSetListener onTimeSetListener = new TimePickerDialog.OnTimeSetListener() {
@Override
public void onTimeSet(TimePicker timePicker, int selectedHour, int selectedMinute) {
button.setText(String.format(Locale.getDefault(), "%02d:%02d", selectedHour, selectedMinute));
}
};
TimePickerDialog.OnTimeSetListener onTimeSetListener = (timePicker, selectedHour, selectedMinute) -> button.setText(String.format(Locale.getDefault(), "%02d:%02d", selectedHour, selectedMinute));
TimePickerDialog timePickerDialog = new TimePickerDialog(this, onTimeSetListener, hour, minute, true);
timePickerDialog.show();
}
@@ -171,34 +144,16 @@ public class activityDoris extends AppCompatActivity {
@Override
protected void onPause() {
super.onPause();
pausedDoris = true;
}
@Override
protected void onResume() {
super.onResume();
pausedDoris = false;
}
@Override
protected void onStop() {
super.onStop();
pausedDoris = true;
}
}
class Temperatur {
@SerializedName("DeviceID")
private final String deviceId;
@SerializedName("Datum")
private final String datum;
@SerializedName("Temperatur")
private final String temperatur;
public Temperatur(String deviceId, String datum, String temperatur) {
this.deviceId = deviceId;
this.datum = datum;
this.temperatur = temperatur;
}
}