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

Bugfix #2 for showing Glocke Image in Notification and Activity.

Browse Source
This commit is contained in:
Florian Klebl
2025-10-11 13:24:42 +02:00
committed by fklebl
parent d488b1dc48
commit 232f76215f
15 changed files with 81 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/main/java/com/haussteuerung/FragmentHeizkoerper.java
View File

@@ -111,11 +111,7 @@ public class FragmentHeizkoerper extends Fragment {
}
picker.setDisplayedValues(values);
builder.setPositiveButton(android.R.string.ok, (dialog, id) -> {
if (values[picker.getValue()].equals("on") || values[picker.getValue()].equals("off")) {
button.setText(values[picker.getValue()]);
} else {
button.setText(values[picker.getValue()]);
}
button.setText(values[picker.getValue()]);
Log.d("SollTempGrossraum", "Solltemp" + roomSollTemp + ", Button " + button.getText());
if (!roomSollTemp.contentEquals(button.getText())) {
@@ -144,7 +140,7 @@ public class FragmentHeizkoerper extends Fragment {
btn_HK_Bad = view.findViewById(R.id.btn_HK_Bad);
btn_HK_Florian = view.findViewById(R.id.btn_HK_Florian);
btn_HK_Stefan = view.findViewById(R.id.btn_HK_Stefan);
btn_HK_Dachboden = view.findViewById(R.id.btn_HK_Dachboden);
// btn_HK_Dachboden = view.findViewById(R.id.btn_HK_Dachboden);
Log.d("SollTempGrossraum", sollTempHKGrossraum);
Log.d("SollTempDoris", sollTempHKDoris);
@@ -167,7 +163,7 @@ public class FragmentHeizkoerper extends Fragment {
btn_HK_Bad.setText(sollTempHKBad);
btn_HK_Florian.setText(sollTempHKFlorian);
btn_HK_Stefan.setText(sollTempHKStefan);
btn_HK_Dachboden.setText(sollTempHKDachboden);
// btn_HK_Dachboden.setText(sollTempHKDachboden);
btn_HK_Grossraum.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Grossraum, sollTempHKGrossraum, "Grossraum", switch_HK_Grossraum));
@@ -188,7 +184,7 @@ public class FragmentHeizkoerper extends Fragment {
btn_HK_Stefan.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Stefan, sollTempHKStefan, "Stefan", switch_HK_Stefan));
btn_HK_Dachboden.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Dachboden, sollTempHKDachboden, "Dachboden", switch_HK_Dachboden));
// btn_HK_Dachboden.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Dachboden, sollTempHKDachboden, "Dachboden", switch_HK_Dachboden));
}
private void handleTextViews() {
@@ -214,7 +210,7 @@ public class FragmentHeizkoerper extends Fragment {
switch_HK_Bad = view.findViewById(R.id.switch_HK_Bad);
switch_HK_Florian = view.findViewById(R.id.switch_HK_Florian);
switch_HK_Stefan = view.findViewById(R.id.switch_HK_Stefan);
switch_HK_Dachboden = view.findViewById(R.id.switch_HK_Dachboden);
// switch_HK_Dachboden = view.findViewById(R.id.switch_HK_Dachboden);
if (modeHKGrossraum.equals("manual")) {
switch_HK_Grossraum.setChecked(false);
@@ -288,13 +284,13 @@ public class FragmentHeizkoerper extends Fragment {
switch_HK_Stefan.setText(R.string.auto);
}
if (modeHKDachboden.equals("manual")) {
switch_HK_Dachboden.setChecked(false);
switch_HK_Dachboden.setText(R.string.man);
} else {
switch_HK_Dachboden.setChecked(true);
switch_HK_Dachboden.setText(R.string.auto);
}
// if (modeHKDachboden.equals("manual")) {
// switch_HK_Dachboden.setChecked(false);
// switch_HK_Dachboden.setText(R.string.man);
// } else {
// switch_HK_Dachboden.setChecked(true);
// switch_HK_Dachboden.setText(R.string.auto);
// }
switch_HK_Grossraum.setOnClickListener(v -> {
if (switch_HK_Grossraum.isChecked()) {
@@ -404,17 +400,17 @@ public class FragmentHeizkoerper extends Fragment {
}
});
switch_HK_Dachboden.setOnClickListener(v -> {
if (switch_HK_Dachboden.isChecked()) {
Log.d("Mode" + modeHKDachboden, "Mode auto");
switch_HK_Dachboden.setText(R.string.auto);
MqttClient.publish("fhem/Heizung/MAX_Dachboden/set/mode", "auto", 2, false);
} else if (!switch_HK_Dachboden.isChecked()) {
Log.d("Mode" + modeHKDachboden, "Mode manual");
switch_HK_Dachboden.setText(R.string.man);
MqttClient.publish("fhem/Heizung/MAX_Dachboden/set/mode", "manual", 2, false);
}
});
// switch_HK_Dachboden.setOnClickListener(v -> {
// if (switch_HK_Dachboden.isChecked()) {
// Log.d("Mode" + modeHKDachboden, "Mode auto");
// switch_HK_Dachboden.setText(R.string.auto);
// MqttClient.publish("fhem/Heizung/MAX_Dachboden/set/mode", "auto", 2, false);
// } else if (!switch_HK_Dachboden.isChecked()) {
// Log.d("Mode" + modeHKDachboden, "Mode manual");
// switch_HK_Dachboden.setText(R.string.man);
// MqttClient.publish("fhem/Heizung/MAX_Dachboden/set/mode", "manual", 2, false);
// }
// });
}
private void setTextColor(TextView tv, String temp) {