diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
-
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8978d23..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 36c7675..3bfe944 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ android {
minSdk 26
targetSdk 34
versionCode 1
- versionName "25.1006.1"
+ versionName "25.1011.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index c05df32..40456d2 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm
index a43ada2..84b53f2 100644
Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ
diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm
index 65b1316..127f19b 100644
Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ
diff --git a/app/src/main/java/com/haussteuerung/FragmentHeizkoerper.java b/app/src/main/java/com/haussteuerung/FragmentHeizkoerper.java
index 593914c..9e36782 100644
--- a/app/src/main/java/com/haussteuerung/FragmentHeizkoerper.java
+++ b/app/src/main/java/com/haussteuerung/FragmentHeizkoerper.java
@@ -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) {
diff --git a/app/src/main/java/com/haussteuerung/MainActivity.java b/app/src/main/java/com/haussteuerung/MainActivity.java
index bf96d0a..a2b539a 100644
--- a/app/src/main/java/com/haussteuerung/MainActivity.java
+++ b/app/src/main/java/com/haussteuerung/MainActivity.java
@@ -70,10 +70,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
ID = "haussteuerung-android-" + Build.MODEL + "-" + androidId;
Log.d("ID", ID);
- int permissionState = 0;
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
- permissionState = ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS);
- }
+ int permissionState;
+ permissionState = ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS);
// If the permission is not granted, request it.
if (permissionState == PackageManager.PERMISSION_DENIED) {
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.POST_NOTIFICATIONS}, 1);
diff --git a/app/src/main/java/com/haussteuerung/MqttClient.java b/app/src/main/java/com/haussteuerung/MqttClient.java
index bec3ed4..8e34a4b 100644
--- a/app/src/main/java/com/haussteuerung/MqttClient.java
+++ b/app/src/main/java/com/haussteuerung/MqttClient.java
@@ -124,7 +124,7 @@ public class MqttClient {
try {
client.connect(mqttConnectOptions);
subscribe("stat/Haussteuerung/#");
- subscribe("fhem/temp/#");
+ // subscribe("fhem/temp/#");
subscribe("fhem/Heizung/#");
subscribe("tele/sonoff153/#");
subscribe("growatt/#");
@@ -226,11 +226,11 @@ public class MqttClient {
}
- if (topic.equals("fhem/temp/Temp_Boiler_oben")) {
+ if (topic.equals("stat/Haussteuerung/Temperatur/Temp_Boiler_oben")) {
FragmentWW.tempBoilerOben = message.toString();
}
- if (topic.equals("fhem/temp/Temp_Boiler_unten")) {
+ if (topic.equals("stat/Haussteuerung/Temperatur/Temp_Boiler_unten")) {
FragmentWW.tempBoilerUnten = message.toString();
}
@@ -243,7 +243,7 @@ public class MqttClient {
FragmentHeizkoerper.sollTempHKGrossraum = message.toString();
}
- if (topic.equals("fhem/temp/Temp_Grossraum")) {
+ if (topic.equals("stat/Haussteuerung/Temperatur/Temp_Wohnzimmer")) {
FragmentHeizkoerper.istTempHKGrossraum = message.toString();
}
@@ -256,7 +256,7 @@ public class MqttClient {
FragmentHeizkoerper.sollTempHKDoris = message.toString();
}
- if (topic.equals("fhem/temp/Temp_Doris")) {
+ if (topic.equals("stat/Haussteuerung/Temperatur/Temp_Doris")) {
FragmentHeizkoerper.istTempHKDoris = message.toString();
}
@@ -269,7 +269,7 @@ public class MqttClient {
FragmentHeizkoerper.sollTempHKDorisBad = message.toString();
}
- if (topic.equals("fhem/temp/Temp_DorisBad")) {
+ if (topic.equals("stat/Haussteuerung/Temperatur/Temp_Doris_Bad")) {
FragmentHeizkoerper.istTempHKDorisBad = message.toString();
}
@@ -282,7 +282,7 @@ public class MqttClient {
FragmentHeizkoerper.sollTempHKArbeitszimmer = message.toString();
}
- if (topic.equals("fhem/temp/Temp_Arbeitszimmer")) {
+ if (topic.equals("stat/Haussteuerung/Temperatur/Temp_Arbeitszimmer")) {
FragmentHeizkoerper.istTempHKArbeitszimmer = message.toString();
}
@@ -321,21 +321,20 @@ public class MqttClient {
FragmentHeizkoerper.sollTempHKBad = message.toString();
}
- if (topic.equals("fhem/temp/Temp_Bad")) {
+ if (topic.equals("stat/Haussteuerung/Temperatur/Temp_Bad")) {
FragmentHeizkoerper.istTempHKBad = message.toString();
}
// Florian
if (topic.equals("fhem/Heizung/MAX_Florian/Mode")) {
FragmentHeizkoerper.modeHKFlorian = message.toString();
-
}
if (topic.equals("fhem/Heizung/MAX_Florian/Solltemperatur")) {
FragmentHeizkoerper.sollTempHKFlorian = message.toString();
}
- if (topic.equals("fhem/temp/Temp_Flo")) {
+ if (topic.equals("stat/Haussteuerung/Temperatur/Temp_Florian")) {
FragmentHeizkoerper.istTempHKFlorian = message.toString();
}
@@ -349,7 +348,7 @@ public class MqttClient {
Log.d("SollTempStefan", message.toString());
}
- if (topic.equals("fhem/temp/Temp_Stefan")) {
+ if (topic.equals("stat/Haussteuerung/Temperatur/Temp_Stefan")) {
FragmentHeizkoerper.istTempHKStefan = message.toString();
Log.d("IstTempStefan", message.toString());
}
@@ -363,7 +362,7 @@ public class MqttClient {
FragmentHeizkoerper.sollTempHKDachboden = message.toString();
}
- if (topic.equals("fhem/temp/Temp_Dachboden")) {
+ if (topic.equals("stat/Haussteuerung/Temperatur/Temp_Dachboden")) {
FragmentHeizkoerper.istTempHKDachboden = message.toString();
}
}
diff --git a/app/src/main/java/com/haussteuerung/activityGlocke.java b/app/src/main/java/com/haussteuerung/activityGlocke.java
index aebaa9f..47e4c4c 100644
--- a/app/src/main/java/com/haussteuerung/activityGlocke.java
+++ b/app/src/main/java/com/haussteuerung/activityGlocke.java
@@ -43,7 +43,7 @@ public class activityGlocke extends AppCompatActivity {
Intent i = getIntent();
Bitmap bitmap;
if ((i.getExtras() != null) && (i.hasExtra("TimeFB"))) {
- bitmap = loadBitmapFromMediaStore(getApplicationContext(), i.getStringExtra("Time") + ".jpg");
+ bitmap = loadBitmapFromMediaStore(getApplicationContext(), i.getStringExtra("TimeFB") + ".jpg");
} else {
bitmap = loadBitmapFromMediaStore(getApplicationContext(), "cam.jpg");
}
diff --git a/app/src/main/res/layout/fragment_heizkoerper.xml b/app/src/main/res/layout/fragment_heizkoerper.xml
index 5d303ef..d45e699 100644
--- a/app/src/main/res/layout/fragment_heizkoerper.xml
+++ b/app/src/main/res/layout/fragment_heizkoerper.xml
@@ -871,42 +871,44 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_HK_Dachboden" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index abe4cd0..224016e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -101,7 +101,7 @@
Boiler\nUnten
38°
44°
- Version 25.1006.1
+ Version 25.1011.1
Früh
+2h
Nacht
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 08decce..3f85703 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
[versions]
-agp = "8.3.2"
+agp = "8.13.0"
junit = "4.13.2"
junitVersion = "1.3.0"
espressoCore = "3.7.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5d295fa..23df03f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri Apr 19 12:54:48 CEST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists