diff --git a/app/build.gradle b/app/build.gradle index ab3baddbd..adffd7170 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.supla.android" minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION) targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) - versionCode 82 - versionName "2.3.28" + versionCode 83 + versionName "2.3.29" sourceSets.main { jniLibs.srcDir 'src/main/libs' diff --git a/app/src/main/java/org/supla/android/db/Channel.java b/app/src/main/java/org/supla/android/db/Channel.java index db2f7588a..c7a154943 100644 --- a/app/src/main/java/org/supla/android/db/Channel.java +++ b/app/src/main/java/org/supla/android/db/Channel.java @@ -277,6 +277,9 @@ public String getUnit() { case SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER: dUnit = "m\u00B3"; break; + case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER: + dUnit = "GJ"; + break; } return getUnit(dUnit); } diff --git a/app/src/main/java/org/supla/android/db/ChannelBase.java b/app/src/main/java/org/supla/android/db/ChannelBase.java index 0a302c118..1d7adad7b 100644 --- a/app/src/main/java/org/supla/android/db/ChannelBase.java +++ b/app/src/main/java/org/supla/android/db/ChannelBase.java @@ -224,6 +224,9 @@ public static String getFunctionName(int func, Context context) { case SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER: idx = R.string.channel_func_watermeter; break; + case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER: + idx = R.string.channel_func_heatmeter; + break; case SuplaConst.SUPLA_CHANNELFNC_THERMOSTAT: idx = R.string.channel_func_thermostat; break; @@ -498,6 +501,10 @@ && getFunc() != SuplaConst.SUPLA_CHANNELFNC_HUMIDITYANDTEMPERATURE) img_idx = R.drawable.watermeter; break; + case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER: + img_idx = R.drawable.heatmeter; + break; + case SuplaConst.SUPLA_CHANNELFNC_THERMOSTAT: switch (getAltIcon()) { case 1: diff --git a/app/src/main/java/org/supla/android/lib/SuplaConst.java b/app/src/main/java/org/supla/android/lib/SuplaConst.java index 15c9b0098..a2cf4e472 100644 --- a/app/src/main/java/org/supla/android/lib/SuplaConst.java +++ b/app/src/main/java/org/supla/android/lib/SuplaConst.java @@ -90,6 +90,7 @@ public class SuplaConst { public final static int SUPLA_CHANNELFNC_IC_ELECTRICITY_METER = 315; public final static int SUPLA_CHANNELFNC_IC_GAS_METER = 320; public final static int SUPLA_CHANNELFNC_IC_WATER_METER = 330; + public final static int SUPLA_CHANNELFNC_IC_HEAT_METER = 340; public final static int SUPLA_CHANNELFNC_THERMOSTAT = 400; public final static int SUPLA_CHANNELFNC_THERMOSTAT_HEATPOL_HOMEPLUS = 410; public final static int SUPLA_CHANNELFNC_VALVE_OPENCLOSE = 500; diff --git a/app/src/main/java/org/supla/android/listview/ChannelLayout.java b/app/src/main/java/org/supla/android/listview/ChannelLayout.java index 82f823403..25246d27c 100644 --- a/app/src/main/java/org/supla/android/listview/ChannelLayout.java +++ b/app/src/main/java/org/supla/android/listview/ChannelLayout.java @@ -245,7 +245,8 @@ private void SetDimensions() { || mFunc == SuplaConst.SUPLA_CHANNELFNC_ELECTRICITY_METER || mFunc == SuplaConst.SUPLA_CHANNELFNC_IC_ELECTRICITY_METER || mFunc == SuplaConst.SUPLA_CHANNELFNC_IC_GAS_METER - || mFunc == SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER) { + || mFunc == SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER + || mFunc == SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER) { width *= 2.8; @@ -974,6 +975,7 @@ public void setChannelData(ChannelBase cbase) { case SuplaConst.SUPLA_CHANNELFNC_IC_ELECTRICITY_METER: case SuplaConst.SUPLA_CHANNELFNC_IC_GAS_METER: case SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER: + case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER: case SuplaConst.SUPLA_CHANNELFNC_THERMOMETER: case SuplaConst.SUPLA_CHANNELFNC_HUMIDITYANDTEMPERATURE: case SuplaConst.SUPLA_CHANNELFNC_THERMOSTAT: diff --git a/app/src/main/java/org/supla/android/listview/ChannelListView.java b/app/src/main/java/org/supla/android/listview/ChannelListView.java index d909202e4..d625332d4 100644 --- a/app/src/main/java/org/supla/android/listview/ChannelListView.java +++ b/app/src/main/java/org/supla/android/listview/ChannelListView.java @@ -140,6 +140,7 @@ private DetailLayout getDetailLayout(ChannelBase cbase) { case SuplaConst.SUPLA_CHANNELFNC_IC_ELECTRICITY_METER: case SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER: case SuplaConst.SUPLA_CHANNELFNC_IC_GAS_METER: + case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER: // TODO: Remove channel type checking in future versions. Check function instead of type. # 140-issue if (cbase.getType() == SuplaConst.SUPLA_CHANNELTYPE_IMPULSE_COUNTER) { @@ -197,6 +198,8 @@ private DetailLayout getDetailLayout(ChannelBase cbase) { case SuplaConst.SUPLA_CHANNELFNC_IC_ELECTRICITY_METER: case SuplaConst.SUPLA_CHANNELFNC_IC_GAS_METER: case SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER: + case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER: + // TODO: Remove channel type checking in future versions. Check function instead of type. # 140-issue if (cbase.getType() == SuplaConst.SUPLA_CHANNELTYPE_IMPULSE_COUNTER) { mDetailLayout = new ChannelDetailIC(getContext(), this); diff --git a/app/src/main/res/drawable/battery.png b/app/src/main/res/drawable/battery.png index dff118b90..b3f88b55b 100644 Binary files a/app/src/main/res/drawable/battery.png and b/app/src/main/res/drawable/battery.png differ diff --git a/app/src/main/res/drawable/heatmeter.png b/app/src/main/res/drawable/heatmeter.png new file mode 100644 index 000000000..9e01e2bc1 Binary files /dev/null and b/app/src/main/res/drawable/heatmeter.png differ diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b738a3190..4425bdbf0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -189,4 +189,5 @@ Ano Ne + Měřič tepla \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 72420ebaa..c7bc6dad7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -200,4 +200,6 @@ Produktion im laufenden Monat Produktion nach Phase Geben Sie die Superuser-Anmeldeinformationen ein + + Wärmezähler diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0afdbb306..f1f2e066f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -204,4 +204,6 @@ Παραγωγή ανάλογα με τις φάσεις Παραγωγή τον τρέχοντα μήνα Καταχωρίστε τα διαπιστευτήρια superuser + + Μετρητής θερμότητας diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 71ba2eb56..9e33da604 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -206,4 +206,6 @@ Producción en el mes actual Producción según fases Entrez les informations d\'identification du superutilisateur + + Medidor de calor diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 48de78c49..815cb4440 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -206,4 +206,6 @@ Production dans le mois courant Production selon phases Entrez les informations d\'identification du superutilisateur + + Compteur de chaleur diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 34d440f8d..b5b0f4476 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -203,5 +203,7 @@ Nincs hálózat megszakítás Fázis szerinti gyártás Termelés a folyó hónapban - Wprowadź poświadczenia głównego użytkownika + Írja be a fő felhasználó hitelesítő adatait + + Hőmérő diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ff0a449be..a3bec9916 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -206,4 +206,6 @@ Produzione del mese corrente Produzione in base alle fasi Immettere le credenziali del superutente + + Contatore di calore diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index a01ee93d4..9a2beecfb 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -184,4 +184,6 @@ Gamyba einamąjį mėnesį Gamyba pagal fazes Įveskite pagrindinio vartotojo kredencialus + + Šilumos skaitiklis \ No newline at end of file diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 79def0eab..464d87179 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -204,4 +204,6 @@ Produksjon i forhold til faser Produksjon i gjeldende måned Skriv inn superbrukerens legitimasjon + + Varmemåler diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 3b0cd0f75..61c2114d9 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -204,4 +204,6 @@ Productie door fase Productie in de huidige maand Voer de inloggegevens van de superuser in + + Warmtemeter diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 49d343e48..093dde6f3 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -226,4 +226,6 @@ Nie Brak funkcji + Licznik ciepła + Wybierz kanał mostu z-wave, który chcesz skonfigurować. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 4a34a64f4..02338e933 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -206,4 +206,6 @@ Produção de acordo com fase Produção no mês atual Digite as credenciais do superusuário + + Medidor de calor diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 47442b2e0..ff057d8f6 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -203,5 +203,7 @@ Nu există întreruperi în rețea Producția conform fazelor Producția în luna curentă - Wprowadź poświadczenia głównego użytkownika + Introduceți datele de acreditare ale utilizatorului principal + + Contorul de căldură diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index bc3dc22b2..35cc8d533 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -212,5 +212,6 @@ Производство в текущем месяце Введите учетные данные суперпользователя + Теплосчетчик diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index e4a8a928b..54beae96a 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -217,4 +217,6 @@ Výroba podľa fáz Výroba v aktuálnom mesiaci Zadajte poverenia superužívateľa + + Merač tepla diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index e968b49bf..b4fc692b6 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -204,4 +204,6 @@ Izdelava v skladu s fazami Proizvodnja v tekočem mesecu Vnesite poverilnice podupravitelja + + Merilnik toplote diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml index 20de48c39..e42399e67 100644 --- a/app/src/main/res/values-sw600dp/dimens.xml +++ b/app/src/main/res/values-sw600dp/dimens.xml @@ -4,7 +4,7 @@ 180dp 150dp 15dp - 30dp + 40dp 27sp 25dp 17sp diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 36865bf56..f4c94ca25 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -8,7 +8,7 @@ 10dp 100dp 10dp - 20dp + 30dp 20dp 18sp 18dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 31890e5e7..3f35ea016 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -224,4 +224,7 @@ OK .... + Heat Meter + Select the z-wave bridge channel you want to configure. +