From 9ab548b9eea58e370c23819ea2ddd6708d707cfe Mon Sep 17 00:00:00 2001 From: woheller69 Date: Wed, 17 Jul 2024 15:41:31 +0200 Subject: [PATCH] V2.5 fixes #24 --- README.md | 7 ++++-- app/build.gradle | 4 ++-- app/src/main/assets/help/help-de.html | 7 ++++-- app/src/main/assets/help/help-en.html | 7 ++++-- app/src/main/assets/help/help-it.html | 7 ++++-- app/src/main/assets/help/help-tr.html | 7 ++++-- .../leaflet-tilelayer-colorfilter.min.js | 7 ------ .../ui/RecycleList/CityWeatherAdapter.java | 1 - .../main/res/layout/dialog_edit_location.xml | 22 +++++++++---------- .../main/res/layout/list_item_city_list.xml | 16 +++++++------- .../metadata/android/en-US/changelogs/25.txt | 1 + 11 files changed, 47 insertions(+), 39 deletions(-) delete mode 100644 app/src/main/assets/leaflet-tilelayer-colorfilter.min.js create mode 100644 fastlane/metadata/android/en-US/changelogs/25.txt diff --git a/README.md b/README.md index 883c076..036b553 100644 --- a/README.md +++ b/README.md @@ -72,11 +72,14 @@ Specify the average albedo for your environment to take reflections into account Examples: Fresh snow: 0.8, green gras: 0.25, asphalt: 0.1 You probably need to optimize this parameter. +#### Inverter efficiency [%] +Enter the efficiency of your inverter. + #### Inverter power [W] Specify the maximum power of your inverter. If it is lower than the maximum power of your panels, the output power of your system will be limited by this parameter. -#### Inverter efficiency [%] -Enter the efficiency of your inverter. +#### Central inverter +Select this checkbox to apply the inverter limit to the entire system. When in 'show sum' mode, the power limits of all inverters with this checkbox enabled will be aggregated and used as the system-wide power limit. #### Shading In this section you can define the shading on your solar panels. diff --git a/app/build.gradle b/app/build.gradle index 32b882c..6199754 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.woheller69.solxpect" minSdkVersion 26 targetSdk 34 - versionCode 24 - versionName "2.4" + versionCode 25 + versionName "2.5" buildConfigField "String", "BASE_URL", "\"https://api.open-meteo.com/v1/\"" buildConfigField "String", "TILES_URL","\"https://tile.openstreetmap.org/\"" diff --git a/app/src/main/assets/help/help-de.html b/app/src/main/assets/help/help-de.html index 3784486..7edffe0 100644 --- a/app/src/main/assets/help/help-de.html +++ b/app/src/main/assets/help/help-de.html @@ -50,11 +50,14 @@ Geben Sie die durchschnittliche Albedo für Ihre Umgebung an, um Reflexionen zu Beispiele: Frischer Schnee: 0.8, grünes Gras: 0.25, Asphalt: 0.1 Sie müssen diesen Parameter wahrscheinlich optimieren. +

Wechselrichtereffizienz [%]

+Geben Sie den Wirkungsgrad Ihres Wechselrichters ein. +

Wechselrichterleistung [W]

Geben Sie die maximale Leistung Ihres Wechselrichters an. Wenn diese geringer ist als die maximale Leistung Ihrer Module, wird die Ausgangsleistung Ihres Systems durch diesen Parameter begrenzt. -

Wechselrichtereffizienz [%]

-Geben Sie den Wirkungsgrad Ihres Wechselrichters ein. +

Zentralwechselrichter

+Wählen Sie dieses Kontrollkästchen, um die Wechselrichter-Begrenzung auf das gesamte System anzuwenden. Im "Summe anzeigen"-Modus, werden die Leistungsbegrenzungen aller Wechselrichter mit gesetztem Kontrollkästchen aggregiert und als systemweite Leistungsbegrenzung verwendet.

Abschattung

In diesem Abschnitt können Sie die Beschattung Ihrer Solarmodule definieren. diff --git a/app/src/main/assets/help/help-en.html b/app/src/main/assets/help/help-en.html index e041851..bfc4df9 100644 --- a/app/src/main/assets/help/help-en.html +++ b/app/src/main/assets/help/help-en.html @@ -50,11 +50,14 @@ Specify the average albedo for your environment to take reflections into account Examples: Fresh snow: 0.8, green gras: 0.25, asphalt: 0.1 You probably need to optimize this parameter. +

Inverter efficiency [%]

+Enter the efficiency of your inverter. +

Inverter power [W]

Specify the maximum power of your inverter. If it is lower than the maximum power of your panels, the output power of your system will be limited by this parameter. -

Inverter efficiency [%]

-Enter the efficiency of your inverter. +

Central Inverter

+Select this checkbox to apply the inverter limit to the entire system. When in 'show sum' mode, the power limits of all inverters with this checkbox enabled will be aggregated and used as the system-wide power limit.

Shading

In this section you can define the shading on your solar panels. diff --git a/app/src/main/assets/help/help-it.html b/app/src/main/assets/help/help-it.html index d37324b..793eee2 100644 --- a/app/src/main/assets/help/help-it.html +++ b/app/src/main/assets/help/help-it.html @@ -48,11 +48,14 @@ Indica la capacità di catturare la radiazione diffusa. Per impianti poco inclin Indica la capacità dell’ambiente circostante il tuo impianto di riflettere la luce solare. I valori variano da 0 (tutta la luce viene assorbita), a 1 (tutta la radiazione viene riflessa). Esempi: neve fresca: 0,8 ; erba verde: 0,25 ; asfalto: 0,1 . +

Efficienza dell’inverter [%]

+Indica l’efficienza di conversione dell’inverter. +

Potenza dell’inverter [W]

Indica la potenza massima gestita dall’inverter. Se è minore della potenza massima dei pannelli, la produzione dell’impianto verrà limitata da questo parametro. -

Efficienza dell’inverter [%]

-Indica l’efficienza di conversione dell’inverter. +

Invertitore centrale

+Seleziona questa casella di controllo per applicare il limite dell'invertitore all'intero sistema. Quando si è in modalità "mostra totale", i limiti di potenza di tutti gli invertitori con questa casella di controllo abilitata verranno aggregati e utilizzati come limite di potenza dell'intero sistema.

Ombreggiamenti

In questa sezione puoi definire gli ombreggiamenti dei pannelli. diff --git a/app/src/main/assets/help/help-tr.html b/app/src/main/assets/help/help-tr.html index 63835eb..2bd1cea 100644 --- a/app/src/main/assets/help/help-tr.html +++ b/app/src/main/assets/help/help-tr.html @@ -49,11 +49,14 @@ Yansımaları hesaba katmak için ortamınız için ortalama albedoyu belirtin. Örnek: Taze kar: 0.8, yeşil ot: 0.25, asfalt: 0.1 Muhtemelen bu parametreyi optimize etmeniz gerekir. +

İnvertör verimliliği [%]

+İnvertörünüzün verimliliğini girin. +

İnvertör gücü [W]

İnvertörünüzün maksimum gücünü belirtin. Panellerinizin maksimum gücünden daha düşükse, sisteminizin çıkış gücü bu parametre ile sınırlandırılacaktır. -

İnvertör verimliliği [%]

-İnvertörünüzün verimliliğini girin. +

Merkezi invertör

+İnvertör limitini tüm sisteme uygulamak için bu onay kutusunu seçin. "Toplamı göster" modundayken, bu onay kutusu etkinleştirilmiş olan tüm invertörlerin güç limitleri toplanacak ve tüm sistemin güç limiti olarak kullanılacaktır.

Gölgelendirme

Bu bölümde güneş panellerinizdeki gölgelendirmeyi tanımlayabilirsiniz. diff --git a/app/src/main/assets/leaflet-tilelayer-colorfilter.min.js b/app/src/main/assets/leaflet-tilelayer-colorfilter.min.js deleted file mode 100644 index 1fe8e50..0000000 --- a/app/src/main/assets/leaflet-tilelayer-colorfilter.min.js +++ /dev/null @@ -1,7 +0,0 @@ -/* - Leaflet.TileLayer.ColorFilter - (c) 2018, Claudio T. Kawakani - A simple and lightweight Leaflet plugin to apply CSS filters on map tiles. - https://github.com/xtk93x/Leaflet.TileLayer.ColorFilter -*/ -"use strict";L.TileLayer.ColorFilter=L.TileLayer.extend({intialize:function(t,i){L.TileLayer.prototype.initialize.call(this,t,i)},colorFilter:function(){var r=["blur:px","brightness:%","bright:brightness:%","bri:brightness:%","contrast:%","con:contrast:%","grayscale:%","gray:grayscale:%","hue-rotate:deg","hue:hue-rotate:deg","hue-rotation:hue-rotate:deg","invert:%","inv:invert:%","opacity:%","op:opacity:%","saturate:%","saturation:saturate:%","sat:saturate:%","sepia:%","sep:sepia:%"];return(this.options.filter?this.options.filter:[]).map(function(t){var i=t.toLowerCase().split(":");if(2===i.length){var e=r.find(function(t){return t.split(":")[0]===i[0]});if(e)return e=e.split(":"),i[1]+=/^\d+$/.test(i[1])?e[e.length-1]:"","".concat(e[e.length-2],"(").concat(i[1],")")}return""}).join(" ")},_initContainer:function(){L.TileLayer.prototype._initContainer.call(this);this._container.style.filter=this.colorFilter()},updateFilter:function(t){this.options.filter=t,this._container&&(this._container.style.filter=this.colorFilter())}}),L.tileLayer.colorFilter=function(t,i){return new L.TileLayer.ColorFilter(t,i)}; diff --git a/app/src/main/java/org/woheller69/weather/ui/RecycleList/CityWeatherAdapter.java b/app/src/main/java/org/woheller69/weather/ui/RecycleList/CityWeatherAdapter.java index ec577b8..85b228b 100644 --- a/app/src/main/java/org/woheller69/weather/ui/RecycleList/CityWeatherAdapter.java +++ b/app/src/main/java/org/woheller69/weather/ui/RecycleList/CityWeatherAdapter.java @@ -101,7 +101,6 @@ public class CityWeatherAdapter extends RecyclerView.Adapter(); float energyCumulated=0; diff --git a/app/src/main/res/layout/dialog_edit_location.xml b/app/src/main/res/layout/dialog_edit_location.xml index 0dee8c1..59aaf2a 100644 --- a/app/src/main/res/layout/dialog_edit_location.xml +++ b/app/src/main/res/layout/dialog_edit_location.xml @@ -146,17 +146,6 @@ android:layout_height="wrap_content" android:inputType="numberDecimal" android:hint="@string/edit_location_hint_albedo"/> - - + + + - diff --git a/fastlane/metadata/android/en-US/changelogs/25.txt b/fastlane/metadata/android/en-US/changelogs/25.txt new file mode 100644 index 0000000..b6edaa8 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/25.txt @@ -0,0 +1 @@ +Add option for central inverter \ No newline at end of file