Bugfix for Camera photo not being displayed in the app.
This commit is contained in:
@@ -8,6 +8,7 @@ import android.os.Bundle;
|
||||
import androidx.appcompat.widget.SwitchCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.lifecycle.ProcessLifecycleOwner;
|
||||
|
||||
import android.os.Handler;
|
||||
import android.util.Log;
|
||||
@@ -48,6 +49,8 @@ public class FragmentHeizkoerper extends Fragment {
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
ProcessLifecycleOwner.get().getLifecycle().addObserver(new AppLifecycleTracker());
|
||||
|
||||
// Inflate the layout for this fragment
|
||||
view = inflater.inflate(R.layout.fragment_heizkoerper, container, false);
|
||||
requireActivity().setTitle("Haussteuerung - Heizkörper");
|
||||
@@ -58,14 +61,13 @@ public class FragmentHeizkoerper extends Fragment {
|
||||
|
||||
context = getContext();
|
||||
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
// Runnable method
|
||||
final Runnable myRunnable = new Runnable() {
|
||||
public void run() {
|
||||
Log.d("Heizkoerper","OK");
|
||||
Log.d("Heizkoerper", "OK");
|
||||
|
||||
tv_temp_Grossraum.setText(istTempHKGrossraum);
|
||||
setTextColor(tv_temp_Grossraum, istTempHKGrossraum);
|
||||
@@ -94,57 +96,41 @@ public class FragmentHeizkoerper extends Fragment {
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
|
||||
final View view = this.getLayoutInflater().inflate(R.layout.layout_numberpicker, null);
|
||||
builder.setView(view);
|
||||
//builder.setTitle();
|
||||
final NumberPicker picker = view.findViewById(R.id.picker);
|
||||
String[] values = {"off","12.0","12.5","13.0","13.5","14.0","14.5","15.0","15.5","16.0","16.5","17.0","17.5","18.0",
|
||||
"18.5","19.0","19.5","20.0","20.5","21.0","21.5","22.0","22.5","23.0","23.5","24.0","24.5","25.0",
|
||||
"25.5","26.0","26.5","27.0","27.5","28.0","28.5","29.0","29.5","30.0","on"};
|
||||
String[] values = {"off", "12.0", "12.5", "13.0", "13.5", "14.0", "14.5", "15.0", "15.5", "16.0", "16.5", "17.0", "17.5", "18.0",
|
||||
"18.5", "19.0", "19.5", "20.0", "20.5", "21.0", "21.5", "22.0", "22.5", "23.0", "23.5", "24.0", "24.5", "25.0",
|
||||
"25.5", "26.0", "26.5", "27.0", "27.5", "28.0", "28.5", "29.0", "29.5", "30.0", "on"};
|
||||
int ml = values.length;
|
||||
picker.setWrapSelectorWheel(false);
|
||||
picker.setMinValue(0);
|
||||
picker.setMaxValue(ml - 1);
|
||||
for(int y=0; y<values.length; y++) {
|
||||
// Log.d("NumberPicker", values[y]);
|
||||
for (int y = 0; y < values.length; y++) {
|
||||
if (values[y].equals(button.getText().toString())) {
|
||||
picker.setValue(y);
|
||||
}
|
||||
}
|
||||
picker.setDisplayedValues(values);
|
||||
builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int id) {
|
||||
// Log.d("NumberPicker", String.valueOf(picker.getValue()));
|
||||
// Log.d("NumberPicker", values[picker.getValue()]);
|
||||
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()]);
|
||||
}
|
||||
|
||||
if (values[picker.getValue()].equals("on") || values[picker.getValue()].equals("off")) {
|
||||
button.setText(values[picker.getValue()]);
|
||||
Log.d("SollTempGrossraum", "Solltemp" + roomSollTemp + ", Button " + button.getText());
|
||||
if (!roomSollTemp.contentEquals(button.getText())) {
|
||||
if (switchCompat.isChecked()) {
|
||||
Log.d("SollTemp" + room, "Temp zu Auto+Temp geändert");
|
||||
MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/temp", "auto " + button.getText().toString(), 2, false);
|
||||
} else {
|
||||
button.setText(values[picker.getValue()]);
|
||||
}
|
||||
|
||||
Log.d("SollTempGrossraum", "Solltemp" + roomSollTemp + ", Button " + button.getText());
|
||||
if (!roomSollTemp.contentEquals(button.getText()))
|
||||
{
|
||||
if (switchCompat.isChecked()) {
|
||||
Log.d("SollTemp" + room, "Temp zu Auto+Temp geändert");
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/temp", "auto " + button.getText().toString(), 2, false);
|
||||
} else {
|
||||
Log.d("SollTemp" + room, "Temp geändert");
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/temp", button.getText().toString(), 2, false);
|
||||
}
|
||||
} else {
|
||||
Log.d("SollTemp" + room, "Temp gleich");
|
||||
Log.d("SollTemp" + room, "Temp geändert");
|
||||
MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/temp", button.getText().toString(), 2, false);
|
||||
}
|
||||
} else {
|
||||
Log.d("SollTemp" + room, "Temp gleich");
|
||||
}
|
||||
})
|
||||
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int id) {
|
||||
builder.create().cancel();
|
||||
}
|
||||
});
|
||||
.setNegativeButton(android.R.string.cancel, (dialog, id) -> builder.create().cancel());
|
||||
builder.create().show();
|
||||
}
|
||||
|
||||
@@ -184,75 +170,25 @@ public class FragmentHeizkoerper extends Fragment {
|
||||
btn_HK_Dachboden.setText(sollTempHKDachboden);
|
||||
|
||||
|
||||
btn_HK_Grossraum.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
showNumberPickerDialog(btn_HK_Grossraum, sollTempHKGrossraum, "Grossraum", switch_HK_Grossraum);
|
||||
}
|
||||
});
|
||||
btn_HK_Grossraum.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Grossraum, sollTempHKGrossraum, "Grossraum", switch_HK_Grossraum));
|
||||
|
||||
btn_HK_Doris.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
showNumberPickerDialog(btn_HK_Doris, sollTempHKDoris, "Doris_klein", switch_HK_Doris);
|
||||
}
|
||||
});
|
||||
btn_HK_Doris.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Doris, sollTempHKDoris, "Doris_klein", switch_HK_Doris));
|
||||
|
||||
btn_HK_Doris_Bad.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
showNumberPickerDialog(btn_HK_Doris_Bad, sollTempHKDorisBad, "Doris_Bad", switch_HK_Doris_Bad);
|
||||
}
|
||||
});
|
||||
btn_HK_Doris_Bad.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Doris_Bad, sollTempHKDorisBad, "Doris_Bad", switch_HK_Doris_Bad));
|
||||
|
||||
btn_HK_Arbeitszimmer.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
showNumberPickerDialog(btn_HK_Arbeitszimmer, sollTempHKArbeitszimmer, "Arbeitszimmer", switch_HK_Arbeitszimmer);
|
||||
}
|
||||
});
|
||||
btn_HK_Arbeitszimmer.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Arbeitszimmer, sollTempHKArbeitszimmer, "Arbeitszimmer", switch_HK_Arbeitszimmer));
|
||||
|
||||
btn_HK_Vorraum.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
showNumberPickerDialog(btn_HK_Vorraum, sollTempHKVorraum, "Vorraum", switch_HK_Vorraum);
|
||||
}
|
||||
});
|
||||
btn_HK_Vorraum.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Vorraum, sollTempHKVorraum, "Vorraum", switch_HK_Vorraum));
|
||||
|
||||
btn_HK_WCEG.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
showNumberPickerDialog(btn_HK_WCEG, sollTempHKWCEG, "WC", switch_HK_WCEG);
|
||||
}
|
||||
});
|
||||
btn_HK_WCEG.setOnClickListener(v -> showNumberPickerDialog(btn_HK_WCEG, sollTempHKWCEG, "WC", switch_HK_WCEG));
|
||||
|
||||
btn_HK_Bad.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
showNumberPickerDialog(btn_HK_Bad, sollTempHKBad, "Bad", switch_HK_Bad);
|
||||
}
|
||||
});
|
||||
btn_HK_Bad.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Bad, sollTempHKBad, "Bad", switch_HK_Bad));
|
||||
|
||||
btn_HK_Florian.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
showNumberPickerDialog(btn_HK_Florian, sollTempHKFlorian, "Florian", switch_HK_Florian);
|
||||
}
|
||||
});
|
||||
btn_HK_Florian.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Florian, sollTempHKFlorian, "Florian", switch_HK_Florian));
|
||||
|
||||
btn_HK_Stefan.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
showNumberPickerDialog(btn_HK_Stefan, sollTempHKStefan, "Stefan", switch_HK_Stefan);
|
||||
}
|
||||
});
|
||||
btn_HK_Stefan.setOnClickListener(v -> showNumberPickerDialog(btn_HK_Stefan, sollTempHKStefan, "Stefan", switch_HK_Stefan));
|
||||
|
||||
btn_HK_Dachboden.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View 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() {
|
||||
@@ -360,179 +296,129 @@ public class FragmentHeizkoerper extends Fragment {
|
||||
switch_HK_Dachboden.setText(R.string.auto);
|
||||
}
|
||||
|
||||
switch_HK_Grossraum.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (switch_HK_Grossraum.isChecked()) {
|
||||
Log.d("Mode" + modeHKGrossraum, "Mode geändert");
|
||||
switch_HK_Grossraum.setText(R.string.auto);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Grossraum/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Grossraum.isChecked()){
|
||||
Log.d("Mode" + modeHKGrossraum, "Mode geändert");
|
||||
switch_HK_Grossraum.setText(R.string.man);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Grossraum/set/mode", "manual", 2, false);
|
||||
}
|
||||
switch_HK_Grossraum.setOnClickListener(v -> {
|
||||
if (switch_HK_Grossraum.isChecked()) {
|
||||
Log.d("Mode" + modeHKGrossraum, "Mode geändert");
|
||||
switch_HK_Grossraum.setText(R.string.auto);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Grossraum/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Grossraum.isChecked()) {
|
||||
Log.d("Mode" + modeHKGrossraum, "Mode geändert");
|
||||
switch_HK_Grossraum.setText(R.string.man);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Grossraum/set/mode", "manual", 2, false);
|
||||
}
|
||||
});
|
||||
|
||||
switch_HK_Doris.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (switch_HK_Doris.isChecked()) {
|
||||
Log.d("Mode" + modeHKDoris, "Mode geändert");
|
||||
switch_HK_Doris.setText(R.string.auto);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Doris_klein/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Doris.isChecked()){
|
||||
Log.d("Mode" + modeHKDoris, "Mode geändert");
|
||||
switch_HK_Doris.setText(R.string.man);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Doris_klein/set/mode", "manual", 2, false);
|
||||
}
|
||||
switch_HK_Doris.setOnClickListener(v -> {
|
||||
if (switch_HK_Doris.isChecked()) {
|
||||
Log.d("Mode" + modeHKDoris, "Mode geändert");
|
||||
switch_HK_Doris.setText(R.string.auto);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Doris_klein/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Doris.isChecked()) {
|
||||
Log.d("Mode" + modeHKDoris, "Mode geändert");
|
||||
switch_HK_Doris.setText(R.string.man);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Doris_klein/set/mode", "manual", 2, false);
|
||||
}
|
||||
});
|
||||
|
||||
switch_HK_Doris_Bad.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (switch_HK_Doris_Bad.isChecked()) {
|
||||
Log.d("Mode" + modeHKDorisBad, "Mode auto");
|
||||
switch_HK_Doris_Bad.setText(R.string.auto);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Doris_Bad/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Doris_Bad.isChecked()){
|
||||
Log.d("Mode" + modeHKDorisBad, "Mode manual");
|
||||
switch_HK_Doris_Bad.setText(R.string.man);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Doris_Bad/set/mode", "manual", 2, false);
|
||||
}
|
||||
switch_HK_Doris_Bad.setOnClickListener(v -> {
|
||||
if (switch_HK_Doris_Bad.isChecked()) {
|
||||
Log.d("Mode" + modeHKDorisBad, "Mode auto");
|
||||
switch_HK_Doris_Bad.setText(R.string.auto);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Doris_Bad/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Doris_Bad.isChecked()) {
|
||||
Log.d("Mode" + modeHKDorisBad, "Mode manual");
|
||||
switch_HK_Doris_Bad.setText(R.string.man);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Doris_Bad/set/mode", "manual", 2, false);
|
||||
}
|
||||
});
|
||||
|
||||
switch_HK_Arbeitszimmer.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (switch_HK_Arbeitszimmer.isChecked()) {
|
||||
Log.d("Mode" + modeHKArbeitszimmer, "Mode auto");
|
||||
switch_HK_Arbeitszimmer.setText(R.string.auto);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Arbeitszimmer/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Arbeitszimmer.isChecked()){
|
||||
Log.d("Mode" + modeHKArbeitszimmer, "Mode manual");
|
||||
switch_HK_Arbeitszimmer.setText(R.string.man);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Arbeitszimmer/set/mode", "manual", 2, false);
|
||||
}
|
||||
switch_HK_Arbeitszimmer.setOnClickListener(v -> {
|
||||
if (switch_HK_Arbeitszimmer.isChecked()) {
|
||||
Log.d("Mode" + modeHKArbeitszimmer, "Mode auto");
|
||||
switch_HK_Arbeitszimmer.setText(R.string.auto);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Arbeitszimmer/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Arbeitszimmer.isChecked()) {
|
||||
Log.d("Mode" + modeHKArbeitszimmer, "Mode manual");
|
||||
switch_HK_Arbeitszimmer.setText(R.string.man);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Arbeitszimmer/set/mode", "manual", 2, false);
|
||||
}
|
||||
});
|
||||
|
||||
switch_HK_Vorraum.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (switch_HK_Vorraum.isChecked()) {
|
||||
Log.d("Mode" + modeHKVorraum, "Mode auto");
|
||||
switch_HK_Vorraum.setText(R.string.auto);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Vorraum/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Vorraum.isChecked()) {
|
||||
Log.d("Mode" + modeHKVorraum, "Mode manual");
|
||||
switch_HK_Vorraum.setText(R.string.man);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Vorraum/set/mode", "manual", 2, false);
|
||||
}
|
||||
switch_HK_Vorraum.setOnClickListener(v -> {
|
||||
if (switch_HK_Vorraum.isChecked()) {
|
||||
Log.d("Mode" + modeHKVorraum, "Mode auto");
|
||||
switch_HK_Vorraum.setText(R.string.auto);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Vorraum/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Vorraum.isChecked()) {
|
||||
Log.d("Mode" + modeHKVorraum, "Mode manual");
|
||||
switch_HK_Vorraum.setText(R.string.man);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Vorraum/set/mode", "manual", 2, false);
|
||||
}
|
||||
});
|
||||
|
||||
switch_HK_WCEG.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (switch_HK_WCEG.isChecked()) {
|
||||
Log.d("Mode" + modeHKWCEG, "Mode auto");
|
||||
switch_HK_WCEG.setText(R.string.auto);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_WC/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_WCEG.isChecked()){
|
||||
Log.d("Mode" + modeHKWCEG, "Mode manual");
|
||||
switch_HK_WCEG.setText(R.string.man);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_WC/set/mode", "manual", 2, false);
|
||||
}
|
||||
switch_HK_WCEG.setOnClickListener(v -> {
|
||||
if (switch_HK_WCEG.isChecked()) {
|
||||
Log.d("Mode" + modeHKWCEG, "Mode auto");
|
||||
switch_HK_WCEG.setText(R.string.auto);
|
||||
MqttClient.publish("fhem/Heizung/MAX_WC/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_WCEG.isChecked()) {
|
||||
Log.d("Mode" + modeHKWCEG, "Mode manual");
|
||||
switch_HK_WCEG.setText(R.string.man);
|
||||
MqttClient.publish("fhem/Heizung/MAX_WC/set/mode", "manual", 2, false);
|
||||
}
|
||||
});
|
||||
|
||||
switch_HK_Bad.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (switch_HK_Bad.isChecked()) {
|
||||
Log.d("Mode" + modeHKBad, "Mode auto");
|
||||
switch_HK_Bad.setText(R.string.auto);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Bad/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Bad.isChecked()){
|
||||
Log.d("Mode" + modeHKBad, "Mode manual");
|
||||
switch_HK_Bad.setText(R.string.man);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Bad/set/mode", "manual", 2, false);
|
||||
}
|
||||
switch_HK_Bad.setOnClickListener(v -> {
|
||||
if (switch_HK_Bad.isChecked()) {
|
||||
Log.d("Mode" + modeHKBad, "Mode auto");
|
||||
switch_HK_Bad.setText(R.string.auto);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Bad/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Bad.isChecked()) {
|
||||
Log.d("Mode" + modeHKBad, "Mode manual");
|
||||
switch_HK_Bad.setText(R.string.man);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Bad/set/mode", "manual", 2, false);
|
||||
}
|
||||
});
|
||||
|
||||
switch_HK_Florian.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (switch_HK_Florian.isChecked()) {
|
||||
Log.d("Mode" + modeHKFlorian, "Mode geändert");
|
||||
switch_HK_Florian.setText(R.string.auto);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Florian/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Florian.isChecked()){
|
||||
Log.d("Mode" + modeHKFlorian, "Mode geändert");
|
||||
switch_HK_Florian.setText(R.string.man);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Florian/set/mode", "manual", 2, false);
|
||||
}
|
||||
switch_HK_Florian.setOnClickListener(v -> {
|
||||
if (switch_HK_Florian.isChecked()) {
|
||||
Log.d("Mode" + modeHKFlorian, "Mode geändert");
|
||||
switch_HK_Florian.setText(R.string.auto);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Florian/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Florian.isChecked()) {
|
||||
Log.d("Mode" + modeHKFlorian, "Mode geändert");
|
||||
switch_HK_Florian.setText(R.string.man);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Florian/set/mode", "manual", 2, false);
|
||||
}
|
||||
});
|
||||
|
||||
switch_HK_Stefan.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (switch_HK_Stefan.isChecked()) {
|
||||
Log.d("Mode" + modeHKStefan, "Mode auto");
|
||||
switch_HK_Stefan.setText(R.string.auto);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Stefan/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Stefan.isChecked()){
|
||||
Log.d("Mode" + modeHKStefan, "Mode manual");
|
||||
switch_HK_Stefan.setText(R.string.man);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Stefan/set/mode", "manual", 2, false);
|
||||
}
|
||||
switch_HK_Stefan.setOnClickListener(v -> {
|
||||
if (switch_HK_Stefan.isChecked()) {
|
||||
Log.d("Mode" + modeHKStefan, "Mode auto");
|
||||
switch_HK_Stefan.setText(R.string.auto);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Stefan/set/mode", "auto", 2, false);
|
||||
} else if (!switch_HK_Stefan.isChecked()) {
|
||||
Log.d("Mode" + modeHKStefan, "Mode manual");
|
||||
switch_HK_Stefan.setText(R.string.man);
|
||||
MqttClient.publish("fhem/Heizung/MAX_Stefan/set/mode", "manual", 2, false);
|
||||
}
|
||||
});
|
||||
|
||||
switch_HK_Dachboden.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (switch_HK_Dachboden.isChecked()) {
|
||||
Log.d("Mode" + modeHKDachboden, "Mode auto");
|
||||
switch_HK_Dachboden.setText(R.string.auto);
|
||||
//MqttClient.publish("fhem/Heizung/MAX_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
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_" + room + "/set/Temp", button.getText().toString(), 2, false);
|
||||
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) {
|
||||
if (!temp.equals("")) {
|
||||
if (!temp.isEmpty()) {
|
||||
double tempDouble = Double.parseDouble(temp);
|
||||
if (tempDouble >= 25) {
|
||||
tv.setTextColor(ContextCompat.getColor(context, R.color.twoFive));
|
||||
@@ -571,26 +457,22 @@ public class FragmentHeizkoerper extends Fragment {
|
||||
myHandler.post(myRunnable); // updateUI method
|
||||
}
|
||||
};
|
||||
myTimer.schedule(myTask,0,1000); // TimerTask, delay, period
|
||||
Log.d("State", "on Resume");
|
||||
myTimer.schedule(myTask, 0, 1000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStop() {
|
||||
super.onStop();
|
||||
myTask.cancel();
|
||||
Log.d("State", "on Stop");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
super.onPause();
|
||||
Log.d("State", "on Pause");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
super.onDestroy();
|
||||
// myTimer.cancel();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user